From 66261965c7bd14213a26333c2061f7d3592cf49d Mon Sep 17 00:00:00 2001 From: Taewan Kim Date: Wed, 18 Jun 2025 15:09:00 +0200 Subject: [PATCH 1/4] [ADD] estate: new module to manage estate --- estate/__init__.py | 1 + estate/__manifest__.py | 14 +++ estate/models/__init__.py | 4 + estate/models/estate_property.py | 115 +++++++++++++++++++ estate/models/estate_property_offer.py | 45 ++++++++ estate/models/estate_property_tag.py | 8 ++ estate/models/estate_property_type.py | 22 ++++ estate/models/res_users.py | 7 ++ estate/security/ir.model.access.csv | 5 + estate/views/estate_menus.xml | 14 +++ estate/views/estate_property_offer_views.xml | 44 +++++++ estate/views/estate_property_tag_views.xml | 17 +++ estate/views/estate_property_type_views.xml | 39 +++++++ estate/views/estate_property_views.xml | 105 +++++++++++++++++ estate/views/res_uesrs_view.xml | 15 +++ estate_account/__init__.py | 1 + estate_account/__manifest__.py | 11 ++ estate_account/models/__init__.py | 1 + estate_account/models/estate_property.py | 27 +++++ estate_account/security/ir.model.access.csv | 5 + 20 files changed, 500 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/models/estate_property_offer.py create mode 100644 estate/models/estate_property_tag.py create mode 100644 estate/models/estate_property_type.py create mode 100644 estate/models/res_users.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_offer_views.xml create mode 100644 estate/views/estate_property_tag_views.xml create mode 100644 estate/views/estate_property_type_views.xml create mode 100644 estate/views/estate_property_views.xml create mode 100644 estate/views/res_uesrs_view.xml 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/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/estate/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..ce7432fc16d --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,14 @@ +{ + 'name': "Estate", + 'depends': ['base'], + 'application': True, + 'installable': True, + 'data': [ + 'security/ir.model.access.csv', + 'views/estate_property_views.xml', + 'views/estate_property_type_views.xml', + 'views/estate_property_offer_views.xml', + 'views/estate_property_tag_views.xml', + 'views/estate_menus.xml', + ] +} \ No newline at end of file diff --git a/estate/models/__init__.py b/estate/models/__init__.py new file mode 100644 index 00000000000..6bf74e58eb2 --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1,4 @@ +from . import estate_property +from . import estate_property_type +from . import estate_property_offer +from . import estate_property_tag diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..64a21942f5b --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,115 @@ +from datetime import date, timedelta + +from odoo import api, fields, models +from odoo.exceptions import UserError, ValidationError +from odoo.tools.float_utils import float_compare, float_is_zero + +class EstateProperty(models.Model): + _name = 'estate.property' + _description = "Real Estate Property" + + _sql_constraints = [ + ('check_expected_price', 'CHECK(expected_price > 0)', "Expected price must be strictly positive."), + ('check_selling_price', 'CHECK(selling_price >= 0)', "Selling price must be strictly positive.") + ] + + name = fields.Char(string="Title", required=True) + description = fields.Text() + postcode = fields.Char() + date_availability = fields.Date(copy=False, default=lambda self: date.today() + timedelta(days=90)) + expected_price = fields.Float(required=True) + selling_price = fields.Float(readonly=True, copy=False) + bedrooms = fields.Integer(default=2) + living_area = fields.Integer(string="Living Area (sqm)") + facades = fields.Integer(string="Facade") + garage = fields.Boolean() + garden = fields.Boolean() + garden_area = fields.Integer(string="Garden Area (sqm)") + garden_orientation = fields.Selection( + selection=[ + ('north', "North"), + ('south', "South"), + ('east', "East"), + ('west', "West"), + ], + string="Garden Orientation" + ) + available = fields.Boolean(default=True) + property_type_id = fields.Many2one("estate.property.type", string="Property Type") + salesman_id = fields.Many2one("res.users", string="Salesman", default=lambda self: self.env.user) + buyer_id = fields.Many2one("res.partner", string="Buyer") + tag_ids = fields.Many2many("estate.property.tag", string="Tags") + offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers") + state = fields.Selection( + selection=[ + ('new', "New"), + ('offer_received', "Received"), + ('offer_accepted', "Accepted"), + ('sold', "Sold"), + ('cancelled', "Cancelled"), + ('refused', "Refused") + ], + required=True, + copy=False, + default='new' + ) + note = fields.Text(string="Special mention about the property.") + total_area = fields.Integer(string="Total Area (sqm)", compute="_compute_total_area") + best_offer = fields.Float(string="Best Offer", compute="_compute_best_price") + + @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: + if record.offer_ids: + record.best_offer = max(record.offer_ids.mapped("price")) + else: + record.best_offer = 0.0 + + @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 + + def cancel_property_button(self): + for record in self: + if record.state != 'sold': + record.state = 'cancelled' + else: + raise UserError("You cannot cancel a sold property.") + + def sold_property_button(self): + for record in self: + if record.state != 'cancelled': + record.state = 'sold' + else: + raise UserError("You cannot sell a cancelled property.") + + @api.constrains('expected_price') + def _check_expected_price_positive(self): + for record in self: + if record.expected_price <= 0: + raise ValidationError("Expected price must be strictly positive.") + + @api.constrains('selling_price', 'expected_price') + def _check_selling_price_margin(self): + for record in self: + if float_is_zero(record.selling_price, precision_digits=2): + continue + min_acceptable_price = record.expected_price * 0.9 + if float_compare(record.selling_price, min_acceptable_price, precision_digits=2) < 0: + raise ValidationError("The selling price cannot be lower than 90% of the expected price.") + + @api.depends(at_uninstall=False) + def check_delete(self): + for record in self: + if record.state not in ['new', 'cancelled']: + raise UserError("YOU CANNOT DELETE A PROPERTY THAT IS NOT NEW OR CANCELLED") \ No newline at end of file diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..2b1825e0ebe --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,45 @@ +from datetime import date, timedelta + +from odoo import api, fields, models +from odoo.exceptions import UserError + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Estate property offer" + + price = fields.Float() + status = fields.Selection( + selection=[ + ('accepted', "Accepted"), + ('refused', "Refused") + ], + copy=False + ) + partner_id = fields.Many2one("res.partner", required=True) + property_id = fields.Many2one("estate.property", required=True) + validity = fields.Integer(default=7) + deadline = fields.Date(string="Deadline", compute="_compute_deadline", inverse="_inverse_deadline") + + @api.depends("validity") + def _compute_deadline(self): + for record in self: + record.deadline = date.today() + timedelta(days=record.validity) + + def _inverse_deadline(self): + for record in self: + if record.deadline: + record.validity = (record.deadline - date.today()).days + + def offer_accept(self): + if 'accepted' in self.mapped("property_id.offer_ids.status"): + raise UserError("An offer is already accepted.") + for record in self: + record.status = 'accepted' + record.property_id.state = 'offer_accepted' + record.property_id.buyer_id = record.partner_id + record.property_id.selling_price = record.price + + def offer_refuse(self): + for record in self: + record.status = 'refused' diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..f3f5409a34a --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,8 @@ +from odoo import fields,models + +class estate_property_tag(models.Model): + _name = "estate.property.tag" + _description = "Estate property tag file" + + name = fields.Char('Name',required=True) + color = fields.Integer() \ 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..b85a3fcf312 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,22 @@ +from odoo import api, fields, models + +class estate_property_type(models.Model): + _name = "estate.property.type" + _description = "Property type models file" + + name = fields.Char("Name", required=True) + + _sql_constraints = [ + ('unique_type_name', 'UNIQUE(name)', 'The name should be unique') + ] + + _order = "name" + + property_id = fields.One2many("estate.property", "property_type_id") + offer_id = fields.One2many("estate.property.offer", "property_id") + offer_counts = fields.Integer(compute="_compute_offer_counts") + + @api.depends("offer_id") + def _compute_offer_counts(self): + for record in self: + record.offer_counts = len(record.offer_id) diff --git a/estate/models/res_users.py b/estate/models/res_users.py new file mode 100644 index 00000000000..e6ebde31b57 --- /dev/null +++ b/estate/models/res_users.py @@ -0,0 +1,7 @@ +from odoo import fields, models + +class res_users(models.Model): + _inherit = 'res.users' + + property_ids = fields.One2many('estate.property', "salesman_id", domain="('state','=','new'),('state','=','offer_received')") + diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..4e256dd58f4 --- /dev/null +++ b/estate/security/ir.model.access.csv @@ -0,0 +1,5 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"estate.access_estate_property","access_estate_property","estate.model_estate_property","base.group_user",1,1,1,1 +"estate.access_estate_property_type","access_estate_property_type","estate.model_estate_property_type","base.group_user",1,1,1,1 +"estate.access_estate_property_offer","access_estate_property_offer","estate.model_estate_property_offer","base.group_user",1,1,1,1 +"estate.access_estate_property_tag","access_estate_property_tag","estate.model_estate_property_tag","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..4034d9af352 --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..ecd76a2662e --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,44 @@ + + + + estate.property.offer.form + estate.property.offer + +
+ + +

