From 38f003274d4e70fe1218088ed11c87d50a356c11 Mon Sep 17 00:00:00 2001 From: Codoeh Date: Sun, 22 Mar 2026 22:20:37 +0100 Subject: [PATCH 01/14] [UPDATE] .gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index b6e47617de1..fc458d4b0bd 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,10 @@ dmypy.json # Pyre type checker .pyre/ +pyproject.toml +.idea +awesome_clicker +awesome_dashboard +awesome_gallery +awesome_kanban +awesome_owl \ No newline at end of file From 4389e8984296fd0032eb2b236f6e60b0cb153b2d Mon Sep 17 00:00:00 2001 From: Codoeh Date: Sun, 22 Mar 2026 22:23:13 +0100 Subject: [PATCH 02/14] [ADD] estate, estate_account: complete modules --- addons/estate/__init__.py | 1 + addons/estate/__manifest__.py | 18 ++ addons/estate/models/__init__.py | 5 + addons/estate/models/estate_property.py | 141 +++++++++++++++ addons/estate/models/estate_property_offer.py | 97 +++++++++++ addons/estate/models/estate_property_tag.py | 12 ++ addons/estate/models/estate_property_type.py | 38 ++++ addons/estate/models/res_users.py | 12 ++ addons/estate/security/ir.model.access.csv | 6 + addons/estate/views/estate_menus.xml | 11 ++ .../views/estate_property_offer_views.xml | 44 +++++ .../views/estate_property_tag_views.xml | 31 ++++ .../views/estate_property_type_views.xml | 60 +++++++ addons/estate/views/estate_property_views.xml | 162 ++++++++++++++++++ addons/estate/views/res_users_views.xml | 14 ++ addons/estate_account/__init__.py | 1 + addons/estate_account/__manifest__.py | 8 + addons/estate_account/models/__init__.py | 1 + .../estate_account/models/estate_property.py | 37 ++++ 19 files changed, 699 insertions(+) create mode 100644 addons/estate/__init__.py create mode 100644 addons/estate/__manifest__.py create mode 100644 addons/estate/models/__init__.py create mode 100644 addons/estate/models/estate_property.py create mode 100644 addons/estate/models/estate_property_offer.py create mode 100644 addons/estate/models/estate_property_tag.py create mode 100644 addons/estate/models/estate_property_type.py create mode 100644 addons/estate/models/res_users.py create mode 100644 addons/estate/security/ir.model.access.csv create mode 100644 addons/estate/views/estate_menus.xml create mode 100644 addons/estate/views/estate_property_offer_views.xml create mode 100644 addons/estate/views/estate_property_tag_views.xml create mode 100644 addons/estate/views/estate_property_type_views.xml create mode 100644 addons/estate/views/estate_property_views.xml create mode 100644 addons/estate/views/res_users_views.xml create mode 100644 addons/estate_account/__init__.py create mode 100644 addons/estate_account/__manifest__.py create mode 100644 addons/estate_account/models/__init__.py create mode 100644 addons/estate_account/models/estate_property.py diff --git a/addons/estate/__init__.py b/addons/estate/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/addons/estate/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/addons/estate/__manifest__.py b/addons/estate/__manifest__.py new file mode 100644 index 00000000000..c741bc7be43 --- /dev/null +++ b/addons/estate/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +{ + "name": "Estate", + "author": "Codoeh", + "license": "LGPL-3", + "depends": [ + "base", + ], + "data": [ + "security/ir.model.access.csv", + "views/estate_property_views.xml", + "views/estate_property_type_views.xml", + "views/estate_property_tag_views.xml", + "views/estate_property_offer_views.xml", + "views/res_users_views.xml", + "views/estate_menus.xml", + ], +} diff --git a/addons/estate/models/__init__.py b/addons/estate/models/__init__.py new file mode 100644 index 00000000000..9a2189b6382 --- /dev/null +++ b/addons/estate/models/__init__.py @@ -0,0 +1,5 @@ +from . import estate_property +from . import estate_property_type +from . import estate_property_tag +from . import estate_property_offer +from . import res_users diff --git a/addons/estate/models/estate_property.py b/addons/estate/models/estate_property.py new file mode 100644 index 00000000000..57ebd4ebf3a --- /dev/null +++ b/addons/estate/models/estate_property.py @@ -0,0 +1,141 @@ +from dateutil.relativedelta import relativedelta + +from odoo import models, fields, api, exceptions, tools + + +class EstateProperty(models.Model): + _name = "estate.property" + _description = "Estate Property" + _order = "id desc" + + name = fields.Char(required=True, string="Title") + active = fields.Boolean(default=True) + description = fields.Text() + postcode = fields.Char() + date_availability = fields.Date( + copy=False, + default=fields.Date.today() + relativedelta(months=+3), + string="Available From", + ) + 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() + garage = fields.Boolean() + garden = fields.Boolean() + garden_area = fields.Integer() + garden_orientation = fields.Selection( + selection=[ + ("north", "North"), + ("south", "South"), + ("east", "East"), + ("west", "West"), + ] + ) + state = fields.Selection( + selection=[ + ("new", "NEW"), + ("offer_received", "OFFER RECEIVED"), + ("offer_accepted", "OFFER ACCEPTED"), + ("sold", "SOLD"), + ("cancelled", "CANCELLED"), + ], + required=True, + default="new", + copy=False, + ) + + property_type_id = fields.Many2one( + "estate.property.type", string="Property Type" + ) + salesperson_id = fields.Many2one( + "res.users", + string="Salesman", + default=lambda self: self.env.user, + index=True, + ) + buyer_id = fields.Many2one("res.partner", string="Buyer", copy=False) + tag_ids = fields.Many2many("estate.property.tag", string="Tags") + offer_ids = fields.One2many( + "estate.property.offer", "property_id", string="Offers" + ) + + total_area = fields.Float(compute="_compute_total_area") + best_price = fields.Float( + compute="_compute_best_price", string="Best Offer" + ) + + _check_expected_price = models.Constraint( + "CHECK(expected_price > 0)", "Expected price must be greater than 0." + ) + _check_selling_price = models.Constraint( + "CHECK(selling_price >= 0)", "Selling price must be at least 0." + ) + + @api.constrains("selling_price", "expected_price") + def _check_selling_price_logic(self): + for record in self: + if not tools.float_is_zero( + record.selling_price, precision_digits=2 + ): + if ( + tools.float_compare( + record.selling_price, + record.expected_price * 0.9, + precision_digits=2, + ) + == -1 + ): + raise exceptions.ValidationError( + "Price must be greater than 90% of expected 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: + prices = record.offer_ids.mapped("price") + record.best_price = max(prices) if prices else 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 + + @api.ondelete(at_uninstall=False) + def _unlink_if_state_in_new_cancelled(self): + for record in self: + if record.state not in ["new", "cancelled"]: + raise exceptions.UserError( + "Cannot unlink property while " + "state is different than new or cancelled." + ) + + def action_set_state_cancelled(self): + for record in self: + if record.state == "sold": + raise exceptions.UserError( + "Sold properties cannot be canceled." + ) + else: + record.state = "cancelled" + return True + + def action_set_state_sold(self): + for record in self: + if record.state == "cancelled": + raise exceptions.UserError( + "Cancelled properties cannot be sold." + ) + else: + record.state = "sold" + return True diff --git a/addons/estate/models/estate_property_offer.py b/addons/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..7b0fd4ef536 --- /dev/null +++ b/addons/estate/models/estate_property_offer.py @@ -0,0 +1,97 @@ +from dateutil.relativedelta import relativedelta + +from odoo import models, fields, api, exceptions + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Estate Property Offer" + _order = "price desc" + + price = fields.Float(string="Price") + status = fields.Selection( + [ + ("accepted", "Accepted"), + ("refused", "Refused"), + ], + string="Status", + copy=False, + ) + partner_id = fields.Many2one( + "res.partner", string="Partner", required=True + ) + property_id = fields.Many2one( + "estate.property", string="Property", required=True + ) + + property_type_id = fields.Many2one( + "estate.property.type", + related="property_id.property_type_id", + string="Property Type", + store=True, + ) + + validity = fields.Integer(string="Validity (days)", default=7) + date_deadline = fields.Date( + string="Deadline", + compute="_compute_date_deadline", + inverse="_inverse_date_deadline", + ) + + _check_price = models.Constraint( + "CHECK(price > 0)", "Offered price must be greater than 0." + ) + + @api.depends("create_date", "validity") + def _compute_date_deadline(self): + for record in self: + start_date = record.create_date or fields.Date.today() + start_date = fields.Date.to_date(start_date) + record.date_deadline = start_date + relativedelta( + days=record.validity + ) + + @api.onchange("date_deadline") + def _inverse_date_deadline(self): + for record in self: + start_date = record.create_date or fields.Date.today() + start_date = fields.Date.to_date(start_date) + if record.date_deadline and start_date: + diff = record.date_deadline - start_date + record.validity = diff.days + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + property_record = self.env["estate.property"].browse( + vals["property_id"] + ) + if vals.get("price") <= property_record.best_price: + raise exceptions.UserError( + "New offer must be higher than existing offers." + ) + + offers = super().create(vals_list) + + for record in offers: + if record.property_id.state == "new": + record.property_id.state = "offer_received" + + return offers + + def action_set_offer_status_accepted(self): + for record in self: + if record.property_id.state == "offer_accepted": + raise exceptions.UserError("Only one offer can be accepted.") + else: + record.status = "accepted" + record.property_id.buyer_id = record.partner_id + record.property_id.selling_price = record.price + record.property_id.state = "offer_accepted" + + return {"type": "ir.actions.client", "tag": "reload"} + + def action_set_offer_status_refused(self): + for record in self: + record.status = "refused" + return True diff --git a/addons/estate/models/estate_property_tag.py b/addons/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..d9d48a15672 --- /dev/null +++ b/addons/estate/models/estate_property_tag.py @@ -0,0 +1,12 @@ +from odoo import models, fields + + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + _description = "Property Tag" + _order = "name" + + name = fields.Char(string="Name", required=True) + color = fields.Integer() + + _check_name = models.Constraint("UNIQUE(name)", "Name must be unique.") diff --git a/addons/estate/models/estate_property_type.py b/addons/estate/models/estate_property_type.py new file mode 100644 index 00000000000..64be7483ab4 --- /dev/null +++ b/addons/estate/models/estate_property_type.py @@ -0,0 +1,38 @@ +from odoo import models, fields, api + + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + _description = "Property Type" + _order = "sequence, name, id" + + name = fields.Char(required=True) + sequence = fields.Integer("Sequence", default=1, help="Sequence number") + + _check_name = models.Constraint("UNIQUE(name)", "Name must be unique.") + + property_ids = fields.One2many( + "estate.property", "property_type_id", string="Properties" + ) + + offer_ids = fields.One2many( + "estate.property.offer", "property_type_id", string="Offers" + ) + offer_count = fields.Integer( + string="Offer Count", compute="_compute_offer_count" + ) + + @api.depends("offer_ids") + def _compute_offer_count(self): + for record in self: + record.offer_count = len(record.offer_ids) + + +class EstatePropertyTypeLine(models.Model): + _name = "estate.property.type.line" + _description = "Property Type Line" + + model_id = fields.Many2one("estate.property.type") + name = fields.Char() + expected_price = fields.Char() + state = fields.Char() diff --git a/addons/estate/models/res_users.py b/addons/estate/models/res_users.py new file mode 100644 index 00000000000..9294de90e1a --- /dev/null +++ b/addons/estate/models/res_users.py @@ -0,0 +1,12 @@ +from odoo import models, fields + + +class ResUsers(models.Model): + _inherit = "res.users" + + property_ids = fields.One2many( + "estate.property", + "salesperson_id", + string="Estate Properties", + domain=[("state", "in", ["new", "offer_received", "offer_accepted"])], + ) diff --git a/addons/estate/security/ir.model.access.csv b/addons/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..0aae61ad562 --- /dev/null +++ b/addons/estate/security/ir.model.access.csv @@ -0,0 +1,6 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1 +access_estate_property_type,access_estate_property_type,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,base.group_user,1,1,1,1 +access_estate_property_type_line,access_estate_property_type_line,model_estate_property_type_line,base.group_user,1,1,1,1 diff --git a/addons/estate/views/estate_menus.xml b/addons/estate/views/estate_menus.xml new file mode 100644 index 00000000000..2fca70f796a --- /dev/null +++ b/addons/estate/views/estate_menus.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/addons/estate/views/estate_property_offer_views.xml b/addons/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..2acb7a5810c --- /dev/null +++ b/addons/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 + + + + + + + + +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + estate.property.type.list + estate.property.type + + + + + + + + + + Property Types + estate.property.type + list,form + + diff --git a/addons/estate/views/estate_property_views.xml b/addons/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..1adcfb65d76 --- /dev/null +++ b/addons/estate/views/estate_property_views.xml @@ -0,0 +1,162 @@ + + + + estate.property.view.search + estate.property + + + + + + + + + + + + + + + + + + + + + + estate.property.form + estate.property + +
+ +
+
+
+ +
+ + +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + +
+ + + + + estate.property.list + estate.property + + + + + + + + + + + + + + + + + estate.property.kanban + estate.property + + + + + +
+ + + +
+
+ Expected price: + +
+
+

