From 96572b4601693188e9610ad497ad71a2d592eb5e Mon Sep 17 00:00:00 2001 From: samde Date: Mon, 20 Jul 2026 15:27:57 +0200 Subject: [PATCH 01/19] [ADD] Real estate: Initial setup for module --- estate/__init__.py | 0 estate/__manifest__.py | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 estate/__init__.py create mode 100644 estate/__manifest__.py diff --git a/estate/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..4bcca209d42 --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,8 @@ +{ + 'name': 'Real Estate', + 'version': '1.9', + 'depends': [ + 'base', + ], + 'application': True, +} From 2a47b9d73caa2339fbbe7334588d1149caa34bf5 Mon Sep 17 00:00:00 2001 From: samde Date: Mon, 20 Jul 2026 17:41:58 +0200 Subject: [PATCH 02/19] [IMP] Real estate: chapter3 of tutorial --- estate/__init__.py | 1 + estate/models/__init__.py | 1 + estate/models/estate_property.py | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 estate/models/__init__.py create mode 100644 estate/models/estate_property.py diff --git a/estate/__init__.py b/estate/__init__.py index e69de29bb2d..9a7e03eded3 100644 --- a/estate/__init__.py +++ b/estate/__init__.py @@ -0,0 +1 @@ +from . import models \ No newline at end of file diff --git a/estate/models/__init__.py b/estate/models/__init__.py new file mode 100644 index 00000000000..5e1963c9d2f --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..04416dbdffa --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,25 @@ +from odoo import fields, models + + +class EstateProperty(models.Model): + _name = "realestate.estate.properties" + _description = "Real estate properties" + + name = fields.Char('Plan Name', required=True, translate=True) + description = fields.Text('Notes') + postcode = fields.Char('Postcode', required=True) + date_availability = fields.Date('Availability date') + expected_price = fields.Float('Expected price', required=True) + selling_price = fields.Float('Selling price') + bedrooms = fields.Integer('Bedrooms') + living_area = fields.Integer('Living area') + facades = fields.Integer('Facades') + garages = fields.Boolean('Garages') + garden = fields.Boolean('Garden') + garden_area = fields.Integer('Garden area') + garden_orientation = fields.Selection([ + ('north', 'North'), + ('south', 'South'), + ('east', 'East'), + ('west', 'West'), + ]) From 50598ea31c4bddb2bb299f0be508e0d969a03076 Mon Sep 17 00:00:00 2001 From: samde Date: Wed, 22 Jul 2026 09:47:54 +0200 Subject: [PATCH 03/19] [IMP] Real estate: chapter4 security --- estate/__manifest__.py | 3 +++ estate/security/ir.model.access.csv | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 estate/security/ir.model.access.csv diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 4bcca209d42..58cf86630ad 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -4,5 +4,8 @@ 'depends': [ 'base', ], + 'data': [ + 'security/ir.model.access.csv', + ], 'application': True, } diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..5c31d635aed --- /dev/null +++ b/estate/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +estate.access_realestate_estate_properties,access_realestate_estate_properties,estate.model_realestate_estate_properties,base.group_user,1,1,1,1 \ No newline at end of file From 937e248c9250287d8f4af69f638594de0d0f86ca Mon Sep 17 00:00:00 2001 From: samde Date: Wed, 22 Jul 2026 13:25:36 +0200 Subject: [PATCH 04/19] [IMP] Real estate: chapter5 Some UI to play with --- estate/__manifest__.py | 16 +++---- estate/models/estate_property.py | 58 ++++++++++++++++++-------- estate/views/estate_menus.xml | 7 ++++ estate/views/estate_property_views.xml | 9 ++++ 4 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 estate/views/estate_menus.xml create mode 100644 estate/views/estate_property_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 58cf86630ad..3d41eff7c1a 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,11 +1,13 @@ { - 'name': 'Real Estate', - 'version': '1.9', - 'depends': [ - 'base', + "name": "Real Estate", + "version": "1.9", + "depends": [ + "base", ], - 'data': [ - 'security/ir.model.access.csv', + "data": [ + "views/estate_property_views.xml", + "views/estate_menus.xml", + "security/ir.model.access.csv", ], - 'application': True, + "application": True, } diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 04416dbdffa..1e38d474d75 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,3 +1,6 @@ +from datetime import date, datetime, time +from dateutil.relativedelta import relativedelta + from odoo import fields, models @@ -5,21 +8,40 @@ class EstateProperty(models.Model): _name = "realestate.estate.properties" _description = "Real estate properties" - name = fields.Char('Plan Name', required=True, translate=True) - description = fields.Text('Notes') - postcode = fields.Char('Postcode', required=True) - date_availability = fields.Date('Availability date') - expected_price = fields.Float('Expected price', required=True) - selling_price = fields.Float('Selling price') - bedrooms = fields.Integer('Bedrooms') - living_area = fields.Integer('Living area') - facades = fields.Integer('Facades') - garages = fields.Boolean('Garages') - garden = fields.Boolean('Garden') - garden_area = fields.Integer('Garden area') - garden_orientation = fields.Selection([ - ('north', 'North'), - ('south', 'South'), - ('east', 'East'), - ('west', 'West'), - ]) + active = fields.Boolean(default=False) + name = fields.Char("Plan Name", required=True, translate=True) + description = fields.Text("Notes") + postcode = fields.Char("Postcode", required=True) + date_availability = fields.Date( + "Availability date", + copy=False, + default=date.today() + relativedelta(months=3), + ) + expected_price = fields.Float("Expected price", required=True) + state = fields.Selection( + [ + ("new", "New"), + ("offer received", "Offer Received"), + ("offer accepted", "Offer Accepted"), + ("sold", "Sold"), + ("cancelled", "Cancelled"), + ], + required=True, + default="new", + copy=False, + ) + selling_price = fields.Float("Selling price", copy=False, readonly=True) + bedrooms = fields.Integer("Bedrooms", default=2) + living_area = fields.Integer("Living area") + facades = fields.Integer("Facades") + garages = fields.Boolean("Garages") + garden = fields.Boolean("Garden") + garden_area = fields.Integer("Garden area") + garden_orientation = fields.Selection( + [ + ("north", "North"), + ("south", "South"), + ("east", "East"), + ("west", "West"), + ], + ) diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml new file mode 100644 index 00000000000..23c005ab6e0 --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..8a1729b156b --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,9 @@ + + + + + Property + realestate.estate.properties + list,form + + \ No newline at end of file From 9fa1b7017e920a47ec9ccceaedda4c2db989c9fe Mon Sep 17 00:00:00 2001 From: samde Date: Wed, 22 Jul 2026 16:16:46 +0200 Subject: [PATCH 05/19] [IMP] Real estate: chapter6: basic views --- estate/models/estate_property.py | 4 +- estate/views/estate_property_views.xml | 78 ++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 1e38d474d75..fee977ac9cc 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -8,7 +8,7 @@ class EstateProperty(models.Model): _name = "realestate.estate.properties" _description = "Real estate properties" - active = fields.Boolean(default=False) + active = fields.Boolean(default=True) name = fields.Char("Plan Name", required=True, translate=True) description = fields.Text("Notes") postcode = fields.Char("Postcode", required=True) @@ -34,7 +34,7 @@ class EstateProperty(models.Model): bedrooms = fields.Integer("Bedrooms", default=2) living_area = fields.Integer("Living area") facades = fields.Integer("Facades") - garages = fields.Boolean("Garages") + garage = fields.Boolean("Garage") garden = fields.Boolean("Garden") garden_area = fields.Integer("Garden area") garden_orientation = fields.Selection( diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 8a1729b156b..ada8209de82 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -6,4 +6,82 @@ realestate.estate.properties list,form + + + realestate.property.form + realestate.estate.properties + +
+ +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + realestate.property.list + realestate.estate.properties + + + + + + + + + + + + + + + realestate.property.filter + realestate.estate.properties + + + + + + + + + + + + + + + + + \ No newline at end of file From 91b04cabc51c8ff364ce8aceef67c8c08c443976 Mon Sep 17 00:00:00 2001 From: samde Date: Thu, 23 Jul 2026 10:08:07 +0200 Subject: [PATCH 06/19] [REF] Real estate: refactoring of ids --- estate/__manifest__.py | 1 + estate/models/__init__.py | 1 + estate/models/estate_property.py | 5 ++++- estate/models/estate_property_type.py | 8 ++++++++ estate/security/ir.model.access.csv | 3 ++- estate/views/estate_menus.xml | 9 +++++++-- estate/views/estate_property_type_views.xml | 9 +++++++++ estate/views/estate_property_views.xml | 12 ++++++------ 8 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 estate/models/estate_property_type.py create mode 100644 estate/views/estate_property_type_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 3d41eff7c1a..b2d053737a7 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -6,6 +6,7 @@ ], "data": [ "views/estate_property_views.xml", + "views/estate_property_type_views.xml", "views/estate_menus.xml", "security/ir.model.access.csv", ], diff --git a/estate/models/__init__.py b/estate/models/__init__.py index 5e1963c9d2f..40092a2d810 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -1 +1,2 @@ from . import estate_property +from . import estate_property_type diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index fee977ac9cc..4230b1a988a 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -5,7 +5,7 @@ class EstateProperty(models.Model): - _name = "realestate.estate.properties" + _name = "realestate.properties" _description = "Real estate properties" active = fields.Boolean(default=True) @@ -45,3 +45,6 @@ class EstateProperty(models.Model): ("west", "West"), ], ) + buyer_id = fields.Many2one("res.partner", string="Partner") + sale_rep_id = fields.Many2one("res.users") + property_type_id = fields.Many2one("realestate.properties.type") diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py new file mode 100644 index 00000000000..c1b375fe611 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,8 @@ +from odoo import fields, models + + +class EstatePropertyType(models.Model): + _name = "realestate.properties.type" + _description = "Real estate property type" + + property_type_id = fields.Char("Property type", required=True) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 5c31d635aed..d59339bc941 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,2 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -estate.access_realestate_estate_properties,access_realestate_estate_properties,estate.model_realestate_estate_properties,base.group_user,1,1,1,1 \ No newline at end of file +estate.access_realestate_properties,access_realestate_properties,estate.model_realestate_properties,base.group_user,1,1,1,1 +estate.access_realestate_properties_type,access_realestate_properties_type,estate.model_realestate_properties_type,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 23c005ab6e0..e59d8977cc3 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,7 +1,12 @@ - - + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml new file mode 100644 index 00000000000..1128a46fcbd --- /dev/null +++ b/estate/views/estate_property_type_views.xml @@ -0,0 +1,9 @@ + + + + + Property Types + realestate.properties.type + list,form + + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index ada8209de82..f47e34f2f65 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -1,15 +1,15 @@ - + Property - realestate.estate.properties + realestate.properties list,form - + realestate.property.form - realestate.estate.properties + realestate.properties
@@ -48,7 +48,7 @@ realestate.property.list - realestate.estate.properties + realestate.properties @@ -64,7 +64,7 @@ realestate.property.filter - realestate.estate.properties + realestate.properties From e30c1df2b06d4fff7697ca6778e6cf65feafedfa Mon Sep 17 00:00:00 2001 From: samde Date: Thu, 23 Jul 2026 14:40:17 +0200 Subject: [PATCH 07/19] [IMP] Real estate: chapter7: relations between models --- estate/__manifest__.py | 4 +- estate/models/__init__.py | 2 + estate/models/estate_property.py | 13 ++++- estate/models/estate_property_offer.py | 14 ++++++ estate/models/estate_property_tag.py | 9 ++++ estate/models/estate_property_type.py | 3 +- estate/security/ir.model.access.csv | 4 +- estate/views/estate_menus.xml | 2 + estate/views/estate_property_offers_list.xml | 32 ++++++++++++ estate/views/estate_property_tag_views.xml | 51 ++++++++++++++++++++ estate/views/estate_property_type_views.xml | 42 ++++++++++++++++ estate/views/estate_property_views.xml | 13 ++++- 12 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 estate/models/estate_property_offer.py create mode 100644 estate/models/estate_property_tag.py create mode 100644 estate/views/estate_property_offers_list.xml create mode 100644 estate/views/estate_property_tag_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index b2d053737a7..4942b28b675 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -5,8 +5,10 @@ "base", ], "data": [ - "views/estate_property_views.xml", "views/estate_property_type_views.xml", + "views/estate_property_tag_views.xml", + "views/estate_property_offers_list.xml", + "views/estate_property_views.xml", "views/estate_menus.xml", "security/ir.model.access.csv", ], diff --git a/estate/models/__init__.py b/estate/models/__init__.py index 40092a2d810..2f1821a39c1 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -1,2 +1,4 @@ from . import estate_property from . import estate_property_type +from . import estate_property_tag +from . import estate_property_offer diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 4230b1a988a..7e16d2b76e2 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -45,6 +45,15 @@ class EstateProperty(models.Model): ("west", "West"), ], ) - buyer_id = fields.Many2one("res.partner", string="Partner") - sale_rep_id = fields.Many2one("res.users") + buyer_id = fields.Many2one("res.partner", string="Buyer", copy=False) + sale_rep_id = fields.Many2one( + "res.users", + string="Salesperson", + default=lambda self: self.env.user, + ) property_type_id = fields.Many2one("realestate.properties.type") + property_tag_ids = fields.Many2many("realestate.properties.tag", string="Tags") + offer_ids = fields.One2many( + "realestate.properties.offer", + "property_id", + ) diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..320ad65f0e9 --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,14 @@ +from odoo import fields, models + + +class EstatePropertyOffer(models.Model): + _name = "realestate.properties.offer" + _description = "Real estate property offer" + + price = fields.Float("Price") + status = fields.Selection( + [("accepted", "Accepted"), ("refused", "Refused")], + copy=False, + ) + partner_id = fields.Many2one("res.partner", required=True) + property_id = fields.Many2one("realestate.properties", required=True) diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..cc87f7b4095 --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,9 @@ +from odoo import fields, models + + +class EstatePropertyTag(models.Model): + _name = "realestate.properties.tag" + _description = "Real estate property tag" + + name = fields.Char("Name", required=True) + property_tag_ids = fields.Char("id", required=True) diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index c1b375fe611..741cf123a43 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -5,4 +5,5 @@ class EstatePropertyType(models.Model): _name = "realestate.properties.type" _description = "Real estate property type" - property_type_id = fields.Char("Property type", required=True) + name = fields.Char("Property type", required=True) + property_type_id = fields.Char("Property type id", required=True) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index d59339bc941..94dbe6be589 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,3 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink estate.access_realestate_properties,access_realestate_properties,estate.model_realestate_properties,base.group_user,1,1,1,1 -estate.access_realestate_properties_type,access_realestate_properties_type,estate.model_realestate_properties_type,base.group_user,1,1,1,1 \ No newline at end of file +estate.access_realestate_properties_type,access_realestate_properties_type,estate.model_realestate_properties_type,base.group_user,1,1,1,1 +estate.access_realestate_properties_tag,access_realestate_properties_tag,estate.model_realestate_properties_tag,base.group_user,1,1,1,1 +estate.access_realestate_properties_offer,access_realestate_properties_offer,estate.model_realestate_properties_offer,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index e59d8977cc3..b37cf1a4015 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -7,6 +7,8 @@ + \ No newline at end of file diff --git a/estate/views/estate_property_offers_list.xml b/estate/views/estate_property_offers_list.xml new file mode 100644 index 00000000000..d08ce8ad71d --- /dev/null +++ b/estate/views/estate_property_offers_list.xml @@ -0,0 +1,32 @@ + + + + + realestate.property.form + realestate.properties.offer + + + + + + + + + + + + + + + realestate.property.type.list + realestate.properties.offer + + + + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml new file mode 100644 index 00000000000..736104e8b11 --- /dev/null +++ b/estate/views/estate_property_tag_views.xml @@ -0,0 +1,51 @@ + + + + + Property Tags + realestate.properties.tag + list,form + + + realestate.property.form + realestate.properties.tag + +
+ +