+ +

+ + + + + + + +
+ + + + estate.property.offer.list + estate.property.offer + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property Types + estate.property.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 new file mode 100644 index 00000000000..3d85c1ab058 --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,105 @@ + + + + estate.property.list + estate.property + + + + + + + + + + + + + + + + estate.property.search + estate.property + + + + + + + + + + + + + + + + + + + Properties + estate.property + list,form + + + + estate.property.view.form + estate.property + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/estate/views/res_uesrs_view.xml b/estate/views/res_uesrs_view.xml new file mode 100644 index 00000000000..070453b6b5e --- /dev/null +++ b/estate/views/res_uesrs_view.xml @@ -0,0 +1,15 @@ + + + + res.users + res.users + + + + + + + + + + \ No newline at end of file diff --git a/estate_account/__init__.py b/estate_account/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/estate_account/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py new file mode 100644 index 00000000000..f6362f9db4e --- /dev/null +++ b/estate_account/__manifest__.py @@ -0,0 +1,11 @@ +{ + 'name' : 'Estate Account', + 'depends' : [ + 'estate', + 'account' + ], + 'data': [ + 'security/ir.model.access.csv' + ], + 'application' : True, +} \ No newline at end of file diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py new file mode 100644 index 00000000000..5e1963c9d2f --- /dev/null +++ b/estate_account/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py new file mode 100644 index 00000000000..a5ee51e12ff --- /dev/null +++ b/estate_account/models/estate_property.py @@ -0,0 +1,27 @@ +from odoo import models, Command + +class estate_property(models.Model): + _inherit = 'estate.property' + + def sold_property_button(self): + res = super().sold_property_button() + + for property in self: + self.env['account.move'].create({ + 'partner_id': property.buyer_id.id, # corrected field name + 'move_type': 'out_invoice', + 'invoice_line_ids': [ + Command.create({ + "name": property.name, + "quantity": 1.0, + "price_unit": property.selling_price * 6.0 / 100.0, + }), + Command.create({ + "name": "Administrative fees", + "quantity": 1.0, + "price_unit": 100.0, + }), + ], + }) + + return res \ No newline at end of file diff --git a/estate_account/security/ir.model.access.csv b/estate_account/security/ir.model.access.csv new file mode 100644 index 00000000000..c79331f2f1c --- /dev/null +++ b/estate_account/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink +estate.access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1 +estate.access_estate_property_type,access_estate_property_type,estate.model_estate_property_type,base.group_user,1,1,1,1 +estate.access_estate_property_tag,access_estate_property_tag,estate.model_estate_property_tag,base.group_user,1,1,1,1 +estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1 \ No newline at end of file From 2622484cb557b2776d7fb854dbcba2621b8f239e Mon Sep 17 00:00:00 2001 From: Taewan Kim Date: Fri, 27 Jun 2025 13:52:23 +0200 Subject: [PATCH 2/4] [ADD] estate: new module to manage estate --- estate/__manifest__.py | 4 +-- estate/models/estate_property.py | 6 ++-- estate/models/estate_property_offer.py | 17 ++++++++++- estate/models/estate_property_tag.py | 2 +- estate/models/estate_property_type.py | 9 +++--- estate/models/res_users.py | 1 - estate/security/ir.model.access.csv | 2 +- estate/views/estate_menus.xml | 2 +- estate/views/estate_property_offer_views.xml | 3 +- estate/views/estate_property_tag_views.xml | 2 +- estate/views/estate_property_type_views.xml | 2 +- estate/views/estate_property_views.xml | 30 ++++++++++++++++++-- estate/views/res_uesrs_view.xml | 2 +- estate_account/__manifest__.py | 2 +- estate_account/models/estate_property.py | 2 +- estate_account/security/ir.model.access.csv | 2 +- 16 files changed, 64 insertions(+), 24 deletions(-) diff --git a/estate/__manifest__.py b/estate/__manifest__.py index ce7432fc16d..e294c607583 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -6,9 +6,9 @@ 'data': [ 'security/ir.model.access.csv', 'views/estate_property_views.xml', - 'views/estate_property_type_views.xml', 'views/estate_property_offer_views.xml', + 'views/estate_property_type_views.xml', 'views/estate_property_tag_views.xml', 'views/estate_menus.xml', ] -} \ No newline at end of file +} diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 64a21942f5b..77913e2c57e 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -108,8 +108,8 @@ def _check_selling_price_margin(self): if float_compare(record.selling_price, min_acceptable_price, precision_digits=2) < 0: raise ValidationError("The selling price cannot be lower than 90% of the expected price.") - @api.depends(at_uninstall=False) - def check_delete(self): + def unlink(self): for record in self: if record.state not in ['new', 'cancelled']: - raise UserError("YOU CANNOT DELETE A PROPERTY THAT IS NOT NEW OR CANCELLED") \ No newline at end of file + raise UserError("YOU CANNOT DELETE A PROPERTY THAT IS NOT IN NEW OR CANCELLED STATUS. REVERT!") + return super().unlink() diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 2b1825e0ebe..3e9c8322492 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,6 +1,6 @@ from datetime import date, timedelta -from odoo import api, fields, models +from odoo import api, fields, models, exceptions from odoo.exceptions import UserError @@ -43,3 +43,18 @@ def offer_accept(self): def offer_refuse(self): for record in self: record.status = 'refused' + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + property_id = vals.get('property_id') + price = vals.get('price') + + if property_id and price is not None: + property_rec = self.env['estate.property'].browse(property_id) + if property_rec.best_offer > price: + raise exceptions.UserError("Cannot add offer for a lower amount than current offer") + else: + property_rec.state = "offer_received" + + return super().create(vals_list) diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py index f3f5409a34a..9b4261ce620 100644 --- a/estate/models/estate_property_tag.py +++ b/estate/models/estate_property_tag.py @@ -5,4 +5,4 @@ class estate_property_tag(models.Model): _description = "Estate property tag file" name = fields.Char('Name',required=True) - color = fields.Integer() \ No newline at end of file + color = fields.Integer() diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index b85a3fcf312..3b217469b79 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -13,10 +13,9 @@ class estate_property_type(models.Model): _order = "name" property_id = fields.One2many("estate.property", "property_type_id") - offer_id = fields.One2many("estate.property.offer", "property_id") - offer_counts = fields.Integer(compute="_compute_offer_counts") + offer_counts = fields.Integer(compute="_compute_offer_count") - @api.depends("offer_id") - def _compute_offer_counts(self): + @api.depends("property_id.offer_ids") + def _compute_offer_count(self): for record in self: - record.offer_counts = len(record.offer_id) + record.offer_counts = sum(len(prop.offer_ids) for prop in record.property_id) diff --git a/estate/models/res_users.py b/estate/models/res_users.py index e6ebde31b57..4f77e785faa 100644 --- a/estate/models/res_users.py +++ b/estate/models/res_users.py @@ -4,4 +4,3 @@ class res_users(models.Model): _inherit = 'res.users' property_ids = fields.One2many('estate.property', "salesman_id", domain="('state','=','new'),('state','=','offer_received')") - diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 4e256dd58f4..54130d3231e 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -2,4 +2,4 @@ "estate.access_estate_property","access_estate_property","estate.model_estate_property","base.group_user",1,1,1,1 "estate.access_estate_property_type","access_estate_property_type","estate.model_estate_property_type","base.group_user",1,1,1,1 "estate.access_estate_property_offer","access_estate_property_offer","estate.model_estate_property_offer","base.group_user",1,1,1,1 -"estate.access_estate_property_tag","access_estate_property_tag","estate.model_estate_property_tag","base.group_user",1,1,1,1 \ No newline at end of file +"estate.access_estate_property_tag","access_estate_property_tag","estate.model_estate_property_tag","base.group_user",1,1,1,1 diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 4034d9af352..177c1f4ce7e 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml index ecd76a2662e..af532492542 100644 --- a/estate/views/estate_property_offer_views.xml +++ b/estate/views/estate_property_offer_views.xml @@ -7,6 +7,7 @@
+

@@ -41,4 +42,4 @@ estate.property.offer list,form - \ No newline at end of file + diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml index 8065d125345..30b06e12aa8 100644 --- a/estate/views/estate_property_tag_views.xml +++ b/estate/views/estate_property_tag_views.xml @@ -14,4 +14,4 @@ estate.property.tag list,form - \ 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 13eb446e2b1..c088d7a3e9b 100644 --- a/estate/views/estate_property_type_views.xml +++ b/estate/views/estate_property_type_views.xml @@ -36,4 +36,4 @@ estate.property.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 3d85c1ab058..fea3135d6c2 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -41,7 +41,7 @@ Properties estate.property - list,form + kanban,list,form @@ -89,7 +89,8 @@ - + + @@ -102,4 +103,29 @@ + + + estate.property.kanban + estate.property + + + + + +
+ Expected price:
+
+ + Best offer:
+ + + Selling price:
+ + + + + + + + diff --git a/estate/views/res_uesrs_view.xml b/estate/views/res_uesrs_view.xml index 070453b6b5e..f434ed8c30b 100644 --- a/estate/views/res_uesrs_view.xml +++ b/estate/views/res_uesrs_view.xml @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py index f6362f9db4e..b1772580fef 100644 --- a/estate_account/__manifest__.py +++ b/estate_account/__manifest__.py @@ -8,4 +8,4 @@ 'security/ir.model.access.csv' ], 'application' : True, -} \ No newline at end of file +} diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py index a5ee51e12ff..bf24dce314d 100644 --- a/estate_account/models/estate_property.py +++ b/estate_account/models/estate_property.py @@ -24,4 +24,4 @@ def sold_property_button(self): ], }) - return res \ No newline at end of file + return res diff --git a/estate_account/security/ir.model.access.csv b/estate_account/security/ir.model.access.csv index c79331f2f1c..78458c1cb61 100644 --- a/estate_account/security/ir.model.access.csv +++ b/estate_account/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink estate.access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1 estate.access_estate_property_type,access_estate_property_type,estate.model_estate_property_type,base.group_user,1,1,1,1 estate.access_estate_property_tag,access_estate_property_tag,estate.model_estate_property_tag,base.group_user,1,1,1,1 -estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1 \ No newline at end of file +estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1 From 0aa9bda145c6c6fbbcc78edb0727f3979267b5b5 Mon Sep 17 00:00:00 2001 From: Taewan Kim Date: Mon, 30 Jun 2025 11:54:39 +0200 Subject: [PATCH 3/4] [ADD] estate modules --- estate/models/estate_property.py | 13 ++++++------- estate/models/estate_property_offer.py | 11 ++++++++--- estate/models/estate_property_type.py | 8 +++----- estate/views/estate_property_views.xml | 4 +--- estate_account/models/estate_property.py | 5 ++--- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 77913e2c57e..fe20596bbed 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,4 +1,5 @@ -from datetime import date, timedelta +from datetime import datetime, timedelta +from dateutil.relativedelta import relativedelta from odoo import api, fields, models from odoo.exceptions import UserError, ValidationError @@ -16,7 +17,7 @@ class EstateProperty(models.Model): name = fields.Char(string="Title", required=True) description = fields.Text() postcode = fields.Char() - date_availability = fields.Date(copy=False, default=lambda self: date.today() + timedelta(days=90)) + date_availability = fields.Date(copy=False, default=lambda self: datetime.today() + relativedelta(months=3)) expected_price = fields.Float(required=True) selling_price = fields.Float(readonly=True, copy=False) bedrooms = fields.Integer(default=2) @@ -65,10 +66,7 @@ def _compute_total_area(self): @api.depends("offer_ids.price") def _compute_best_price(self): for record in self: - if record.offer_ids: - record.best_offer = max(record.offer_ids.mapped("price")) - else: - record.best_offer = 0.0 + record.best_offer = max(record.offer_ids.mapped("price"), default=0.0) @api.onchange("garden") def _onchange_garden(self): @@ -84,7 +82,7 @@ def cancel_property_button(self): if record.state != 'sold': record.state = 'cancelled' else: - raise UserError("You cannot cancel a sold property.") + raise UserError(_("You cannot cancel a sold property.")) def sold_property_button(self): for record in self: @@ -108,6 +106,7 @@ def _check_selling_price_margin(self): if float_compare(record.selling_price, min_acceptable_price, precision_digits=2) < 0: raise ValidationError("The selling price cannot be lower than 90% of the expected price.") + @api.ondelete(at_uninstall=False) def unlink(self): for record in self: if record.state not in ['new', 'cancelled']: diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 3e9c8322492..c33fe45b7ad 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -20,16 +20,21 @@ class EstatePropertyOffer(models.Model): property_id = fields.Many2one("estate.property", required=True) validity = fields.Integer(default=7) deadline = fields.Date(string="Deadline", compute="_compute_deadline", inverse="_inverse_deadline") + creation_date = fields.Datetime("Creation Date", readonly=True) @api.depends("validity") def _compute_deadline(self): for record in self: - record.deadline = date.today() + timedelta(days=record.validity) + if record.creation_date: + creation_date = fields.Datetime.from_string(record.creation_date) + record.deadline = creation_date.date() + timedelta(days=record.validity) def _inverse_deadline(self): for record in self: if record.deadline: - record.validity = (record.deadline - date.today()).days + if record.creation_date: + creation_date = fields.Datetime.from_string(record.creation_date) + record.validity = (record.deadline - creation_date.date()).days def offer_accept(self): if 'accepted' in self.mapped("property_id.offer_ids.status"): @@ -48,7 +53,7 @@ def offer_refuse(self): def create(self, vals_list): for vals in vals_list: property_id = vals.get('property_id') - price = vals.get('price') + price = vals.get('price', default=0.0) if property_id and price is not None: property_rec = self.env['estate.property'].browse(property_id) diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 3b217469b79..d4f97464e49 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -3,19 +3,17 @@ class estate_property_type(models.Model): _name = "estate.property.type" _description = "Property type models file" - - name = fields.Char("Name", required=True) + _order = "name" _sql_constraints = [ ('unique_type_name', 'UNIQUE(name)', 'The name should be unique') ] - _order = "name" - + name = fields.Char("Name", required=True) property_id = fields.One2many("estate.property", "property_type_id") offer_counts = fields.Integer(compute="_compute_offer_count") @api.depends("property_id.offer_ids") def _compute_offer_count(self): for record in self: - record.offer_counts = sum(len(prop.offer_ids) for prop in record.property_id) + record.offer_counts = len(record.property_id.offer_ids) diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index fea3135d6c2..25c708d130d 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -30,9 +30,7 @@ - - - + diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py index bf24dce314d..e9c41c52dbc 100644 --- a/estate_account/models/estate_property.py +++ b/estate_account/models/estate_property.py @@ -4,7 +4,8 @@ class estate_property(models.Model): _inherit = 'estate.property' def sold_property_button(self): - res = super().sold_property_button() + + super().sold_property_button() for property in self: self.env['account.move'].create({ @@ -23,5 +24,3 @@ def sold_property_button(self): }), ], }) - - return res From c1ce69787e72ae97f517a8b7b0495bbd1b184b50 Mon Sep 17 00:00:00 2001 From: Taewan Kim Date: Mon, 30 Jun 2025 13:45:25 +0200 Subject: [PATCH 4/4] [ADD] estate modules --- estate/__manifest__.py | 3 ++- estate/models/estate_property.py | 5 +++-- estate/models/estate_property_offer.py | 2 +- estate/models/estate_property_tag.py | 5 +++-- estate/models/estate_property_type.py | 1 + estate/models/res_users.py | 1 + estate_account/__manifest__.py | 7 ++++--- estate_account/models/estate_property.py | 1 + 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/estate/__manifest__.py b/estate/__manifest__.py index e294c607583..f26f5efd8a5 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -10,5 +10,6 @@ 'views/estate_property_type_views.xml', 'views/estate_property_tag_views.xml', 'views/estate_menus.xml', - ] + ], + "license": "LGPL-3", } diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index fe20596bbed..e4b0cba2f4d 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,10 +1,11 @@ -from datetime import datetime, timedelta +from datetime import datetime from dateutil.relativedelta import relativedelta -from odoo import api, fields, models +from odoo import _, api, fields, models from odoo.exceptions import UserError, ValidationError from odoo.tools.float_utils import float_compare, float_is_zero + class EstateProperty(models.Model): _name = 'estate.property' _description = "Real Estate Property" diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index c33fe45b7ad..42de864a4d8 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,4 +1,4 @@ -from datetime import date, timedelta +from datetime import timedelta from odoo import api, fields, models, exceptions from odoo.exceptions import UserError diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py index 9b4261ce620..4d0a0032716 100644 --- a/estate/models/estate_property_tag.py +++ b/estate/models/estate_property_tag.py @@ -1,8 +1,9 @@ -from odoo import fields,models +from odoo import fields, models + class estate_property_tag(models.Model): _name = "estate.property.tag" _description = "Estate property tag file" - name = fields.Char('Name',required=True) + name = fields.Char('Name', required=True) color = fields.Integer() diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index d4f97464e49..73efe902063 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -1,5 +1,6 @@ from odoo import api, fields, models + class estate_property_type(models.Model): _name = "estate.property.type" _description = "Property type models file" diff --git a/estate/models/res_users.py b/estate/models/res_users.py index 4f77e785faa..e2b69954c41 100644 --- a/estate/models/res_users.py +++ b/estate/models/res_users.py @@ -1,5 +1,6 @@ from odoo import fields, models + class res_users(models.Model): _inherit = 'res.users' diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py index b1772580fef..890f9d2291d 100644 --- a/estate_account/__manifest__.py +++ b/estate_account/__manifest__.py @@ -1,11 +1,12 @@ { - 'name' : 'Estate Account', - 'depends' : [ + 'name': 'Estate Account', + 'depends': [ 'estate', 'account' ], 'data': [ 'security/ir.model.access.csv' ], - 'application' : True, + 'application': True, + "license": "LGPL-3", } diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py index e9c41c52dbc..1e950978353 100644 --- a/estate_account/models/estate_property.py +++ b/estate_account/models/estate_property.py @@ -1,5 +1,6 @@ from odoo import models, Command + class estate_property(models.Model): _inherit = 'estate.property'