[IMP] estate, estate_account: correct typo and refactor according to the review

Add a lambda fonction to the default field computing a date based on fields.Date.today method.

Add a line at the end of file for files where it was missing.

Adapted the create method of the EstatePropertyOffer to match the api.model_create_multi decorator.

Add a call to the self.env._ method at each UserError callto export them for translation.

Updated class name according to the guideline to match their model name in CamelCase format.

Updated 'offer received' and 'offer accepted' to snake_case formatting.

Updated misleading _sql_constraints name and error from estate_property_type.

Switch to default return value instead of a workaround for max method in estate/models/estate_property.py .

Updated action_confirm to:
1) right algorithm
2) better readability using write and filtered method

Corrected some string field in xml.

Uncommented the core of a stat_button that was only displaying 'test'.

Author: clom-odoo

estate/models/estate_property.py

@@ -5,7 +5,7 @@
 from odoo.tools.float_utils import float_compare
 
 
-class Properties(models.Model):
+class EstateProperty(models.Model):
     _name = "estate.property"
     _description = "Properties of the estate model"
     _order = "id desc"
@@ -17,7 +17,7 @@ class Properties(models.Model):
     date_availability = fields.Date(
         "Date availability",
         copy=False,
-        default=fields.Date.today() + relativedelta(months=3))
+        default=lambda S: fields.Date.today() + relativedelta(months=3))
     expected_price = fields.Float("Expected price", required=True)
     selling_price = fields.Float("Selling price", readonly=True, copy=False)
     bedrooms = fields.Integer("# Bedrooms", default=2)