+ +

+ + + + + + + +
+ + + + + realestate.property.type.list + realestate.properties.tag + + + + + + + + + realestate.property.type.filter + realestate.properties.tag + + + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml index 1128a46fcbd..d1bf783e15e 100644 --- a/estate/views/estate_property_type_views.xml +++ b/estate/views/estate_property_type_views.xml @@ -6,4 +6,46 @@ realestate.properties.type list,form + + realestate.property.form + realestate.properties.type + +
+ +

+ +

+ + + + + + + +
+ + + + + realestate.property.type.list + realestate.properties.type + + + + + + + + + realestate.property.type.filter + realestate.properties.type + + + + + + + +
\ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index f47e34f2f65..06057617572 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -17,6 +17,7 @@ + @@ -36,6 +37,16 @@ + + + + + + + + + + @@ -77,7 +88,7 @@ - From 33257b3654cffdae86b7251cf54cba0823ade3ef Mon Sep 17 00:00:00 2001 From: samde Date: Thu, 23 Jul 2026 17:36:48 +0200 Subject: [PATCH 08/19] [IMP] Real estate: chapter8: computed fields and onchanges --- estate/models/estate_property.py | 27 ++++++++++++++++-- estate/models/estate_property_offer.py | 30 +++++++++++++++++++- estate/views/estate_property_offers_list.xml | 4 +++ estate/views/estate_property_views.xml | 2 ++ 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 7e16d2b76e2..8fa50145ba7 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,7 +1,7 @@ from datetime import date, datetime, time from dateutil.relativedelta import relativedelta -from odoo import fields, models +from odoo import api, fields, models class EstateProperty(models.Model): @@ -32,11 +32,12 @@ class EstateProperty(models.Model): ) selling_price = fields.Float("Selling price", copy=False, readonly=True) bedrooms = fields.Integer("Bedrooms", default=2) - living_area = fields.Integer("Living area") facades = fields.Integer("Facades") garage = fields.Boolean("Garage") garden = fields.Boolean("Garden") - garden_area = fields.Integer("Garden area") + living_area = fields.Integer("Living area (sqm)") + garden_area = fields.Integer("Garden area (sqm)") + total_area = fields.Integer("Total area (sqm)", compute="_compute_total_area") garden_orientation = fields.Selection( [ ("north", "North"), @@ -45,6 +46,7 @@ class EstateProperty(models.Model): ("west", "West"), ], ) + best_offer = fields.Float("Best Offer", compute="_compute_best_price") buyer_id = fields.Many2one("res.partner", string="Buyer", copy=False) sale_rep_id = fields.Many2one( "res.users", @@ -57,3 +59,22 @@ class EstateProperty(models.Model): "realestate.properties.offer", "property_id", ) + + @api.depends("living_area", "garden_area") + def _compute_total_area(self): + for record in self: + record.total_area = record.living_area + record.garden_area + + @api.depends("offer_ids.price") + def _compute_best_price(self): + for record in self: + record.best_offer = max(record.offer_ids.mapped("price")) + + @api.onchange("garden") + def _onchange_garden(self): + if self.garden: + self.garden_area = 10 + self.garden_orientation = "north" + else: + self.garden_area = 0 + self.garden_orientation = None diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 320ad65f0e9..5069788ca22 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,4 +1,8 @@ -from odoo import fields, models +from datetime import date, datetime, timedelta +from dateutil.relativedelta import relativedelta + + +from odoo import api, fields, models class EstatePropertyOffer(models.Model): @@ -10,5 +14,29 @@ class EstatePropertyOffer(models.Model): [("accepted", "Accepted"), ("refused", "Refused")], copy=False, ) + validity = fields.Integer( + "Validaty (days)", + default=7, + ) + date_deadline = fields.Date( + "Deadline", + compute="_computed_date_deadline", + inverse="_inverse_validity_period", + readonly=False, + ) partner_id = fields.Many2one("res.partner", required=True) property_id = fields.Many2one("realestate.properties", required=True) + + @api.depends("validity") + def _computed_date_deadline(self): + for offer in self: + create_date = offer.create_date if offer.create_date else datetime.today() + if offer.validity: + offer.date_deadline = create_date + timedelta( + days=offer.validity, + ) + + def _inverse_validity_period(self): + for offer in self: + create_date = offer.create_date if offer.create_date else datetime.today() + offer.validity = (offer.date_deadline - create_date.date()).days diff --git a/estate/views/estate_property_offers_list.xml b/estate/views/estate_property_offers_list.xml index d08ce8ad71d..a22acaacd30 100644 --- a/estate/views/estate_property_offers_list.xml +++ b/estate/views/estate_property_offers_list.xml @@ -10,6 +10,8 @@ + + @@ -24,6 +26,8 @@ + + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 06057617572..a86d0286ef0 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -24,6 +24,7 @@ + @@ -38,6 +39,7 @@ + From 0fbb6ac3bbdc827bbb022c2c0576a2ed6d2f50e0 Mon Sep 17 00:00:00 2001 From: samde Date: Fri, 24 Jul 2026 10:22:12 +0200 Subject: [PATCH 09/19] [IMP] Real estate: chapter9: ready for some action --- estate/models/estate_property.py | 15 ++++++++++++++- estate/models/estate_property_offer.py | 18 ++++++++++++++++-- estate/views/estate_property_offers_list.xml | 4 ++++ estate/views/estate_property_views.xml | 5 +++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 8fa50145ba7..be8f9e1c41d 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,7 +1,7 @@ from datetime import date, datetime, time from dateutil.relativedelta import relativedelta -from odoo import api, fields, models +from odoo import api, _, exceptions, fields, models class EstateProperty(models.Model): @@ -78,3 +78,16 @@ def _onchange_garden(self): else: self.garden_area = 0 self.garden_orientation = None + + def sold_action_btn(self): + for record in self: + if record.state == "cancelled": + raise exceptions.UserError(_("Cancelled properties cannot be sold")) + + record.state = "sold" + + def cancelled_action_btn(self): + for record in self: + if record.state == "sold": + raise exceptions.UserError(_("Sold properties cannot be cancelled")) + record.state = "cancelled" diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 5069788ca22..5f27c0011da 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -2,14 +2,14 @@ from dateutil.relativedelta import relativedelta -from odoo import api, fields, models +from odoo import api, _, exceptions, fields, models class EstatePropertyOffer(models.Model): _name = "realestate.properties.offer" _description = "Real estate property offer" - price = fields.Float("Price") + price = fields.Float("Price", required=True) status = fields.Selection( [("accepted", "Accepted"), ("refused", "Refused")], copy=False, @@ -40,3 +40,17 @@ def _inverse_validity_period(self): for offer in self: create_date = offer.create_date if offer.create_date else datetime.today() offer.validity = (offer.date_deadline - create_date.date()).days + + def action_confirm(self): + for offer in self: + if offer.property_id.buyer_id: + raise exceptions.UserError(_("One offer has already been accepted.")) + offer.status = "accepted" + offer.property_id.selling_price = offer.price + offer.property_id.buyer_id = offer.partner_id + + def action_cancel(self): + for offer in self: + offer.status = "refused" + offer.property_id.selling_price = 0 + offer.property_id.buyer_id = None diff --git a/estate/views/estate_property_offers_list.xml b/estate/views/estate_property_offers_list.xml index a22acaacd30..e3ae3595af0 100644 --- a/estate/views/estate_property_offers_list.xml +++ b/estate/views/estate_property_offers_list.xml @@ -28,6 +28,10 @@ + + + -

+

+ + + + + + + + + + + - + realestate.property.type.list realestate.properties.type + - - realestate.property.type.filter - realestate.properties.type - - - - - - - - \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 1db205e943e..fec1aeed4d5 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -5,6 +5,7 @@ Property realestate.properties list,form + {'search_default_available': True} @@ -13,17 +14,23 @@
-

- + - + @@ -41,14 +48,14 @@ - - - + + - + @@ -61,21 +68,23 @@
- realestate.property.list realestate.properties - + - + @@ -89,7 +98,8 @@ - + Date: Tue, 28 Jul 2026 16:30:38 +0200 Subject: [PATCH 12/19] [IMP] Real estate: chapter12: inheritance --- estate/__manifest__.py | 1 + estate/models/__init__.py | 1 + estate/models/estate_property.py | 19 ++++++++++++++----- estate/models/estate_property_offer.py | 21 +++++++++++++++++++++ estate/models/user_properties.py | 18 ++++++++++++++++++ estate/security/ir.model.access.csv | 1 + estate/views/user_properties_views.xml | 18 ++++++++++++++++++ 7 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 estate/models/user_properties.py create mode 100644 estate/views/user_properties_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index f7d46c11317..3030e116cee 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -9,6 +9,7 @@ "views/estate_property_type_views.xml", "views/estate_property_tag_views.xml", "views/estate_property_views.xml", + "views/user_properties_views.xml", "views/estate_menus.xml", "security/ir.model.access.csv", ], diff --git a/estate/models/__init__.py b/estate/models/__init__.py index 2f1821a39c1..ed7be7652f8 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -2,3 +2,4 @@ from . import estate_property_type from . import estate_property_tag from . import estate_property_offer +from . import user_properties diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index ce65fd3e4b6..ab0ac642b5f 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -96,8 +96,9 @@ def _compute_selling_price(self): @api.onchange("offer_ids") def _onchange_offer(self): for record in self: - if record.state == "new" and len(record.offer_ids) > 0: - record.state = "offer received" + # in case of a delete + if len(record.offer_ids) == 0: + record.state = "new" @api.onchange("garden") def _onchange_garden(self): @@ -111,14 +112,14 @@ def _onchange_garden(self): def sold_action_btn(self): for record in self: if record.state == "cancelled": - raise exceptions.UserError(_("Cancelled properties cannot be sold")) + raise exceptions.UserError(_("Cancelled properties cannot be sold.")) record.state = "sold" def cancelled_action_btn(self): for record in self: if record.state == "sold": - raise exceptions.UserError(_("Sold properties cannot be cancelled")) + raise exceptions.UserError(_("Sold properties cannot be cancelled.")) record.state = "cancelled" @api.constrains("expected_price", "selling_price") @@ -131,6 +132,14 @@ def _check_offer_acceptable_price(self): ): raise ValidationError( _( - "The selling price should be greater than 90% of the expected price", + "The selling price should be greater than 90% of the expected price.", ), ) + + @api.ondelete(at_uninstall=False) + def _unlink_except_state_is_new_or_cancelled(self): + for record in self: + if record.state in ("new", "cancelled"): + raise exceptions.UserError( + _("Property that is either new or cancelled, can't be deleted."), + ) diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 94a5a134234..ab0a38f29c7 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,6 +1,7 @@ from datetime import datetime, timedelta from odoo import api, _, exceptions, fields, models +from odoo.tools import float_compare class EstatePropertyOffer(models.Model): @@ -66,3 +67,23 @@ def action_refuse(self): offer.property_id.state = "new" offer.property_id.selling_price = 0 offer.property_id.buyer_id = None + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if vals.get("property_id"): + property_record = self.env["realestate.properties"].browse( + vals["property_id"], + ) + offer_price = vals.get("price", 0.0) + if ( + property_record.best_offer + and float_compare(offer_price, property_record.best_offer, 2) < 0 + ): + raise exceptions.UserError( + _("New offer should be better than current best offer (%.2f).") + % property_record.best_offer, + ) + if property_record.state == "new": + property_record.state = "offer received" + return super().create(vals_list) diff --git a/estate/models/user_properties.py b/estate/models/user_properties.py new file mode 100644 index 00000000000..9ca8e019ef4 --- /dev/null +++ b/estate/models/user_properties.py @@ -0,0 +1,18 @@ +from odoo import fields, models + + +class UserProperties(models.Model): + _inherit = "res.users" + + property_ids = fields.One2many( + comodel_name="realestate.properties", + inverse_name="sale_rep_id", + string="Properties", + domain=[ + ( + "state", + "in", + ["new", "offer received"], + ), + ], + ) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 6553c75e505..169ca57d1a5 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -3,3 +3,4 @@ estate.access_realestate_properties,access_realestate_properties,estate.model_re estate.access_realestate_properties_type,access_realestate_properties_type,estate.model_realestate_properties_type,base.group_user,1,1,1,1 estate.access_realestate_properties_tag,access_realestate_properties_tag,estate.model_realestate_properties_tag,base.group_user,1,1,1,1 estate.access_realestate_properties_offer,access_realestate_properties_offer,estate.model_realestate_properties_offer,base.group_user,1,1,1,1 +estate.access_users,access_realestate_users,estate.model_res_users,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/user_properties_views.xml b/estate/views/user_properties_views.xml new file mode 100644 index 00000000000..7ba6ab8b9f2 --- /dev/null +++ b/estate/views/user_properties_views.xml @@ -0,0 +1,18 @@ + + + + + user.properties.form + res.users + + + + + + + + + + + + \ No newline at end of file From 4fbfd6bf1cf05e32289db2def1dcd904c29df3d4 Mon Sep 17 00:00:00 2001 From: samde Date: Wed, 29 Jul 2026 13:45:03 +0200 Subject: [PATCH 13/19] [IMP] Real estate: chapter13: interact with other modules --- estate/models/estate_property.py | 7 ++-- estate/views/estate_property_views.xml | 4 +-- estate_account/__init__.py | 1 + estate_account/__manifest__.py | 11 +++++++ estate_account/models/__init__.py | 1 + estate_account/models/estate_property.py | 36 +++++++++++++++++++++ estate_account/security/ir.model.access.csv | 1 + 7 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 estate_account/__init__.py create mode 100644 estate_account/__manifest__.py create mode 100644 estate_account/models/__init__.py create mode 100644 estate_account/models/estate_property.py create mode 100644 estate_account/security/ir.model.access.csv diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index ab0ac642b5f..9e03df5fed2 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -18,7 +18,7 @@ class EstateProperty(models.Model): date_availability = fields.Date( "Availability date", copy=False, - default=date.today() + relativedelta(months=3), + default=lambda _: date.today() + relativedelta(months=3), ) expected_price = fields.Float("Expected Price", required=True) _check_expected_price = models.Constraint( @@ -109,14 +109,13 @@ def _onchange_garden(self): self.garden_area = 0 self.garden_orientation = None - def sold_action_btn(self): + def action_sold_btn(self): for record in self: if record.state == "cancelled": raise exceptions.UserError(_("Cancelled properties cannot be sold.")) - record.state = "sold" - def cancelled_action_btn(self): + def action_cancelled_btn(self): for record in self: if record.state == "sold": raise exceptions.UserError(_("Sold properties cannot be cancelled.")) diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index fec1aeed4d5..befcda4144a 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -14,9 +14,9 @@
-

