[CLN] estate: Chapter 15

Author: qucol-odoo

estate/__manifest__.py

@@ -11,7 +11,7 @@
         'views/estate_property_type_views.xml',
         'views/estate_property_tag_views.xml',
         'views/estate_res_user_views.xml',
-        'views/estate_menus.xml',
+        'views/estate_menu_views.xml',
     ],
     'application': True,
     'author': 'Odoo S.A.',

estate/models/__init__.py

@@ -1,5 +1,5 @@
-from . import estate_properties
-from . import estate_property_types
-from . import estate_property_tags
-from . import estate_property_offers
+from . import estate_property
+from . import estate_property_type
+from . import estate_property_tag
+from . import estate_property_offer
 from . import res_user

estate/models/estate_properties.py renamed to estate/models/estate_property.py

@@ -1,4 +1,4 @@
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools import float_compare
 
@@ -10,21 +10,13 @@ class PropertyModel(models.Model):
     _name = "estate.property"
     _description = "Estate Property model"
     _order = "id desc"
-    _check_positive_expected_price = models.Constraint(
-        "CHECK(expected_price >= 0)",
-        "The expected price must be positive."
-    )
-    _check_positive_selling_price = models.Constraint(
-        "CHECK(selling_price >= 0)",
-        "The selling price must be positive"
-    )
 
     name = fields.Char("Title", required=True)
     description = fields.Text()
     postcode = fields.Char()
     date_availability = fields.Date(default=fields.Date.add(fields.Date.today(), months=3), copy=False)
     expected_price = fields.Float(required=True)
-    best_offer = fields.Float(compute="_get_highest_price")
+    best_offer = fields.Float(compute="_compute_highest_price")
     selling_price = fields.Float(readonly=True, copy=False)
     bedrooms = fields.Integer(default=2)
     living_area = fields.Integer("Living Area (sqm)")
@@ -57,13 +49,22 @@ class PropertyModel(models.Model):
     tag_ids = fields.Many2many("estate.property.tag")
     offer_ids = fields.One2many("estate.property.offer", "property_id")
 
+    _check_positive_expected_price = models.Constraint(
+        "CHECK(expected_price >= 0)",
+        "The expected price must be positive."
+    )
+    _check_positive_selling_price = models.Constraint(
+        "CHECK(selling_price >= 0)",
+        "The selling price must be positive"
+    )
+
     @api.depends("living_area", "garden_area")
     def _compute_total_area(self):
         for record in self:
             record.total_living_area = record.living_area + record.garden_area
 
     @api.depends("offer_ids")
-    def _get_highest_price(self):
+    def _compute_highest_price(self):
         for record in self:
             record.best_offer = max(record.offer_ids.mapped("price")) if record.offer_ids else 0
 
@@ -76,27 +77,27 @@ def _update_garden_area_and_orientation(self):
             self.garden_area = 0
             self.garden_orientation = None
 
-    def mark_as_sold(self):
+    @api.constrains("selling_price", "expected_price")
+    def _check_selling_price(self):
+        for record in self:
+            if record.selling_price and float_compare(record.selling_price, record.expected_price * .9, 0) == -1:
+                raise ValidationError(r"The selling price cannot be lower than 90% of the expected price.")
+
+    @api.ondelete(at_uninstall=False)
+    def _unlink_if_new_or_cancelled(self):
+        if any(record.state not in ('new', 'cancelled') for record in self):
+            raise UserError(_("Only 'New' and 'Cancelled' properties can be deleted."))
+
+    def action_mark_as_sold(self):
         self.ensure_one()
         if self.state == "cancelled":
             raise UserError("A cancelled property cannot be set as sold.")
         self.state = "sold"
         return True
 
-    def mark_as_cancelled(self):
+    def action_mark_as_cancelled(self):
         self.ensure_one()
         if self.state == "sold":
-            raise UserError("A sold property cannot be set as cancelled.")
+            raise UserError(_("A sold property cannot be set as cancelled."))
         self.state = "cancelled"
         return True
-
-    @api.constrains("selling_price", "expected_price")
-    def _check_selling_price(self):
-        for record in self:
-            if record.selling_price and float_compare(record.selling_price, record.expected_price * .9, 0) == -1:
-                raise ValidationError(r"The selling price cannot be lower than 90% of the expected price.")
-
-    @api.ondelete(at_uninstall=False)
-    def _unlink_if_new_or_cancelled(self):
-        if any(record.state not in ('new', 'cancelled') for record in self):
-            raise UserError("Only 'New' and 'Cancelled' properties can be deleted.")

estate/models/estate_property_offers.py renamed to estate/models/estate_property_offer.py

@@ -1,4 +1,4 @@
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 
 
