From 562c468a4b490bc0ff7a17308789bf7c7b40304e Mon Sep 17 00:00:00 2001 From: farah Date: Thu, 18 Dec 2025 17:20:04 +0100 Subject: [PATCH 1/5] [ADD] Created estate module with property model and view --- estate/__init__.py | 2 + estate/__manifest__.py | 22 +++++++ estate/models/__init__.py | 3 + estate/models/estate_property.py | 49 +++++++++++++++ estate/security/ir.model.access.csv | 2 + estate/views/estate_menus.xml | 8 +++ estate/views/estate_property_views.xml | 83 ++++++++++++++++++++++++++ 7 files changed, 169 insertions(+) create mode 100644 estate/__init__.py create mode 100644 estate/__manifest__.py create mode 100644 estate/models/__init__.py create mode 100644 estate/models/estate_property.py create mode 100644 estate/security/ir.model.access.csv create mode 100644 estate/views/estate_menus.xml create mode 100644 estate/views/estate_property_views.xml diff --git a/estate/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..24c19d687df --- /dev/null +++ b/estate/__init__.py @@ -0,0 +1,2 @@ + +from . import models \ No newline at end of file diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..9f847e608c9 --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,22 @@ +{ + 'name': 'Estate', + 'version': '1.0', + 'category': 'Sales', + 'sequence': 1, + 'summary': 'Sell and bid on the hottest real estate properties.', + 'website': 'https://www.odoo.com/app/estate', + 'depends': [ + 'base_setup', + 'mail', + 'calendar', + 'contacts', + 'phone_validation', + ], + 'data': [ + 'security/ir.model.access.csv', + 'views/estate_property_views.xml', + 'views/estate_menus.xml', + ], + 'installable': True, + 'application': True +} \ No newline at end of file diff --git a/estate/models/__init__.py b/estate/models/__init__.py new file mode 100644 index 00000000000..04b41fc345e --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1,3 @@ + +from . import estate_property +#from . import estate_property_offer \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..cf0ba856001 --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,49 @@ +from odoo import fields, models +from dateutil.relativedelta import relativedelta + +class EstateProperty(models.Model): + _name = 'estate.property' + _description = "Real Estate Property" + + name= fields.Char('Title', required = True, translate = True) + property_type = fields.Selection( + selection=[('office', 'Office'), ('apartment', 'Apartment'), ('house', 'House'), ('studio', 'Studio')], + string='Property Type', + ) + postcode= fields.Char('Postcode', required=True) + availability = fields.Date( + 'Available From', + required=True, + copy = False, + default= lambda self: fields.Date.today()+ relativedelta(months=3), + ) + description= fields.Text('Description') + bedrooms= fields.Integer('Bedrooms', required=True, default= 2) + living_area= fields.Integer('Living Area (sqm)', required=True) + currency_id = fields.Many2one('res.currency', string='Currency', default=lambda self: self.env.ref('base.EUR')) + expected_price= fields.Monetary('Expected Price', required = True, currency_field='currency_id') + selling_price= fields.Monetary('Selling Price', currency_field='currency_id', readonly=True, copy=False) + # best_offer_id = fields.Many2one('estate.property.offer', string='Best Offer', readonly=True) + facades= fields.Integer('Facades', default=False) + garage= fields.Boolean('Garage', default=False) + garden= fields.Boolean('Garden', default=False) + garden_area= fields.Integer('Garden Area (sqm)', required=False) + garden_orientation= fields.Selection( + selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')], + string='Garden Orientation' + ) + total_area= fields.Integer('Total Area (sqm)') + + state = fields.Selection( + string = 'Status', + selection =[('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), + ('sold', 'Sold'), ('canceled', 'Canceled')], + required= True, + copy= False, + default= 'new', + ) + active = fields.Boolean('Active', default= True) + # _check_expected_price = models.Constraint( + # 'CHECK(expected_price) >= 0', + # "The expected price can't be negative", + # ) \ No newline at end of file diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..0e525a41a26 --- /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 +access_estate_property,estate.property,model_estate_property,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 new file mode 100644 index 00000000000..16a09cfc70e --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,8 @@ + + + + + + + + \ 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..14f0ded27c6 --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,83 @@ + + + + + estate.property.list.view + estate.property + + + + + + + + + + + + + + + estate.property.form.view + estate.property + +
+ +
+
+