@@ -54,7 +54,7 @@ + readonly="state in ('offer_accepted', 'sold', 'cancelled')" /> @@ -74,8 +74,8 @@ realestate.properties @@ -102,7 +102,7 @@ + domain="['|', ('state', '=', 'new'), ('state', '=', 'offer_received')]" /> @@ -116,11 +116,12 @@ realestate.properties +
- +
@@ -128,7 +129,7 @@
- + Best offer price: @@ -146,4 +147,4 @@ - \ No newline at end of file + diff --git a/estate/views/user_properties_views.xml b/estate/views/user_properties_views.xml index 7ba6ab8b9f2..5aaf9f25c63 100644 --- a/estate/views/user_properties_views.xml +++ b/estate/views/user_properties_views.xml @@ -15,4 +15,4 @@ - \ No newline at end of file + From be7c0fac5bc1106942bdfbecc93311f8a3fcf5db Mon Sep 17 00:00:00 2001 From: samde Date: Wed, 29 Jul 2026 17:42:22 +0200 Subject: [PATCH 17/19] [IMP] pr review: refactoring of names following coding guidelines --- estate/models/estate_property.py | 8 ++++---- estate/models/estate_property_offer.py | 8 ++++---- estate/models/estate_property_tag.py | 2 +- estate/models/estate_property_type.py | 6 +++--- estate/models/user_properties.py | 4 ++-- estate/security/ir.model.access.csv | 10 +++++----- estate/views/estate_menus.xml | 16 ++++++++-------- estate/views/estate_property_offers_list.xml | 10 +++++----- estate/views/estate_property_tag_views.xml | 16 ++++++++-------- estate/views/estate_property_type_views.xml | 12 ++++++------ estate/views/estate_property_views.xml | 20 ++++++++++---------- estate_account/models/estate_property.py | 4 ++-- 12 files changed, 58 insertions(+), 58 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 1b955ab031d..7c9d183c25f 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -4,7 +4,7 @@ class EstateProperty(models.Model): - _name = "realestate.properties" + _name = "estate.property" _description = "Real estate properties" _order = "id desc" @@ -65,10 +65,10 @@ class EstateProperty(models.Model): string="Salesperson", default=lambda self: self.env.user, ) - property_type_id = fields.Many2one("realestate.properties.type") - property_tag_ids = fields.Many2many("realestate.properties.tag", string="Tags") + property_type_id = fields.Many2one("estate.property.type") + property_tag_ids = fields.Many2many("estate.property.tag", string="Tags") offer_ids = fields.One2many( - "realestate.properties.offer", + "estate.property.offer", "property_id", ) diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 03fb71bea12..27896212fb7 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -3,7 +3,7 @@ class EstatePropertyOffer(models.Model): - _name = "realestate.properties.offer" + _name = "estate.property.offer" _description = "Real estate property offer" _order = "price desc" @@ -28,9 +28,9 @@ class EstatePropertyOffer(models.Model): readonly=False, ) partner_id = fields.Many2one("res.partner", required=True) - property_id = fields.Many2one("realestate.properties", required=True) + property_id = fields.Many2one("estate.property", required=True) property_type_id = fields.Many2one( - "realestate.properties.type", + "estate.property.type", related="property_id.property_type_id", store=True, ) @@ -73,7 +73,7 @@ def action_refuse(self): def create(self, vals_list): for vals in vals_list: if vals.get("property_id"): - property_record = self.env["realestate.properties"].browse( + property_record = self.env["estate.property"].browse( vals["property_id"], ) offer_price = vals.get("price", 0.0) diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py index 355fe3b008f..a9aed9813a3 100644 --- a/estate/models/estate_property_tag.py +++ b/estate/models/estate_property_tag.py @@ -2,7 +2,7 @@ class EstatePropertyTag(models.Model): - _name = "realestate.properties.tag" + _name = "estate.property.tag" _description = "Real estate property tag" _order = "name" diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 103eb06ae58..118e303e5ea 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -2,7 +2,7 @@ class EstatePropertyType(models.Model): - _name = "realestate.properties.type" + _name = "estate.property.type" _description = "Real estate property type" _order = "sequence, name" @@ -13,8 +13,8 @@ class EstatePropertyType(models.Model): ) sequence = fields.Integer("Sequence") - property_list_id = fields.One2many("realestate.properties", "property_type_id") - offer_ids = fields.One2many("realestate.properties.offer", "property_type_id") + property_list_id = fields.One2many("estate.property", "property_type_id") + offer_ids = fields.One2many("estate.property.offer", "property_type_id") offer_count = fields.Integer("Offers", compute="_compute_offers_count") @api.depends("offer_ids") diff --git a/estate/models/user_properties.py b/estate/models/user_properties.py index 9ca8e019ef4..d7f31c3f304 100644 --- a/estate/models/user_properties.py +++ b/estate/models/user_properties.py @@ -5,14 +5,14 @@ class UserProperties(models.Model): _inherit = "res.users" property_ids = fields.One2many( - comodel_name="realestate.properties", + comodel_name="estate.property", inverse_name="sale_rep_id", string="Properties", domain=[ ( "state", "in", - ["new", "offer received"], + ["new", "offer_received"], ), ], ) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 169ca57d1a5..fe999a72c4c 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,6 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -estate.access_realestate_properties,access_realestate_properties,estate.model_realestate_properties,base.group_user,1,1,1,1 -estate.access_realestate_properties_type,access_realestate_properties_type,estate.model_realestate_properties_type,base.group_user,1,1,1,1 -estate.access_realestate_properties_tag,access_realestate_properties_tag,estate.model_realestate_properties_tag,base.group_user,1,1,1,1 -estate.access_realestate_properties_offer,access_realestate_properties_offer,estate.model_realestate_properties_offer,base.group_user,1,1,1,1 -estate.access_users,access_realestate_users,estate.model_res_users,base.group_user,1,1,1,1 \ No newline at end of file +access_estate_properties,estate.property,model_estate_property,base.group_user,1,1,1,1 +access_estate_properties_type,estate.property.type,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_properties_tag,estate.property_tag,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_properties_offer,estate.property.offer,model_estate_property_offer,base.group_user,1,1,1,1 +access_estate_res_users,estate.res.users,model_res_users,base.group_user,1,1,1,1 diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index b37cf1a4015..30906d18962 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,14 +1,14 @@ - - + \ No newline at end of file + diff --git a/estate/views/estate_property_offers_list.xml b/estate/views/estate_property_offers_list.xml index b632bf92ff3..bb0b57baaba 100644 --- a/estate/views/estate_property_offers_list.xml +++ b/estate/views/estate_property_offers_list.xml @@ -2,14 +2,14 @@ Property Offers - realestate.properties.offer + estate.property.offer list,form [('property_type_id', '=', active_id)] - realestate.property.offer.form - realestate.properties.offer + estate.property.offer.form + estate.property.offer
@@ -25,8 +25,8 @@ - realestate.property.offer.list - realestate.properties.offer + estate.property.offer.list + estate.property.offer diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml index 271561d3d82..8c4ff1453db 100644 --- a/estate/views/estate_property_tag_views.xml +++ b/estate/views/estate_property_tag_views.xml @@ -1,14 +1,14 @@ - + Property Tags - realestate.properties.tag + estate.property.tag list,form - realestate.property.tag.form - realestate.properties.tag + estate.property.tag.form + estate.property.tag @@ -22,8 +22,8 @@ - realestate.property.tag.list - realestate.properties.tag + estate.property.tag.list + estate.property.tag @@ -32,8 +32,8 @@ - realestate.property.tag.filter - realestate.properties.tag + estate.property.tag.filter + estate.property.tag diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml index bf89f2f03b7..861ef4e4922 100644 --- a/estate/views/estate_property_type_views.xml +++ b/estate/views/estate_property_type_views.xml @@ -1,14 +1,14 @@ - + Property Types - realestate.properties.type + estate.property.type list,form - realestate.property.type.form - realestate.properties.type + estate.property.type.form + estate.property.type
@@ -42,8 +42,8 @@ - realestate.property.type.list - realestate.properties.type + estate.property.type.list + estate.property.type diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index f8bdc75023d..ce86f9cdd6a 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -1,15 +1,15 @@ - + Property - realestate.properties + estate.property kanban,list,form {'search_default_available': True} - realestate.property.form - realestate.properties + estate.property.form + estate.property
@@ -70,8 +70,8 @@ - realestate.property.list - realestate.properties + estate.property.list + estate.property - realestate.property.filter - realestate.properties + estate.property.filter + estate.property @@ -112,8 +112,8 @@ - realestate.property.kanban - realestate.properties + estate.property.kanban + estate.property diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py index bdba50c6bf9..08d2d5e4ffa 100644 --- a/estate_account/models/estate_property.py +++ b/estate_account/models/estate_property.py @@ -2,7 +2,7 @@ class PropertyAccount(models.Model): - _inherit = "realestate.properties" + _inherit = "estate.property" def action_sold_btn(self): for record in self: @@ -21,7 +21,7 @@ def action_sold_btn(self): "name": "6% fee", "quantity": 1, "price_unit": record.selling_price * 0.06, - } + }, ), Command.create( { From 5f747aa92f9f02b5b5e32a7e5ac8b12a6ebb6a1a Mon Sep 17 00:00:00 2001 From: samde Date: Thu, 30 Jul 2026 09:55:13 +0200 Subject: [PATCH 18/19] [IMP] pr review: refactoring following coding guidelines --- estate/__init__.py | 2 +- estate/__manifest__.py | 2 +- estate/models/estate_property.py | 42 ++++++++-------- estate/models/estate_property_offer.py | 48 +++++++++---------- estate/models/estate_property_tag.py | 3 +- estate/models/estate_property_type.py | 10 ++-- ...st.xml => estate_property_offer_views.xml} | 4 +- estate/views/estate_property_tag_views.xml | 16 +------ estate/views/estate_property_type_views.xml | 4 +- estate/views/estate_property_views.xml | 12 ++--- 10 files changed, 67 insertions(+), 76 deletions(-) rename estate/views/{estate_property_offers_list.xml => estate_property_offer_views.xml} (92%) diff --git a/estate/__init__.py b/estate/__init__.py index 9a7e03eded3..0650744f6bc 100644 --- a/estate/__init__.py +++ b/estate/__init__.py @@ -1 +1 @@ -from . import models \ No newline at end of file +from . import models diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 3030e116cee..0d00491804f 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -5,7 +5,7 @@ "base", ], "data": [ - "views/estate_property_offers_list.xml", + "views/estate_property_offer_views.xml", "views/estate_property_type_views.xml", "views/estate_property_tag_views.xml", "views/estate_property_views.xml", diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 7c9d183c25f..e08984302eb 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -18,19 +18,11 @@ class EstateProperty(models.Model): default=lambda _: fields.Date.add(fields.Date.today(), months=3), ) expected_price = fields.Float("Expected Price", required=True) - _check_expected_price = models.Constraint( - "CHECK(expected_price > 0)", - _("The expected price should be strictly positive"), - ) selling_price = fields.Float( "Selling price", copy=False, readonly=True, ) - _check_selling_price = models.Constraint( - "CHECK(selling_price >= 0)", - _("The selling price should be strictly positive"), - ) state = fields.Selection( [ ("new", "New"), @@ -72,6 +64,16 @@ class EstateProperty(models.Model): "property_id", ) + _check_expected_price = models.Constraint( + "CHECK(expected_price > 0)", + _("The expected price should be strictly positive"), + ) + + _check_selling_price = models.Constraint( + "CHECK(selling_price >= 0)", + _("The selling price should be strictly positive"), + ) + @api.depends("living_area", "garden_area") def _compute_total_area(self): for record in self: @@ -99,18 +101,6 @@ def _onchange_garden(self): self.garden_area = 0 self.garden_orientation = None - def action_sold_btn(self): - for record in self: - if record.state == "cancelled": - raise exceptions.UserError(_("Cancelled properties cannot be sold.")) - record.state = "sold" - - def action_cancelled_btn(self): - for record in self: - if record.state == "sold": - raise exceptions.UserError(_("Sold properties cannot be cancelled.")) - record.state = "cancelled" - @api.constrains("expected_price", "selling_price") def _check_offer_acceptable_price(self): for record in self: @@ -132,3 +122,15 @@ def _unlink_except_state_is_new_or_cancelled(self): raise exceptions.UserError( _("Property that is either new or cancelled, can't be deleted."), ) + + def action_sold_btn(self): + for record in self: + if record.state == "cancelled": + raise exceptions.UserError(_("Cancelled properties cannot be sold.")) + record.state = "sold" + + def action_cancelled_btn(self): + for record in self: + if record.state == "sold": + raise exceptions.UserError(_("Sold properties cannot be cancelled.")) + record.state = "cancelled" diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 27896212fb7..074ba6e0a79 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -8,11 +8,6 @@ class EstatePropertyOffer(models.Model): _order = "price desc" price = fields.Float("Price", required=True) - _check_selling_price = models.Constraint( - "CHECK(price > 0)", - _("The price should be strictly positive"), - ) - status = fields.Selection( [("accepted", "Accepted"), ("refused", "Refused")], copy=False, @@ -35,6 +30,11 @@ class EstatePropertyOffer(models.Model): store=True, ) + _check_selling_price = models.Constraint( + "CHECK(price > 0)", + _("The price should be strictly positive"), + ) + @api.depends("create_date", "validity") def _computed_date_deadline(self): for offer in self: @@ -50,25 +50,6 @@ def _inverse_validity_period(self): create_date = fields.Date.to_date(offer.create_date) or fields.Date.today() offer.validity = (offer.date_deadline - create_date).days - def action_accept(self): - for offer in self: - if offer.property_id.buyer_id: - raise exceptions.UserError(_("One offer has already been accepted.")) - offer.status = "accepted" - offer.property_id.state = "offer_accepted" - offer.property_id.selling_price = offer.price - offer.property_id.buyer_id = offer.partner_id - - def action_refuse(self): - for offer in self: - offer.status = "refused" - if offer.property_id.state == "offer_received" and any( - s != "refused" for s in offer.mapped("status") - ): - offer.property_id.state = "new" - offer.property_id.selling_price = 0 - offer.property_id.buyer_id = None - @api.model_create_multi def create(self, vals_list): for vals in vals_list: @@ -88,3 +69,22 @@ def create(self, vals_list): if property_record.state == "new": property_record.state = "offer_received" return super().create(vals_list) + + def action_accept(self): + for offer in self: + if offer.property_id.buyer_id: + raise exceptions.UserError(_("One offer has already been accepted.")) + offer.status = "accepted" + offer.property_id.state = "offer_accepted" + offer.property_id.selling_price = offer.price + offer.property_id.buyer_id = offer.partner_id + + def action_refuse(self): + for offer in self: + offer.status = "refused" + if offer.property_id.state == "offer_received" and any( + s != "refused" for s in offer.mapped("status") + ): + offer.property_id.state = "new" + offer.property_id.selling_price = 0 + offer.property_id.buyer_id = None diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py index a9aed9813a3..f485777b2fc 100644 --- a/estate/models/estate_property_tag.py +++ b/estate/models/estate_property_tag.py @@ -7,8 +7,9 @@ class EstatePropertyTag(models.Model): _order = "name" name = fields.Char("Name", required=True) + color = fields.Integer() + _unique_name = models.Constraint( "UNIQUE(name)", _("Tage name already exists. Tag names must be unique."), ) - color = fields.Integer() diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 118e303e5ea..497192fbe32 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -7,16 +7,16 @@ class EstatePropertyType(models.Model): _order = "sequence, name" name = fields.Char("Property type", required=True) + sequence = fields.Integer("Sequence") + offer_count = fields.Integer("Offers", compute="_compute_offers_count") + property_list_id = fields.One2many("estate.property", "property_type_id") + offer_ids = fields.One2many("estate.property.offer", "property_type_id") + _unique_name = models.Constraint( "UNIQUE(name)", _("Property name already exists. Property names must be unique."), ) - sequence = fields.Integer("Sequence") - property_list_id = fields.One2many("estate.property", "property_type_id") - offer_ids = fields.One2many("estate.property.offer", "property_type_id") - offer_count = fields.Integer("Offers", compute="_compute_offers_count") - @api.depends("offer_ids") def _compute_offers_count(self): for offer in self: diff --git a/estate/views/estate_property_offers_list.xml b/estate/views/estate_property_offer_views.xml similarity index 92% rename from estate/views/estate_property_offers_list.xml rename to estate/views/estate_property_offer_views.xml index bb0b57baaba..579c703503c 100644 --- a/estate/views/estate_property_offers_list.xml +++ b/estate/views/estate_property_offer_views.xml @@ -7,7 +7,7 @@ [('property_type_id', '=', active_id)] - + estate.property.offer.form estate.property.offer @@ -24,7 +24,7 @@ - + estate.property.offer.list estate.property.offer diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml index 8c4ff1453db..8e312340602 100644 --- a/estate/views/estate_property_tag_views.xml +++ b/estate/views/estate_property_tag_views.xml @@ -6,7 +6,7 @@ list,form - + estate.property.tag.form estate.property.tag @@ -21,7 +21,7 @@ - + estate.property.tag.list estate.property.tag @@ -31,16 +31,4 @@ - - estate.property.tag.filter - estate.property.tag - - - - - - - - diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml index 861ef4e4922..d58705e48dc 100644 --- a/estate/views/estate_property_type_views.xml +++ b/estate/views/estate_property_type_views.xml @@ -6,7 +6,7 @@ list,form - + estate.property.type.form estate.property.type @@ -41,7 +41,7 @@ - + estate.property.type.list estate.property.type diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index ce86f9cdd6a..86114e7af11 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -7,16 +7,16 @@ {'search_default_available': True} - + estate.property.form estate.property
@@ -69,7 +69,7 @@ - + estate.property.list estate.property @@ -88,7 +88,7 @@ - + estate.property.filter estate.property @@ -111,7 +111,7 @@ - + estate.property.kanban estate.property From 15fcd01f6fd034854ba916b45da937ff6c6edf8a Mon Sep 17 00:00:00 2001 From: samde Date: Thu, 30 Jul 2026 10:41:19 +0200 Subject: [PATCH 19/19] [IMP] cli fails: add missing fields to __manifest__ & clashing labels --- estate/__manifest__.py | 2 ++ estate/models/user_properties.py | 2 +- estate_account/__manifest__.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 0d00491804f..50fb77efeeb 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,6 +1,7 @@ { "name": "Real Estate", "version": "1.9", + "author": "odoo", "depends": [ "base", ], @@ -14,4 +15,5 @@ "security/ir.model.access.csv", ], "application": True, + "license": "LGPL-3", } diff --git a/estate/models/user_properties.py b/estate/models/user_properties.py index d7f31c3f304..6045f9cdeb1 100644 --- a/estate/models/user_properties.py +++ b/estate/models/user_properties.py @@ -7,7 +7,7 @@ class UserProperties(models.Model): property_ids = fields.One2many( comodel_name="estate.property", inverse_name="sale_rep_id", - string="Properties", + string="Estate Properties", domain=[ ( "state", diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py index e156c50d92b..cdfc9d72171 100644 --- a/estate_account/__manifest__.py +++ b/estate_account/__manifest__.py @@ -1,6 +1,7 @@ { "name": "Estate account", "version": "1.9", + "author": "odoo", "depends": [ "base", "estate", @@ -8,4 +9,5 @@ ], "data": [], "application": True, + "license": "LGPL-3", }