@@ -20,6 +20,7 @@ class PropertyOfferModel(models.Model):
     property_type_id = fields.Many2one(related="property_id.property_type_id", store=True)
     validity = fields.Integer(default=7)
     date_deadline = fields.Date(compute="_compute_deadline", inverse="_inverse_deadline")
+
     _check_price = models.Constraint(
         "CHECK(price >= 0)",
         "The price of the offer must be positive."
@@ -34,6 +35,16 @@ def _inverse_deadline(self):
         for record in self:
             record.validity = (record.date_deadline - fields.Date.to_date(record.create_date)).days if record.date_deadline else record.validity
 
+    @api.model
+    def create(self, vals_list: list[dict]):
+        for val in vals_list:
+            estate_property = self.env["estate.property"].browse(val["property_id"])
+            if any(offer.price > val["price"] for offer in estate_property.offer_ids):
+                raise UserError(_("Cannot create a new offer with a lower price than an existing offer."))
+            if estate_property.state == 'new':
+                estate_property.state = 'received'
+        return super().create(vals_list)
+
     def accept_offer(self):
         self.ensure_one()
         self.status = "accepted"
@@ -50,13 +61,3 @@ def refuse_all_other_offers(self):
     def refuse_offer(self):
         self.ensure_one()
         self.status = "refused"
-
-    @api.model
-    def create(self, vals_list: list[dict]):
-        for val in vals_list:
-            estate_property = self.env["estate.property"].browse(val["property_id"])
-            if any(offer.price > val["price"] for offer in estate_property.offer_ids):
-                raise UserError("Cannot create a new offer with a lower price than an existing offer.")
-            if estate_property.state == 'new':
-                estate_property.state = 'received'
-        return super().create(vals_list)

estate/models/estate_property_tags.py renamed to estate/models/estate_property_tag.py

@@ -5,10 +5,11 @@ class PropertyTagModel(models.Model):
     _name = "estate.property.tag"
     _description = "Estate Property Tag model"
     _order = "name"
+
+    name = fields.Char(required=True)
+    color = fields.Integer()
+
     _check_tag_uniqueness = models.Constraint(
         "UNIQUE(name)",
         "Each tag should have a unique name."
     )
-
-    name = fields.Char(required=True)
-    color = fields.Integer()

estate/models/estate_property_types.py renamed to estate/models/estate_property_type.py

@@ -5,17 +5,18 @@ class PropertyTypeModel(models.Model):
     _name = "estate.property.type"
     _description = "Estate Property Type model"
     _order = "sequence"
-    _check_type_uniqueness = models.Constraint(
-        "UNIQUE(name)",
-        "Each type should have a unique name."
-    )
 
     name = fields.Char(required=True)
     property_ids = fields.One2many("estate.property", "property_type_id")
     offer_ids = fields.One2many("estate.property.offer", "property_type_id")
     offer_count = fields.Integer("Offer Count", compute="_compute_offer_count")
     sequence = fields.Integer("Sequence")
 
+    _check_type_uniqueness = models.Constraint(
+        "UNIQUE(name)",
+        "Each type should have a unique name."
+    )
+
     @api.depends("offer_ids")
     def _compute_offer_count(self):
         for record in self:

estate/models/res_user.py

@@ -6,5 +6,5 @@ class ResUser(models.Model):
 
     property_ids = fields.One2many(
         "estate.property", "salesperson"
-        , domain="['|', ('state', '=', 'new'), ('state', '=', 'received')]"
+        , domain=['|', ('state', '=', 'new'), ('state', '=', 'received')]
     )

estate/views/estate_menus.xml renamed to estate/views/estate_menu_views.xml

@@ -6,7 +6,7 @@
         <field name="domain">[('property_type_id', '=', active_id)]</field>
     </record>
 
-    <record id="estate_property_offer_list_view" model="ir.ui.view">
+    <record id="estate_property_offer_view_list" model="ir.ui.view">
         <field name="name">estate.property.offer.list</field>
         <field name="model">estate.property.offer</field>
         <field name="arch" type="xml">
@@ -25,7 +25,7 @@
         </field>
     </record>
 
-    <record id="estate_property_offer_form_view" model="ir.ui.view">
+    <record id="estate_property_offer_view_form" model="ir.ui.view">
         <field name="name">estate.property.offer.form</field>
         <field name="model">estate.property.offer</field>
         <field name="arch" type="xml">

estate/views/estate_property_offer_views.xml

@@ -5,7 +5,7 @@
         <field name="view_mode">list,form</field>
     </record>
 
-    <record id="estate_property_tag_list_view" model="ir.ui.view">
+    <record id="estate_property_tag_view_list" model="ir.ui.view">
         <field name="name">estate.property.tag.list</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">