+ +

+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + Property + estate.property + list,form + + + + estate.property.search + estate.property + + + + + + + + + + + + + + + + + \ No newline at end of file From 6266fba144598624b06026bc174d49427802c0ac Mon Sep 17 00:00:00 2001 From: farah Date: Fri, 19 Dec 2025 15:03:09 +0100 Subject: [PATCH 2/5] [ADD] estate_property_type: model and corresponding views (framework 101) --- estate/__init__.py | 2 +- estate/__manifest__.py | 9 +--- estate/models/__init__.py | 2 +- estate/models/estate_property.py | 61 ++++++++++++------------ estate/models/estate_property_type.py | 11 +++++ estate/security/ir.model.access.csv | 3 +- estate/views/estate_menus.xml | 9 ++-- estate/views/estate_property_views.xml | 65 ++++++++++++++++---------- 8 files changed, 95 insertions(+), 67 deletions(-) create mode 100644 estate/models/estate_property_type.py diff --git a/estate/__init__.py b/estate/__init__.py index 24c19d687df..a9e3372262c 100644 --- a/estate/__init__.py +++ b/estate/__init__.py @@ -1,2 +1,2 @@ -from . import models \ No newline at end of file +from . import models diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 9f847e608c9..e5838f68794 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,22 +1,17 @@ { 'name': 'Estate', - 'version': '1.0', 'category': 'Sales', 'sequence': 1, 'summary': 'Sell and bid on the hottest real estate properties.', 'website': 'https://www.odoo.com/app/estate', 'depends': [ 'base_setup', - 'mail', - 'calendar', - 'contacts', - 'phone_validation', + 'web', ], 'data': [ 'security/ir.model.access.csv', 'views/estate_property_views.xml', 'views/estate_menus.xml', ], - 'installable': True, 'application': True -} \ No newline at end of file +} diff --git a/estate/models/__init__.py b/estate/models/__init__.py index 04b41fc345e..a544207d8f5 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -1,3 +1,3 @@ from . import estate_property -#from . import estate_property_offer \ No newline at end of file +from . import estate_property_type diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index cf0ba856001..8c06012015f 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -2,48 +2,51 @@ from dateutil.relativedelta import relativedelta class EstateProperty(models.Model): - _name = 'estate.property' - _description = "Real Estate Property" + _name='estate.property' + _description="Real Estate Property" - name= fields.Char('Title', required = True, translate = True) - property_type = fields.Selection( - selection=[('office', 'Office'), ('apartment', 'Apartment'), ('house', 'House'), ('studio', 'Studio')], + name=fields.Char('Title', required=True, translate=True) + property_type_id=fields.Many2one( + 'estate.property.type', string='Property Type', ) - postcode= fields.Char('Postcode', required=True) - availability = fields.Date( + postcode=fields.Char('Postcode', required=True) + availability =fields.Date( 'Available From', required=True, - copy = False, - default= lambda self: fields.Date.today()+ relativedelta(months=3), - ) - description= fields.Text('Description') - bedrooms= fields.Integer('Bedrooms', required=True, default= 2) - living_area= fields.Integer('Living Area (sqm)', required=True) - currency_id = fields.Many2one('res.currency', string='Currency', default=lambda self: self.env.ref('base.EUR')) - expected_price= fields.Monetary('Expected Price', required = True, currency_field='currency_id') - selling_price= fields.Monetary('Selling Price', currency_field='currency_id', readonly=True, copy=False) + copy=False, + default=lambda self: fields.Date.today()+relativedelta(months=3), + ) + description=fields.Text('Description') + bedrooms=fields.Integer('Bedrooms', required=True, default=2) + living_area=fields.Integer('Living Area (sqm)', required=True) + currency_id=fields.Many2one('res.currency', string='Currency', default=lambda self: self.env.company.currency_id.id) + expected_price=fields.Monetary('Expected Price', required=True) + selling_price=fields.Monetary('Selling Price', readonly=True, copy=False) # best_offer_id = fields.Many2one('estate.property.offer', string='Best Offer', readonly=True) - facades= fields.Integer('Facades', default=False) - garage= fields.Boolean('Garage', default=False) - garden= fields.Boolean('Garden', default=False) - garden_area= fields.Integer('Garden Area (sqm)', required=False) - garden_orientation= fields.Selection( + facades=fields.Integer('Facades', default=False) + garage=fields.Boolean('Garage', default=False) + garden=fields.Boolean('Garden', default=False) + garden_area=fields.Integer('Garden Area (sqm)', required=False) + garden_orientation=fields.Selection( selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')], string='Garden Orientation' ) - total_area= fields.Integer('Total Area (sqm)') + total_area=fields.Integer('Total Area (sqm)') - state = fields.Selection( - string = 'Status', + state=fields.Selection( + string ='Status', selection =[('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], - required= True, - copy= False, - default= 'new', + required=True, + copy=False, + default='new', ) - active = fields.Boolean('Active', default= True) + active =fields.Boolean('Active', default=True) + buyer_id =fields.Many2one('res.partner', string='Buyer', copy=False) + seller_id=fields.Many2one('res.users', string='Salesperson', default=lambda self:self.env.user) + # _check_expected_price = models.Constraint( # 'CHECK(expected_price) >= 0', # "The expected price can't be negative", - # ) \ No newline at end of file + # ) diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py new file mode 100644 index 00000000000..9f457a5121d --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,11 @@ +from odoo import fields, models +from dateutil.relativedelta import relativedelta + +class EstateProperty(models.Model): + _name = 'estate.property.type' + _description = "Real Estate Property Type" + + name=fields.Char( + "Name", + required=True, + ) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 0e525a41a26..622378709a1 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 -access_estate_property,estate.property,model_estate_property,base.group_user,1,1,1,1 \ No newline at end of file +access_estate_property,estate.property,model_estate_property,base.group_user,1,1,1,1 +access_estate_property_type,estate.property.type,model_estate_property_type,base.group_user,1,1,1,1 diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 16a09cfc70e..aa1c7bda34e 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,8 +1,11 @@ - - + + + + + - \ No newline at end of file + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 14f0ded27c6..6244436f750 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -2,17 +2,17 @@ - estate.property.list.view - estate.property - - - - - - - - - + estate.property.list.view + estate.property + + + + + + + + + @@ -20,7 +20,7 @@ estate.property.form.view estate.property - +
@@ -31,22 +31,29 @@
- - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + @@ -72,12 +79,20 @@ + + - \ No newline at end of file + + + Property Types + estate.property.type + list + + From dd84e7e2499eba69abe15e89978bf82650a61e8c Mon Sep 17 00:00:00 2001 From: farah Date: Fri, 19 Dec 2025 16:39:13 +0100 Subject: [PATCH 3/5] [LINT] trying to pass runbot checks --- estate/models/estate_property.py | 65 +++++++++++++-------------- estate/models/estate_property_type.py | 4 +- ruff.toml | 44 ++++++++++++++++++ 3 files changed, 77 insertions(+), 36 deletions(-) create mode 100644 ruff.toml diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 8c06012015f..d2b48001de5 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,50 +1,47 @@ from odoo import fields, models from dateutil.relativedelta import relativedelta + class EstateProperty(models.Model): - _name='estate.property' - _description="Real Estate Property" + _name = 'estate.property' + _description = "Real Estate Property" - name=fields.Char('Title', required=True, translate=True) - property_type_id=fields.Many2one( + name = fields.Char("Title", required=True, translate=True) + property_type_id = fields.Many2one( 'estate.property.type', - string='Property Type', - ) - postcode=fields.Char('Postcode', required=True) - availability =fields.Date( - 'Available From', - required=True, - copy=False, - default=lambda self: fields.Date.today()+relativedelta(months=3), + string="Property Type", ) - description=fields.Text('Description') - bedrooms=fields.Integer('Bedrooms', required=True, default=2) - living_area=fields.Integer('Living Area (sqm)', required=True) - currency_id=fields.Many2one('res.currency', string='Currency', default=lambda self: self.env.company.currency_id.id) - expected_price=fields.Monetary('Expected Price', required=True) - selling_price=fields.Monetary('Selling Price', readonly=True, copy=False) - # best_offer_id = fields.Many2one('estate.property.offer', string='Best Offer', readonly=True) - facades=fields.Integer('Facades', default=False) - garage=fields.Boolean('Garage', default=False) - garden=fields.Boolean('Garden', default=False) - garden_area=fields.Integer('Garden Area (sqm)', required=False) - garden_orientation=fields.Selection( - selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')], - string='Garden Orientation' + postcode = fields.Char("Postcode", required=True) + availability = fields.Date( + "Available From", + required=True, + copy=False, + default=lambda self: fields.Date.today() + relativedelta(months=3), ) - total_area=fields.Integer('Total Area (sqm)') + description = fields.Text("Description") + bedrooms = fields.Integer("Bedrooms", required=True, default=2) + living_area = fields.Integer("Living Area (sqm)", required=True) + currency_id = fields.Many2one('res.currency', string="Currency", default=lambda self: self.env.company.currency_id.id) + expected_price = fields.Monetary("Expected Price", required=True) + selling_price = fields.Monetary("Selling Price", readonly=True, copy=False) + # best_offer_id = fields.Many2one('estate.property.offer', string='Best Offer', readonly=True) + facades = fields.Integer("Facades", default=False) + garage = fields.Boolean("Garage", default=False) + garden = fields.Boolean("Garden", default=False) + garden_area = fields.Integer("Garden Area (sqm)", required=False) + garden_orientation = fields.Selection(selection=[('north', "North"), ('south', "South"), ('east', "East"), ('west', "West")], string="Garden Orientation") + total_area = fields.Integer("Total Area (sqm)") - state=fields.Selection( - string ='Status', - selection =[('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), - ('sold', 'Sold'), ('canceled', 'Canceled')], + state = fields.Selection( + string="Status", + selection=[('new', "New"), ('offer_received', "Offer Received"), ('offer_accepted', "Offer Accepted"), ('sold', "Sold"), ('canceled', "Canceled")], required=True, copy=False, default='new', ) - active =fields.Boolean('Active', default=True) - buyer_id =fields.Many2one('res.partner', string='Buyer', copy=False) - seller_id=fields.Many2one('res.users', string='Salesperson', default=lambda self:self.env.user) + active = fields.Boolean("Active", default=True) + buyer_id = fields.Many2one('res.partner', string="Buyer", copy=False) + seller_id = fields.Many2one('res.users', string="Salesperson", default=lambda self: self.env.user) # _check_expected_price = models.Constraint( # 'CHECK(expected_price) >= 0', diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 9f457a5121d..77bc4eb6ad0 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -1,11 +1,11 @@ from odoo import fields, models -from dateutil.relativedelta import relativedelta + class EstateProperty(models.Model): _name = 'estate.property.type' _description = "Real Estate Property Type" - name=fields.Char( + name = fields.Char( "Name", required=True, ) diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 00000000000..e84deba95cb --- /dev/null +++ b/ruff.toml @@ -0,0 +1,44 @@ +# Exclude a variety of commonly ignored directories. +exclude = [ + ".bzr", + ".direnv", + ".eggs", + ".git", + ".git-rewrite", + ".hg", + ".ipynb_checkpoints", + ".mypy_cache", + ".nox", + ".pants.d", + ".pyenv", + ".pytest_cache", + ".pytype", + ".ruff_cache", + ".svn", + ".tox", + ".venv", + ".vscode", + "__pypackages__", + "_build", + "buck-out", + "build", + "dist", + "node_modules", + "site-packages", + "venv", +] + +# Assume Python 3.12 +target-version = "py312" + +line-length = 255 +[lint] +# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default. +select = ["ALL"] +ignore = ["A","ARG","ANN","B","C901","D","DTZ","DOC","E501","ERA001","FBT","N","PD","PERF","PIE790","PLR","PT","Q","RSE102","RUF001","RUF012","S","SIM102","SIM108","SLF001","TID252","UP031","TRY003","TRY300","E713","SIM117","PGH003","RUF005","FIX","TD","TRY400","C408","PLW2901","PTH","EM102","INP001","CPY001","E266","PIE808","PLC2701","RUF100","FA100","FURB","C420","COM812","TRY002","B904","EM101","I001","UP006","UP007","RET","RUF021","E741","FAST","ASYNC","AIR","DJ","NPY","FA102","F401"] + +# Allow fix for all enabled rules (when `--fix`) is provided. +fixable = ["ALL"] +unfixable = ["A","ARG","ANN","B","C901","D","DTZ","DOC","E501","ERA001","FBT","N","PD","PERF","PIE790","PLR","PT","Q","RSE102","RUF001","RUF012","S","SIM102","SIM108","SLF001","TID252","UP031","TRY003","TRY300","E713","SIM117","PGH003","RUF005","FIX","TD","TRY400","C408","PLW2901","PTH","EM102","INP001","CPY001","E266","PIE808","PLC2701","RUF100","FA100","FURB","C420","COM812","TRY002","B904","EM101","I001","UP006","UP007","RET","RUF021","E741","FAST","ASYNC","AIR","DJ","NPY","FA102","F401"] +[format] +quote-style = "preserve" From c77fb19e9161ea53473dff429fb1467ac64656e1 Mon Sep 17 00:00:00 2001 From: farah Date: Wed, 24 Dec 2025 17:07:02 +0100 Subject: [PATCH 4/5] [ADD] created estate property offer and estate property tag models --- estate/models/__init__.py | 3 + estate/models/estate_property.py | 80 +++++++++++- estate/models/estate_property_offer.py | 72 +++++++++++ estate/models/estate_property_tag.py | 19 +++ estate/models/estate_property_type.py | 23 +++- estate/models/inherited_model.py | 7 + estate/security/ir.model.access.csv | 2 + estate/views/estate_menus.xml | 1 + estate/views/estate_property_views.xml | 170 +++++++++++++++++++++++-- 9 files changed, 357 insertions(+), 20 deletions(-) create mode 100644 estate/models/estate_property_offer.py create mode 100644 estate/models/estate_property_tag.py create mode 100644 estate/models/inherited_model.py diff --git a/estate/models/__init__.py b/estate/models/__init__.py index a544207d8f5..a2dc03361d9 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -1,3 +1,6 @@ from . import estate_property from . import estate_property_type +from . import estate_property_tag +from . import estate_property_offer +from . import inherited_model diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index d2b48001de5..831444055f5 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,10 +1,12 @@ -from odoo import fields, models +from odoo import fields, models, api from dateutil.relativedelta import relativedelta +from odoo.exceptions import UserError class EstateProperty(models.Model): _name = 'estate.property' _description = "Real Estate Property" + _order = 'id desc' name = fields.Char("Title", required=True, translate=True) property_type_id = fields.Many2one( @@ -30,7 +32,20 @@ class EstateProperty(models.Model): garden = fields.Boolean("Garden", default=False) garden_area = fields.Integer("Garden Area (sqm)", required=False) garden_orientation = fields.Selection(selection=[('north', "North"), ('south', "South"), ('east', "East"), ('west', "West")], string="Garden Orientation") - total_area = fields.Integer("Total Area (sqm)") + @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 = False + + total_area = fields.Integer("Total Area (sqm)", compute='_compute_area') + @api.depends('garden_area', 'living_area') + def _compute_area(self): + for record in self: + record.total_area = record.living_area + record.garden_area state = fields.Selection( string="Status", @@ -39,11 +54,64 @@ class EstateProperty(models.Model): copy=False, default='new', ) + def sold_action(self): + for record in self: + if record.state != 'canceled': + record.state = 'sold' + else: + raise UserError(record.env._("You can not sell a canceled property.")) + return True + def cancel_action(self): + for record in self: + if record.state != 'sold': + record.state = 'canceled' + else: + raise UserError(record.env._("You can not cancel a sold property.")) + return True active = fields.Boolean("Active", default=True) buyer_id = fields.Many2one('res.partner', string="Buyer", copy=False) seller_id = fields.Many2one('res.users', string="Salesperson", default=lambda self: self.env.user) + tag_ids = fields.Many2many( + 'estate.property.tag', + string="Tags", + ) + offer_ids = fields.One2many( + 'estate.property.offer', + 'property_id', + string="Offers", + ) + best_offer = fields.Monetary( + string="Best Offer", + compute='_compute_best_offer', + ) + @api.depends('offer_ids.price') + def _compute_best_offer(self): + for record in self: + if record.offer_ids: + record.best_offer = max(record.offer_ids.mapped('price')) + else: + record.best_offer = 0.0 - # _check_expected_price = models.Constraint( - # 'CHECK(expected_price) >= 0', - # "The expected price can't be negative", - # ) + def write(self, vals): + result = super().write(vals) + if 'offer_ids' in vals: + for record in self: + if record.offer_ids and record.state == 'new': + record.state = 'offer_received' + elif not record.offer_ids and record.state == 'offer_received': + record.state = 'new' + return result + + _check_expected_price = models.Constraint( + 'CHECK(expected_price > 0)', + "The expected price should be higher than zero.", + ) + _check_selling_price = models.Constraint( + 'CHECK(selling_price >= 0)', + "The selling price can't be negative", + ) + @api.ondelete(at_uninstall=False) + def _unlink_if_new_or_canceled(self): + if any((not(record.state == 'new') and not(record.state == 'canceled')) + for record in self): + raise UserError("Only new and canceled properties can be deleted!") diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..8b04332b5fe --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,72 @@ +from odoo import models, fields, api +from dateutil.relativedelta import relativedelta +from odoo.exceptions import UserError, ValidationError + +class EstatePropertyOffer(models.Model): + _name = 'estate.property.offer' + _description = "Offer to buy real estate property" + _order = 'price desc' + + property_id = fields.Many2one( + 'estate.property', + string="Property Name", + required=True, + ondelete='cascade', + ) + property_type_id = fields.Many2one(related="property_id.property_type_id", store=True) + partner_id = fields.Many2one('res.partner', string="Partner", required=True) + create_date = fields.Date(default=lambda self: fields.Date.today()) + validity = fields.Integer("Validity (days)", default=7) + date_deadline = fields.Date( + "Deadline", + compute='_compute_date', + inverse='_inverse_date', + ) + @api.depends('validity') + def _compute_date(self): + for record in self: + record.date_deadline = record.create_date + relativedelta(days=record.validity) + + def _inverse_date(self): + for record in self: + record.validity = (record.date_deadline - record.create_date).days + + currency_id = fields.Many2one('res.currency', string="Currency", default=lambda self: self.env.company.currency_id.id) + price = fields.Monetary("Price") + status = fields.Selection( + string="Status", + selection=[('accepted', "Accepted"), ('refused', "Refused")], + copy=False, + ) + def accept_offer(self): + for record in self: + if record.property_id.offer_ids.filtered(lambda o: o.status == 'accepted'): + raise UserError(record.env._("There is already an accepted offer for this property.")) + record.status = 'accepted' + record.property_id.selling_price = record.price + record.property_id.state = 'offer_accepted' + record.property_id.buyer_id = record.partner_id + return True + def refuse_offer(self): + for record in self: + record.status = 'refused' + return True + _check_price = models.Constraint( + 'CHECK(price > 0)', + "The offer price must be positive", + ) + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if 'property_id' in vals and 'price' in vals: + linked_property = self.env['estate.property'].browse(vals['property_id']) + if linked_property.best_offer and vals['price'] < linked_property.best_offer: + raise UserError("The offer price must be higher than the current best offer of %.2f" % property.best_offer) + return super().create(vals_list) + + @api.constrains('status') + def _check_fair_price(self): + for record in self: + if record.status == 'accepted' and record.price < record.property_id.expected_price*0.9: + raise ValidationError(record.env._(f"The selling price must be at least {90}% of the expected price. \n If you want to accept this offer, lower the expected price.")) diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..da22dc639cc --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,19 @@ +from odoo import fields, models + + +class EstatePropertyTag(models.Model): + _name = 'estate.property.tag' + _description = "Real Estate Property Tag" + _order = 'name' + + name = fields.Char( + "Name", + required=True, + ) + _name_uniq = models.Constraint( + 'unique(name)', + 'This property tag already exists.', + ) + color = fields.Integer( + "Color" + ) diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 77bc4eb6ad0..ab4df8159e2 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -1,11 +1,30 @@ -from odoo import fields, models +from odoo import fields, models, api -class EstateProperty(models.Model): +class EstatePropertyType(models.Model): _name = 'estate.property.type' _description = "Real Estate Property Type" + _order = 'sequence, name' name = fields.Char( "Name", required=True, ) + _name_uniq = models.Constraint( + 'unique(name)', + 'This property type already exists.', + ) + property_ids = fields.One2many( + 'estate.property', + 'property_type_id', + ) + sequence = fields.Integer("Sequence", default=1) + offer_ids = fields.One2many( + 'estate.property.offer', + 'property_type_id', + ) + offer_count = fields.Integer(compute='_compute_offer_count') + @api.depends('offer_ids') + def _compute_offer_count(self): + for record in self: + record.offer_count = len(record.offer_ids) diff --git a/estate/models/inherited_model.py b/estate/models/inherited_model.py new file mode 100644 index 00000000000..8e5faf3d6da --- /dev/null +++ b/estate/models/inherited_model.py @@ -0,0 +1,7 @@ +from odoo import models, fields + + +class Users(models.Model): + _inherit = 'res.users' + + property_ids = fields.One2many('estate.property', 'seller_id', domain=[('state','in', ['new','offer_received'])]) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 622378709a1..404f43c06fe 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 access_estate_property,estate.property,model_estate_property,base.group_user,1,1,1,1 access_estate_property_type,estate.property.type,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_property_tag,estate.property.tag,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_property_offer,estate.property.offer,model_estate_property_offer,base.group_user,1,1,1,1 diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index aa1c7bda34e..e65356d0bd3 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -6,6 +6,7 @@ + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 6244436f750..4a8c456a7e7 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -5,14 +5,19 @@ estate.property.list.view estate.property - + + + - + @@ -22,6 +27,11 @@ estate.property +
+
@@ -30,12 +40,18 @@
- - - - - - + + + + + + + + + + + + @@ -46,10 +62,14 @@ - - + + + + + + @@ -63,9 +83,11 @@ - Property + Properties estate.property list,form + + {'search_default_state': True} @@ -77,7 +99,7 @@ - + @@ -90,9 +112,133 @@ + + Property Offers + estate.property.offer + list,form + [('property_type_id', '=', active_id)] + + + + estate.property.offer.list.view + estate.property.offer + + + + + + + + +
+
+

+ +

+
+
+ + + + + + + + + + + + + + + + +
+ + + estate.property.type.list.view + estate.property.type + + + + + + + + + + Property Tags + estate.property.tag list + + + estate.property.tag.form.view + estate.property.tag + +
+ + + +
+ + + + + inherited.model.form.view + res.users + + + + + + + + + + + From e5a923c840ee6ae3292756e9d001e048d201944b Mon Sep 17 00:00:00 2001 From: farah Date: Wed, 24 Dec 2025 17:16:57 +0100 Subject: [PATCH 5/5] [LINT] pass the check --- estate/models/estate_property.py | 8 +++++++- estate/models/estate_property_offer.py | 7 ++++++- estate/models/estate_property_type.py | 1 + estate/models/inherited_model.py | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 831444055f5..3ca8ba51001 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -32,6 +32,7 @@ class EstateProperty(models.Model): garden = fields.Boolean("Garden", default=False) garden_area = fields.Integer("Garden Area (sqm)", required=False) garden_orientation = fields.Selection(selection=[('north', "North"), ('south', "South"), ('east', "East"), ('west', "West")], string="Garden Orientation") + @api.onchange('garden') def _onchange_garden(self): if self.garden: @@ -42,6 +43,7 @@ def _onchange_garden(self): self.garden_orientation = False total_area = fields.Integer("Total Area (sqm)", compute='_compute_area') + @api.depends('garden_area', 'living_area') def _compute_area(self): for record in self: @@ -54,6 +56,7 @@ def _compute_area(self): copy=False, default='new', ) + def sold_action(self): for record in self: if record.state != 'canceled': @@ -61,6 +64,7 @@ def sold_action(self): else: raise UserError(record.env._("You can not sell a canceled property.")) return True + def cancel_action(self): for record in self: if record.state != 'sold': @@ -84,6 +88,7 @@ def cancel_action(self): string="Best Offer", compute='_compute_best_offer', ) + @api.depends('offer_ids.price') def _compute_best_offer(self): for record in self: @@ -110,8 +115,9 @@ def write(self, vals): 'CHECK(selling_price >= 0)', "The selling price can't be negative", ) + @api.ondelete(at_uninstall=False) def _unlink_if_new_or_canceled(self): - if any((not(record.state == 'new') and not(record.state == 'canceled')) + if any((not (record.state == 'new') and not (record.state == 'canceled')) for record in self): raise UserError("Only new and canceled properties can be deleted!") diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 8b04332b5fe..6416f2b7beb 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -2,6 +2,7 @@ from dateutil.relativedelta import relativedelta from odoo.exceptions import UserError, ValidationError + class EstatePropertyOffer(models.Model): _name = 'estate.property.offer' _description = "Offer to buy real estate property" @@ -22,6 +23,7 @@ class EstatePropertyOffer(models.Model): compute='_compute_date', inverse='_inverse_date', ) + @api.depends('validity') def _compute_date(self): for record in self: @@ -38,6 +40,7 @@ def _inverse_date(self): selection=[('accepted', "Accepted"), ('refused', "Refused")], copy=False, ) + def accept_offer(self): for record in self: if record.property_id.offer_ids.filtered(lambda o: o.status == 'accepted'): @@ -47,10 +50,12 @@ def accept_offer(self): record.property_id.state = 'offer_accepted' record.property_id.buyer_id = record.partner_id return True + def refuse_offer(self): for record in self: record.status = 'refused' return True + _check_price = models.Constraint( 'CHECK(price > 0)', "The offer price must be positive", @@ -68,5 +73,5 @@ def create(self, vals_list): @api.constrains('status') def _check_fair_price(self): for record in self: - if record.status == 'accepted' and record.price < record.property_id.expected_price*0.9: + if record.status == 'accepted' and record.price < record.property_id.expected_price * 0.9: raise ValidationError(record.env._(f"The selling price must be at least {90}% of the expected price. \n If you want to accept this offer, lower the expected price.")) diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index ab4df8159e2..0146aff7eb6 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -24,6 +24,7 @@ class EstatePropertyType(models.Model): 'property_type_id', ) offer_count = fields.Integer(compute='_compute_offer_count') + @api.depends('offer_ids') def _compute_offer_count(self): for record in self: diff --git a/estate/models/inherited_model.py b/estate/models/inherited_model.py index 8e5faf3d6da..2d873f42463 100644 --- a/estate/models/inherited_model.py +++ b/estate/models/inherited_model.py @@ -4,4 +4,4 @@ class Users(models.Model): _inherit = 'res.users' - property_ids = fields.One2many('estate.property', 'seller_id', domain=[('state','in', ['new','offer_received'])]) + property_ids = fields.One2many('estate.property', 'seller_id', domain=[('state', 'in', ['new', 'offer_received'])])