@@ -32,8 +32,8 @@ class Properties(models.Model):
     state = fields.Selection(
         selection=[
             ("new", "New"),
-            ("offer received", "Offer Received"),
-            ("offer accepted", "Offer Accepted"),
+            ("offer_received", "Offer Received"),
+            ("offer_accepted", "Offer Accepted"),
             ("sold", "Sold"),
             ("cancelled", "Cancelled")],
         required=True,
@@ -60,7 +60,7 @@ def _compute_area(self):
     @api.depends("offer_ids")
     def _find_best_price(self):
         for record in self:
-            record.best_price = max(record.offer_ids.mapped("price") + [0])
+            record.best_price = max(record.offer_ids.mapped("price"), default=0)
 
     @api.onchange("garden")
     def _onchange_garden(self):
@@ -76,15 +76,15 @@ def action_sold(self):
             if a_property.state not in ["cancelled"]:
                 a_property.state = "sold"
             else:
-                raise UserError("Property is already cancelled")
+                raise UserError(self.env._("Property is already cancelled"))
         return True
 
     def action_cancel(self):
         for a_property in self:
             if a_property.state not in ["sold"]:
                 a_property.state = "cancelled"
             else:
-                raise UserError("Property is already sold")
+                raise UserError(self.env._("Property is already sold"))
         return True
 
     @api.constrains("selling_price")
@@ -96,4 +96,4 @@ def _check_minimum_sell_price(self):
     @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("Property should be New or Cancelled in order to be deleted")
+            raise UserError(self.env._("Property should be New or Cancelled in order to be deleted"))

estate/models/estate_property_offer.py

@@ -12,7 +12,7 @@ class PropertyOffer(models.Model):
     status = fields.Selection(copy=False, selection=[('accepted', 'Accepted'), ('refused', 'Refused')])
     partner_id = fields.Many2one("res.partner", required=True)
     property_id = fields.Many2one("estate.property", required=True)
-    date_deadline = fields.Date(default=fields.Date.today() + relativedelta(days=7), compute="_compute_deadline", inverse="_update_validity")
+    date_deadline = fields.Date(default=lambda s:fields.Date.today() + relativedelta(days=7), compute="_compute_deadline", inverse="_update_validity")
     validity = fields.Integer(default=7)
     property_type_id = fields.Many2one(related="property_id.property_type_id", store=True)
 
@@ -23,45 +23,43 @@ class PropertyOffer(models.Model):
     @api.depends("validity")
     def _compute_deadline(self):
         for record in self:
-            if record.create_date:
-                now = record.create_date
-                record.date_deadline = now + relativedelta(days=record.validity)
+            now = record.create_date
+            record.date_deadline = now + relativedelta(days=record.validity)
 
     def _update_validity(self):
         for offer in self:
-            if offer.create_date:
-                offer.validity = (offer.date_deadline - offer.create_date.date()).days
+            offer.validity = (offer.date_deadline - offer.create_date.date()).days
 
     def action_confirm(self):
         for offer in self:
-
-            for other_offer in offer.property_id.offer_ids:
-                if other_offer.status == "accepted":
-                    offer.status = "refused"
-
-            if offer.status == "refused":
-                raise UserError("Offer already refused")
-
-            offer.status = "accepted"
-            offer.property_id.buyer = offer.partner_id
-            offer.property_id.selling_price = offer.price
-            for other_offer in offer.property_id.mapped("offer_ids"):
-                if other_offer.id != offer.id:
-                    other_offer.status = "refused"
+            if offer.status == 'refused':
+                raise UserError("You cannot accept an offer that is already refused.")
+            other_offers = offer.property_id.offer_ids.filtered(lambda o: o.id != offer.id and o.status != 'refused')
+            other_offers.write({'status': 'refused'})
+            offer.write({'status': 'accepted'})
+            offer.property_id.write({
+                'buyer': offer.partner_id,
+                'selling_price': offer.price,
+            })
         return True
 
     def action_cancel(self):
         for offer in self:
             if offer.status == "accepted":
-                raise UserError("Offer already accepted")
+                raise UserError(self.env._("Offer already accepted"))
             offer.status = "refused"
         return True
 
-    @api.model
-    def create_multi(self, vals):
-        property_id = self.env["estate.property"].browse(vals["property_id"])
-        if property_id.state == "new":
-            property_id.state = "offer received"
-        if property_id.best_price > vals["price"]:
-            raise UserError("The price of a new offer can't be below the price of an already existing offer.")
-        return super().create_multi(vals)
+    @api.model_create_multi
+    def create(self, vals_list):
+        properties = self.env['estate.property'].browse([vals['property_id'] for vals in vals_list])
+        property_map = {prop.id: prop for prop in properties}
+        for vals in vals_list:
+            prop = property_map.get(vals['property_id'])
+            if not prop:
+                raise UserError("Invalid property_id in offer.")
+            if prop.best_price and vals['price'] < prop.best_price:
+                raise UserError("The price of a new offer can't be below the price of an already existing offer.")
+        new_properties = properties.filtered(lambda p: p.state == 'new')
+        new_properties.write({'state': 'offer_received'})
+        return super().create(vals_list)

estate/models/estate_property_tag.py

@@ -1,7 +1,7 @@
 from odoo import fields, models
 
 
-class PropertyTags(models.Model):
+class PropertyTag(models.Model):
     _name = "estate.property.tag"
     _description = "Tags used to describe a property"
     _order = "name desc"

estate/models/estate_property_type.py

@@ -12,7 +12,7 @@ class PropertyType(models.Model):
     offer_ids = fields.One2many("estate.property.offer", "property_type_id")
     offer_count = fields.Integer(compute="_count_offer")
 
-    _sql_constraints = [("unique_property_tag", "UNIQUE(name)", "Tag name must be unique !")]
+    _sql_constraints = [("unique_property_type", "UNIQUE(name)", "Type name must be unique !")]
 
     @api.depends("offer_ids")
     def _count_offer(self):

estate/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
+estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1

estate/views/estate_menus.xml

@@ -9,4 +9,4 @@
             <menuitem id="estate_tag_menu_action" action="estate_property_tag_action"/>
         </menuitem>
     </menuitem>
-</odoo>
+</odoo>

estate/views/estate_property_offer_views.xml

@@ -19,7 +19,7 @@
         <field name="name">estate.property.offer.list</field>
         <field name="model">estate.property.offer</field>
         <field name="arch" type="xml">
-            <list string="Channel">
+            <list>
                 <field name="price"/>
                 <field name="partner_id"/>
                 <field name="property_id"/>
@@ -33,7 +33,7 @@
         <field name="name">estate.property.offer.form</field>
         <field name="model">estate.property.offer</field>
         <field name="arch" type="xml">
-            <form string="Property">
+            <form string="Property Offer">
                 <sheet>
                     <group>
                     <field name="status"/>

estate/views/estate_property_tag_views.xml

@@ -22,7 +22,7 @@
         <field name="name">estate.property.tag.list</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">
-            <list string="Channel" editable="bottom">
+            <list editable="bottom">
                 <field name="name"/>
             </list>
         </field>
@@ -33,7 +33,7 @@
         <field name="name">estate.property.tag.form</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">
-            <form string="Property">
+            <form string="Property Tag">
                 <sheet>
                     <h1><field name="name"/></h1>
                 </sheet>

estate/views/estate_property_type_views.xml

@@ -22,7 +22,7 @@
         <field name="name">estate.property.type.list</field>
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
-            <list string="Channel">
+            <list>
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>
                 <field name="offer_count"/>
@@ -40,15 +40,15 @@
                 <div name="button_box">
                     <button class="oe_stat_button"
                         name="estate.estate_property_offer_action_filter"
-                        type="action" string="test">
-                        <!-- 
+                        type="action">
+                        
                         <div class="o_field_widget o_stat_info">
                             <span class="o_stat_value d-flex gap-1">
                                 <field name="offer_count" widget="statinfo" nolabel="1" class="oe_inline"/>
                                 <field name="name" class="oe_inline"/>
                             </span>
                         </div>
-                        -->
+                       
                     </button>
                 </div>
                     <h1><field name="name"/></h1>

estate/views/estate_property_views.xml

@@ -12,7 +12,7 @@
                 <field string="Bedrooms" name="bedrooms"/>
                 <field string="Living Area (sqm)" name="living_area" filter_domain="[('living_area', '&gt;', self)]"/>
                 <field string="Facades" name="facades"/>
-                <filter string="Available" name="state_availability_filter" domain="['|',('state','=', 'new'), ('state','=','offer received')]"/>
+                <filter string="Available" name="state_availability_filter" domain="['|',('state','=', 'new'), ('state','=','offer_received')]"/>
                 <filter string="Postcode" name="groupby_postcode" context="{'group_by':'postcode'}"/>
             </search>
         </field>
@@ -30,7 +30,7 @@
         <field name="name">estate.property.list</field>
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
-            <list string="Channel" decoration-success="state in ['offer received','offer accepted']" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
+            <list decoration-success="state in ['offer_received','offer_accepted']" decoration-bf="state == 'offer_accepted'" decoration-muted="state == 'sold'">
                 <field name="name"/>
                 <field name="postcode"/>
                 <field name="bedrooms"/>
@@ -58,7 +58,7 @@
                 <header>
                     <button name="action_sold" type="object" string="Sold" invisible="state in ['sold', 'cancelled']"/>
                     <button name="action_cancel" type="object" string="Cancel" invisible="state in ['sold', 'cancelled']"/>
-                    <field name="state" widget="statusbar" statusbar_visible="new,offer received, offer accepted,sold"/>
+                    <field name="state" widget="statusbar" statusbar_visible="new,offer_received, offer_accepted,sold"/>
                 </header>
                 <sheet>
                     <h1><field name="name"/></h1>
@@ -87,10 +87,11 @@
                                 <field name="garden_area" invisible="not garden"/>
                                 <field name="garden_orientation" invisible="not garden"/>
                                 <field name="total_area"/>
+                                <field name="state"/>
                             </group>
                         </page>
                         <page string="Offers">
-                            <field name="offer_ids" readonly="state in ['offer accepted', 'sold', 'cancelled']">
+                            <field name="offer_ids" readonly="state in ['offer_accepted', 'sold', 'cancelled']">
                                 <list string="Offers" editable="bottom" decoration-danger="status == 'refused'" decoration-success="status == 'accepted'">
                                     <field name="price"/>
                                     <field name="partner_id"/>
@@ -127,13 +128,13 @@
                                 Expected Price :
                                 <field name="expected_price" string="Expected price"/>
                             </group>
-                            <div t-if="['offer received', 'offer accepted', 'sold'].includes(record.state.raw_value)">
+                            <div t-if="['offer_received', 'offer_accepted', 'sold'].includes(record.state.raw_value)">
                                 <group>
                                     Best Offer : <field name="best_price" string="Best Price"/>
                                 </group>
                             </div>
 
-                            <div t-if="['offer accepted', 'sold', 'Sold'].includes(record.state.raw_value)">
+                            <div t-if="['offer_accepted', 'sold', 'Sold'].includes(record.state.raw_value)">
                                 Selling Price :
                                 <field name="selling_price"/>
                             </div>

estate/views/res_user.xml

@@ -12,4 +12,4 @@
         </xpath>
     </field>
 </record>
-</odoo>
+</odoo>

estate_account/models/estate_property.py

@@ -1,7 +1,7 @@
 from odoo import models, Command
 
 
-class Property(models.Model):
+class EstateProperty(models.Model):
     _inherit = "estate.property"
 
     def action_sold(self):