+ Best price: + +

+

+ Selling price: + +

+
+ + + + + + + + Properties + estate.property + list,form,kanban + + {"search_default_available_properties": True} + + + diff --git a/addons/estate/views/res_users_views.xml b/addons/estate/views/res_users_views.xml new file mode 100644 index 00000000000..0063b85d8d4 --- /dev/null +++ b/addons/estate/views/res_users_views.xml @@ -0,0 +1,14 @@ + + + res.users.view.form.inherit.estate + res.users + + + + + + + + + + diff --git a/addons/estate_account/__init__.py b/addons/estate_account/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/addons/estate_account/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/addons/estate_account/__manifest__.py b/addons/estate_account/__manifest__.py new file mode 100644 index 00000000000..c3852b10c5e --- /dev/null +++ b/addons/estate_account/__manifest__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +{ + "name": "Estate Account", + "author": "Codoeh", + "license": "LGPL-3", + "depends": ["estate", "account"], + "data": [], +} diff --git a/addons/estate_account/models/__init__.py b/addons/estate_account/models/__init__.py new file mode 100644 index 00000000000..5e1963c9d2f --- /dev/null +++ b/addons/estate_account/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property diff --git a/addons/estate_account/models/estate_property.py b/addons/estate_account/models/estate_property.py new file mode 100644 index 00000000000..69086551265 --- /dev/null +++ b/addons/estate_account/models/estate_property.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +from odoo import models, exceptions, Command + + +class EstateProperty(models.Model): + _inherit = "estate.property" + + def action_set_state_sold(self): + values_list = [] + for record in self: + values_dict = {} + if not record.buyer_id: + raise exceptions.UserError( + "Cannot prepare account when buyer is not assigned." + ) + values_dict["partner_id"] = record.buyer_id.id + values_dict["move_type"] = "out_invoice" + values_dict["invoice_line_ids"] = [ + Command.create( + { + "name": f"Commission for {record.name}", + "quantity": 1, + "price_unit": record.selling_price * 0.06, + } + ), + Command.create( + { + "name": "Administrative fees", + "quantity": 1, + "price_unit": 100.00, + } + ), + ] + values_list.append(values_dict) + result = super().action_set_state_sold() + self.env["account.move"].create(values_list) + return result From 28e6288eb1109b01ceebc91af61d876ea6c6f471 Mon Sep 17 00:00:00 2001 From: Codoeh Date: Sun, 22 Mar 2026 22:36:18 +0100 Subject: [PATCH 03/14] [FIX] Add information about encoding and version to xml files --- addons/estate/views/estate_menus.xml | 1 + addons/estate/views/estate_property_offer_views.xml | 1 + addons/estate/views/estate_property_tag_views.xml | 1 + addons/estate/views/estate_property_type_views.xml | 1 + addons/estate/views/estate_property_views.xml | 2 +- addons/estate/views/res_users_views.xml | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/estate/views/estate_menus.xml b/addons/estate/views/estate_menus.xml index 2fca70f796a..bc365733d47 100644 --- a/addons/estate/views/estate_menus.xml +++ b/addons/estate/views/estate_menus.xml @@ -1,3 +1,4 @@ + diff --git a/addons/estate/views/estate_property_offer_views.xml b/addons/estate/views/estate_property_offer_views.xml index 2acb7a5810c..c68adc07f95 100644 --- a/addons/estate/views/estate_property_offer_views.xml +++ b/addons/estate/views/estate_property_offer_views.xml @@ -1,3 +1,4 @@ + estate.property.offer.form diff --git a/addons/estate/views/estate_property_tag_views.xml b/addons/estate/views/estate_property_tag_views.xml index 63d7fe28cf1..83fd5c67583 100644 --- a/addons/estate/views/estate_property_tag_views.xml +++ b/addons/estate/views/estate_property_tag_views.xml @@ -1,3 +1,4 @@ + estate.property.tag.form diff --git a/addons/estate/views/estate_property_type_views.xml b/addons/estate/views/estate_property_type_views.xml index 1270f1933e9..7b98617574b 100644 --- a/addons/estate/views/estate_property_type_views.xml +++ b/addons/estate/views/estate_property_type_views.xml @@ -1,3 +1,4 @@ + Offers diff --git a/addons/estate/views/estate_property_views.xml b/addons/estate/views/estate_property_views.xml index 1adcfb65d76..c1c9da18fe3 100644 --- a/addons/estate/views/estate_property_views.xml +++ b/addons/estate/views/estate_property_views.xml @@ -1,4 +1,4 @@ - + estate.property.view.search diff --git a/addons/estate/views/res_users_views.xml b/addons/estate/views/res_users_views.xml index 0063b85d8d4..6d58cbff379 100644 --- a/addons/estate/views/res_users_views.xml +++ b/addons/estate/views/res_users_views.xml @@ -1,3 +1,4 @@ + res.users.view.form.inherit.estate From 39caf4559b405dda63ea8c2978f8c4007483fd7d Mon Sep 17 00:00:00 2001 From: Codoeh Date: Sun, 22 Mar 2026 23:03:12 +0100 Subject: [PATCH 04/14] [FIX] Style fixes in: estate_property_views.xml, estate_property_offer_views.xml, estate_property_type_views.xml --- .../views/estate_property_offer_views.xml | 10 +++---- .../views/estate_property_type_views.xml | 6 ++-- addons/estate/views/estate_property_views.xml | 29 ++++++++----------- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/addons/estate/views/estate_property_offer_views.xml b/addons/estate/views/estate_property_offer_views.xml index c68adc07f95..1191d385b56 100644 --- a/addons/estate/views/estate_property_offer_views.xml +++ b/addons/estate/views/estate_property_offer_views.xml @@ -5,12 +5,10 @@ estate.property.offer
- -
-
- +
+
diff --git a/addons/estate/views/estate_property_type_views.xml b/addons/estate/views/estate_property_type_views.xml index 7b98617574b..046b453d3a3 100644 --- a/addons/estate/views/estate_property_type_views.xml +++ b/addons/estate/views/estate_property_type_views.xml @@ -14,12 +14,12 @@ -
- -
+

diff --git a/addons/estate/views/estate_property_views.xml b/addons/estate/views/estate_property_views.xml index c1c9da18fe3..dd96c78c85e 100644 --- a/addons/estate/views/estate_property_views.xml +++ b/addons/estate/views/estate_property_views.xml @@ -1,4 +1,4 @@ - + estate.property.view.search @@ -31,19 +31,15 @@ estate.property - -
-
-
- -
- +
+

@@ -75,7 +71,7 @@ - + @@ -156,7 +152,6 @@ estate.property list,form,kanban - {"search_default_available_properties": True} - + {"search_default_available_properties": 1} From dbaf52c1455e825b9c5b035b7371ea43dbd41870 Mon Sep 17 00:00:00 2001 From: Codoeh Date: Sun, 22 Mar 2026 23:12:26 +0100 Subject: [PATCH 05/14] [REF] estate/estate_account: changing quotes in __manifest__.py --- addons/estate/__manifest__.py | 26 +++++++++++++------------- addons/estate_account/__manifest__.py | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/estate/__manifest__.py b/addons/estate/__manifest__.py index c741bc7be43..dfdd703b5a9 100644 --- a/addons/estate/__manifest__.py +++ b/addons/estate/__manifest__.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- { - "name": "Estate", - "author": "Codoeh", - "license": "LGPL-3", - "depends": [ - "base", + 'name': 'Estate', + 'author': 'Codoeh', + 'license': 'LGPL-3', + 'depends': [ + 'base', ], - "data": [ - "security/ir.model.access.csv", - "views/estate_property_views.xml", - "views/estate_property_type_views.xml", - "views/estate_property_tag_views.xml", - "views/estate_property_offer_views.xml", - "views/res_users_views.xml", - "views/estate_menus.xml", + 'data': [ + 'security/ir.model.access.csv', + 'views/estate_property_views.xml', + 'views/estate_property_type_views.xml', + 'views/estate_property_tag_views.xml', + 'views/estate_property_offer_views.xml', + 'views/res_users_views.xml', + 'views/estate_menus.xml', ], } diff --git a/addons/estate_account/__manifest__.py b/addons/estate_account/__manifest__.py index c3852b10c5e..999880ec2b7 100644 --- a/addons/estate_account/__manifest__.py +++ b/addons/estate_account/__manifest__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- { - "name": "Estate Account", - "author": "Codoeh", - "license": "LGPL-3", - "depends": ["estate", "account"], - "data": [], + 'name': 'Estate Account', + 'author': 'Codoeh', + 'license': 'LGPL-3', + 'depends': ['estate', 'account'], + 'data': [], } From 73fdbd9428f7d51829591d9d888203384eb0fd5c Mon Sep 17 00:00:00 2001 From: Codoeh Date: Sun, 22 Mar 2026 23:43:43 +0100 Subject: [PATCH 06/14] [REF] estate/estate_account: Sorting imports, changing quotes " > ' --- addons/estate/models/estate_property.py | 107 +++++++++--------- addons/estate/models/estate_property_offer.py | 65 ++++++----- addons/estate/models/estate_property_tag.py | 12 +- addons/estate/models/estate_property_type.py | 26 ++--- addons/estate/models/res_users.py | 12 +- 5 files changed, 111 insertions(+), 111 deletions(-) diff --git a/addons/estate/models/estate_property.py b/addons/estate/models/estate_property.py index 57ebd4ebf3a..8e7b175eb4c 100644 --- a/addons/estate/models/estate_property.py +++ b/addons/estate/models/estate_property.py @@ -1,112 +1,113 @@ from dateutil.relativedelta import relativedelta - -from odoo import models, fields, api, exceptions, tools +from odoo import api, exceptions, fields, models, tools class EstateProperty(models.Model): - _name = "estate.property" - _description = "Estate Property" - _order = "id desc" + _name = 'estate.property' + _description = 'Estate Property' + _order = 'id desc' - name = fields.Char(required=True, string="Title") + name = fields.Char(required=True, string='Title') active = fields.Boolean(default=True) description = fields.Text() postcode = fields.Char() date_availability = fields.Date( copy=False, - default=fields.Date.today() + relativedelta(months=+3), - string="Available From", + default=lambda self: fields.Date.today() + relativedelta(months=+3), + string='Available From', ) 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)") + living_area = fields.Integer(string='Living Area (sqm)') facades = fields.Integer() garage = fields.Boolean() garden = fields.Boolean() garden_area = fields.Integer() garden_orientation = fields.Selection( selection=[ - ("north", "North"), - ("south", "South"), - ("east", "East"), - ("west", "West"), + ('north', 'North'), + ('south', 'South'), + ('east', 'East'), + ('west', 'West'), ] ) state = fields.Selection( selection=[ - ("new", "NEW"), - ("offer_received", "OFFER RECEIVED"), - ("offer_accepted", "OFFER ACCEPTED"), - ("sold", "SOLD"), - ("cancelled", "CANCELLED"), + ('new', 'NEW'), + ('offer_received', 'OFFER RECEIVED'), + ('offer_accepted', 'OFFER ACCEPTED'), + ('sold', 'SOLD'), + ('cancelled', 'CANCELLED'), ], required=True, - default="new", + default='new', copy=False, ) property_type_id = fields.Many2one( - "estate.property.type", string="Property Type" + 'estate.property.type', string='Property Type' ) salesperson_id = fields.Many2one( - "res.users", - string="Salesman", + 'res.users', + string='Salesman', default=lambda self: self.env.user, index=True, ) - buyer_id = fields.Many2one("res.partner", string="Buyer", copy=False) - tag_ids = fields.Many2many("estate.property.tag", string="Tags") + buyer_id = fields.Many2one('res.partner', string='Buyer', copy=False) + tag_ids = fields.Many2many('estate.property.tag', string='Tags') offer_ids = fields.One2many( - "estate.property.offer", "property_id", string="Offers" + 'estate.property.offer', 'property_id', string='Offers' ) - total_area = fields.Float(compute="_compute_total_area") + total_area = fields.Float(compute='_compute_total_area') best_price = fields.Float( - compute="_compute_best_price", string="Best Offer" + compute='_compute_best_price', string='Best Offer' ) _check_expected_price = models.Constraint( - "CHECK(expected_price > 0)", "Expected price must be greater than 0." + 'CHECK(expected_price > 0)', 'Expected price must be greater than 0.' ) _check_selling_price = models.Constraint( - "CHECK(selling_price >= 0)", "Selling price must be at least 0." + 'CHECK(selling_price >= 0)', 'Selling price must be at least 0.' ) - @api.constrains("selling_price", "expected_price") + @api.constrains('selling_price', 'expected_price') def _check_selling_price_logic(self): for record in self: if not tools.float_is_zero( - record.selling_price, precision_digits=2 + record.selling_price, precision_digits=2 ): if ( - tools.float_compare( - record.selling_price, - record.expected_price * 0.9, - precision_digits=2, - ) - == -1 + tools.float_compare( + record.selling_price, + record.expected_price * 0.9, + precision_digits=2, + ) + == -1 ): raise exceptions.ValidationError( - "Price must be greater than 90% of expected price." + 'Price must be greater than 90% of expected price.' ) - @api.depends("living_area", "garden_area") + @api.depends('living_area', 'garden_area', 'garden') def _compute_total_area(self): for record in self: - record.total_area = record.living_area + record.garden_area + record.total_area = record.living_area + ( + record.garden_area if record.garden else 0 + ) - @api.depends("offer_ids.price") + @api.depends('offer_ids.price') def _compute_best_price(self): for record in self: - prices = record.offer_ids.mapped("price") + prices = record.offer_ids.mapped('price') record.best_price = max(prices) if prices else 0.0 - @api.onchange("garden") + @api.onchange('garden') def _onchange_garden(self): if self.garden: self.garden_area = 10 - self.garden_orientation = "north" + self.garden_orientation = 'north' else: self.garden_area = 0 self.garden_orientation = None @@ -114,28 +115,28 @@ def _onchange_garden(self): @api.ondelete(at_uninstall=False) def _unlink_if_state_in_new_cancelled(self): for record in self: - if record.state not in ["new", "cancelled"]: + if record.state not in ['new', 'cancelled']: raise exceptions.UserError( - "Cannot unlink property while " - "state is different than new or cancelled." + 'Cannot unlink property while ' + 'state is different than new or cancelled.' ) def action_set_state_cancelled(self): for record in self: - if record.state == "sold": + if record.state == 'sold': raise exceptions.UserError( - "Sold properties cannot be canceled." + 'Sold properties cannot be canceled.' ) else: - record.state = "cancelled" + record.state = 'cancelled' return True def action_set_state_sold(self): for record in self: - if record.state == "cancelled": + if record.state == 'cancelled': raise exceptions.UserError( - "Cancelled properties cannot be sold." + 'Cancelled properties cannot be sold.' ) else: - record.state = "sold" + record.state = 'sold' return True diff --git a/addons/estate/models/estate_property_offer.py b/addons/estate/models/estate_property_offer.py index 7b0fd4ef536..ff91c36929a 100644 --- a/addons/estate/models/estate_property_offer.py +++ b/addons/estate/models/estate_property_offer.py @@ -1,48 +1,47 @@ from dateutil.relativedelta import relativedelta - -from odoo import models, fields, api, exceptions +from odoo import api, exceptions, fields, models class EstatePropertyOffer(models.Model): - _name = "estate.property.offer" - _description = "Estate Property Offer" - _order = "price desc" + _name = 'estate.property.offer' + _description = 'Estate Property Offer' + _order = 'price desc' - price = fields.Float(string="Price") + price = fields.Float(string='Price') status = fields.Selection( [ - ("accepted", "Accepted"), - ("refused", "Refused"), + ('accepted', 'Accepted'), + ('refused', 'Refused'), ], - string="Status", + string='Status', copy=False, ) partner_id = fields.Many2one( - "res.partner", string="Partner", required=True + 'res.partner', string='Partner', required=True ) property_id = fields.Many2one( - "estate.property", string="Property", required=True + 'estate.property', string='Property', required=True, ondelete='cascade' ) property_type_id = fields.Many2one( - "estate.property.type", - related="property_id.property_type_id", - string="Property Type", + 'estate.property.type', + related='property_id.property_type_id', + string='Property Type', store=True, ) - validity = fields.Integer(string="Validity (days)", default=7) + validity = fields.Integer(string='Validity (days)', default=7) date_deadline = fields.Date( - string="Deadline", - compute="_compute_date_deadline", - inverse="_inverse_date_deadline", + string='Deadline', + compute='_compute_date_deadline', + inverse='_inverse_date_deadline', ) _check_price = models.Constraint( - "CHECK(price > 0)", "Offered price must be greater than 0." + 'CHECK(price > 0)', 'Offered price must be greater than 0.' ) - @api.depends("create_date", "validity") + @api.depends('create_date', 'validity') def _compute_date_deadline(self): for record in self: start_date = record.create_date or fields.Date.today() @@ -51,7 +50,7 @@ def _compute_date_deadline(self): days=record.validity ) - @api.onchange("date_deadline") + @api.onchange('date_deadline') def _inverse_date_deadline(self): for record in self: start_date = record.create_date or fields.Date.today() @@ -63,35 +62,35 @@ def _inverse_date_deadline(self): @api.model_create_multi def create(self, vals_list): for vals in vals_list: - property_record = self.env["estate.property"].browse( - vals["property_id"] + property_record = self.env['estate.property'].browse( + vals['property_id'] ) - if vals.get("price") <= property_record.best_price: + if vals.get('price') <= property_record.best_price: raise exceptions.UserError( - "New offer must be higher than existing offers." + 'New offer must be higher than existing offers.' ) offers = super().create(vals_list) for record in offers: - if record.property_id.state == "new": - record.property_id.state = "offer_received" + if record.property_id.state == 'new': + record.property_id.state = 'offer_received' return offers def action_set_offer_status_accepted(self): for record in self: - if record.property_id.state == "offer_accepted": - raise exceptions.UserError("Only one offer can be accepted.") + if record.property_id.state == 'offer_accepted': + raise exceptions.UserError('Only one offer can be accepted.') else: - record.status = "accepted" + record.status = 'accepted' record.property_id.buyer_id = record.partner_id record.property_id.selling_price = record.price - record.property_id.state = "offer_accepted" + record.property_id.state = 'offer_accepted' - return {"type": "ir.actions.client", "tag": "reload"} + return True def action_set_offer_status_refused(self): for record in self: - record.status = "refused" + record.status = 'refused' return True diff --git a/addons/estate/models/estate_property_tag.py b/addons/estate/models/estate_property_tag.py index d9d48a15672..d386c100ff8 100644 --- a/addons/estate/models/estate_property_tag.py +++ b/addons/estate/models/estate_property_tag.py @@ -1,12 +1,12 @@ -from odoo import models, fields +from odoo import fields, models class EstatePropertyTag(models.Model): - _name = "estate.property.tag" - _description = "Property Tag" - _order = "name" + _name = 'estate.property.tag' + _description = 'Property Tag' + _order = 'name' - name = fields.Char(string="Name", required=True) + name = fields.Char(string='Name', required=True) color = fields.Integer() - _check_name = models.Constraint("UNIQUE(name)", "Name must be unique.") + _check_name = models.Constraint('UNIQUE(name)', 'Name must be unique.') diff --git a/addons/estate/models/estate_property_type.py b/addons/estate/models/estate_property_type.py index 64be7483ab4..61c63033770 100644 --- a/addons/estate/models/estate_property_type.py +++ b/addons/estate/models/estate_property_type.py @@ -1,38 +1,38 @@ -from odoo import models, fields, api +from odoo import api, fields, models class EstatePropertyType(models.Model): - _name = "estate.property.type" - _description = "Property Type" - _order = "sequence, name, id" + _name = 'estate.property.type' + _description = 'Property Type' + _order = 'sequence, name, id' name = fields.Char(required=True) - sequence = fields.Integer("Sequence", default=1, help="Sequence number") + sequence = fields.Integer('Sequence', default=1, help='Sequence number') - _check_name = models.Constraint("UNIQUE(name)", "Name must be unique.") + _check_name = models.Constraint('UNIQUE(name)', 'Name must be unique.') property_ids = fields.One2many( - "estate.property", "property_type_id", string="Properties" + 'estate.property', 'property_type_id', string='Properties' ) offer_ids = fields.One2many( - "estate.property.offer", "property_type_id", string="Offers" + 'estate.property.offer', 'property_type_id', string='Offers' ) offer_count = fields.Integer( - string="Offer Count", compute="_compute_offer_count" + string='Offer Count', compute='_compute_offer_count' ) - @api.depends("offer_ids") + @api.depends('offer_ids') def _compute_offer_count(self): for record in self: record.offer_count = len(record.offer_ids) class EstatePropertyTypeLine(models.Model): - _name = "estate.property.type.line" - _description = "Property Type Line" + _name = 'estate.property.type.line' + _description = 'Property Type Line' - model_id = fields.Many2one("estate.property.type") + model_id = fields.Many2one('estate.property.type') name = fields.Char() expected_price = fields.Char() state = fields.Char() diff --git a/addons/estate/models/res_users.py b/addons/estate/models/res_users.py index 9294de90e1a..be21594d84b 100644 --- a/addons/estate/models/res_users.py +++ b/addons/estate/models/res_users.py @@ -1,12 +1,12 @@ -from odoo import models, fields +from odoo import fields, models class ResUsers(models.Model): - _inherit = "res.users" + _inherit = 'res.users' property_ids = fields.One2many( - "estate.property", - "salesperson_id", - string="Estate Properties", - domain=[("state", "in", ["new", "offer_received", "offer_accepted"])], + 'estate.property', + 'salesperson_id', + string='Estate Properties', + domain="[('state', 'in', ['new', 'offer_received', 'offer_accepted'])]", ) From 31b8dccd556e998878128c7e4cea6aa007c794f3 Mon Sep 17 00:00:00 2001 From: Codoeh Date: Mon, 23 Mar 2026 00:03:47 +0100 Subject: [PATCH 07/14] [REF] estate/estate_account: remove additional class and options --- addons/estate/models/estate_property.py | 2 +- addons/estate/models/estate_property_offer.py | 1 - addons/estate/models/estate_property_type.py | 10 ---------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/addons/estate/models/estate_property.py b/addons/estate/models/estate_property.py index 8e7b175eb4c..778b708b4b5 100644 --- a/addons/estate/models/estate_property.py +++ b/addons/estate/models/estate_property.py @@ -13,7 +13,7 @@ class EstateProperty(models.Model): postcode = fields.Char() date_availability = fields.Date( copy=False, - default=lambda self: fields.Date.today() + relativedelta(months=+3), + default=lambda self: fields.Date.today() + relativedelta(months=3), string='Available From', ) expected_price = fields.Float(required=True) diff --git a/addons/estate/models/estate_property_offer.py b/addons/estate/models/estate_property_offer.py index ff91c36929a..8171e6a1862 100644 --- a/addons/estate/models/estate_property_offer.py +++ b/addons/estate/models/estate_property_offer.py @@ -50,7 +50,6 @@ def _compute_date_deadline(self): days=record.validity ) - @api.onchange('date_deadline') def _inverse_date_deadline(self): for record in self: start_date = record.create_date or fields.Date.today() diff --git a/addons/estate/models/estate_property_type.py b/addons/estate/models/estate_property_type.py index 61c63033770..3624222e30f 100644 --- a/addons/estate/models/estate_property_type.py +++ b/addons/estate/models/estate_property_type.py @@ -26,13 +26,3 @@ class EstatePropertyType(models.Model): def _compute_offer_count(self): for record in self: record.offer_count = len(record.offer_ids) - - -class EstatePropertyTypeLine(models.Model): - _name = 'estate.property.type.line' - _description = 'Property Type Line' - - model_id = fields.Many2one('estate.property.type') - name = fields.Char() - expected_price = fields.Char() - state = fields.Char() From c0498bec45086995ec19be1fbc16c309d168bfca Mon Sep 17 00:00:00 2001 From: Codoeh Date: Mon, 23 Mar 2026 00:14:50 +0100 Subject: [PATCH 08/14] [REF] estate/estate_account: flake8 style fix --- addons/estate/models/res_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/estate/models/res_users.py b/addons/estate/models/res_users.py index be21594d84b..0833f76b837 100644 --- a/addons/estate/models/res_users.py +++ b/addons/estate/models/res_users.py @@ -8,5 +8,5 @@ class ResUsers(models.Model): 'estate.property', 'salesperson_id', string='Estate Properties', - domain="[('state', 'in', ['new', 'offer_received', 'offer_accepted'])]", + domain="[('state', 'in', ['new', 'offer_received', 'offer_accepted'])]" ) From 0c037ea4faa3dc5c2c76c061ac76e416531df85f Mon Sep 17 00:00:00 2001 From: Codoeh Date: Mon, 23 Mar 2026 00:33:52 +0100 Subject: [PATCH 09/14] Add empty line at end of the file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fc458d4b0bd..49b4d6745b7 100644 --- a/.gitignore +++ b/.gitignore @@ -133,4 +133,4 @@ awesome_clicker awesome_dashboard awesome_gallery awesome_kanban -awesome_owl \ No newline at end of file +awesome_owl From 64cfe8209b00c7d81ccb9c97bdb83fcb2a3fddfe Mon Sep 17 00:00:00 2001 From: Codoeh Date: Mon, 23 Mar 2026 08:27:51 +0100 Subject: [PATCH 10/14] [FIX] estate/estate_account: add empty line at the end of .gitignore --- addons/estate/views/estate_property_views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/estate/views/estate_property_views.xml b/addons/estate/views/estate_property_views.xml index dd96c78c85e..4828f0de2f2 100644 --- a/addons/estate/views/estate_property_views.xml +++ b/addons/estate/views/estate_property_views.xml @@ -32,9 +32,9 @@
- diff --git a/addons/estate_account/__manifest__.py b/addons/estate_account/__manifest__.py index 42ccc25f29b..d3348da70bf 100644 --- a/addons/estate_account/__manifest__.py +++ b/addons/estate_account/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- { 'name': 'Estate Account', 'author': 'Codoeh', From 8c25590b980e05ad47c5e15af53ca731f145a0ea Mon Sep 17 00:00:00 2001 From: Codoeh Date: Mon, 23 Mar 2026 09:26:03 +0100 Subject: [PATCH 14/14] [FIX] estate/estate_account: rollback git ignore to base version --- .gitignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index 49b4d6745b7..b6e47617de1 100644 --- a/.gitignore +++ b/.gitignore @@ -127,10 +127,3 @@ dmypy.json # Pyre type checker .pyre/ -pyproject.toml -.idea -awesome_clicker -awesome_dashboard -awesome_gallery -awesome_kanban -awesome_owl