[IMP] estate: chapter 15

Author: PiaCOS

estate/models/estate_property.py

@@ -1,6 +1,6 @@
 from dateutil import relativedelta
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools import float_compare
 
@@ -27,7 +27,7 @@ class EstateProperty(models.Model):
             ("offer_received", "Offer Received"),
             ("offer_accepted", "Offer Accepted"),
             ("sold", "Sold"),
-            ("cancelled", "Cancelled"),
+            ("canceled", "canceled"),
         ],
         required=True,
         copy=False,
@@ -80,17 +80,17 @@ class EstateProperty(models.Model):
     ]
 
     @api.depends("garden_area", "living_area")
-    def _compute_total_area(self) -> None:
+    def _compute_total_area(self):
         for record in self:
             record.total_area = record.garden_area + record.living_area
 
     @api.depends("offer_ids")
-    def _compute_best_price(self) -> None:
+    def _compute_best_price(self):
         for record in self:
             record.best_price = max(record.offer_ids.mapped("price")) if record.offer_ids else 0.0
 
     @api.onchange("garden")
-    def _onchange_change(self) -> None:
+    def _onchange_change(self):
         self.write(
             {
                 "garden_area": 10 if self.garden else 0,
@@ -99,27 +99,27 @@ def _onchange_change(self) -> None:
         )
 
     @api.constrains("selling_price")
-    def _check_selling_price(self) -> None:
+    def _check_selling_price(self):
         for record in self:
             if (
-                record.offer_ids.filtered(lambda x: x.status == "accepted")
+                record.offer_ids
                 and float_compare(record.selling_price, 0.9 * record.expected_price, precision_digits=3) == -1
             ):
-                raise ValidationError("The selling price should be atleast 90% of the expected price")
+                raise ValidationError(_("The selling price should be atleast 90% of the expected price"))
 
     @api.ondelete(at_uninstall=False)
-    def _unlink_if_new_or_cancelled(self) -> None:
-        if any(record.state not in ("new", "cancelled") for record in self):
-            raise UserError("Can't delete an active property")
+    def _unlink_if_new_or_canceled(self):
+        if any(record.state not in ("new", "canceled") for record in self):
+            raise UserError(_("Can't delete an active property"))
 
     def action_cancel_property(self) -> bool:
         if "sold" in self.mapped("state"):
-            raise UserError("Cannot cancel a sold property")
-        self.write({"state": "cancelled"})
+            raise UserError(_("Cannot cancel a sold property"))
+        self.write({"state": "canceled"})
         return True
 
     def action_sold_property(self) -> bool:
-        if "cancelled" in self.mapped("state"):
-            raise UserError("Cannot sell a cancel property")
+        if "canceled" in self.mapped("state"):
+            raise UserError(_("Cannot sell a cancel property"))
         self.write({"state": "sold"})
         return True

estate/models/estate_property_offer.py

@@ -10,7 +10,7 @@ class EstatePropertyOffer(models.Model):
     _description = "Real Estate: Offer"
     _order = "price desc"
 
-    price = fields.Float("Price")
+    price = fields.Float("Price", required=True)
     status = fields.Selection(
         selection=[
             ("accepted", "Accepted"),
@@ -32,35 +32,36 @@ class EstatePropertyOffer(models.Model):
     ]
 
     @api.depends("validity")
-    def _compute_deadline(self) -> None:
+    def _compute_deadline(self):
         for record in self:
             creation_date = record.create_date or fields.Date.today()
             record.date_deadline = creation_date + relativedelta.relativedelta(days=record.validity)
 
-    def _inverse_compute_deadline(self) -> None:
+    def _inverse_compute_deadline(self):
         for record in self:
             record.validity = (record.date_deadline - record.create_date.date()).days
 
     @api.model_create_multi
-    def create(self, vals_list) -> None:
+    def create(self, vals_list):
         for val in vals_list:
             property_id = self.env["estate.property"].browse(val["property_id"])
+            max_price = max(
+                property_id.offer_ids.mapped("price"),
+                default=0.0,
+            )
             if (
                 float_compare(
-                    max(
-                        property_id.offer_ids.mapped("price"),
-                        default=0.0,
-                    ),
+                    max_price,
                     val["price"],
                     precision_digits=2,
                 )
-                > -1
+                >= 0
             ):
-                raise UserError(_("Can't make an offer with a lower price than the other"))
+                raise UserError(_("The offer must be higher than %.2f") % max_price)
             property_id.write({"state": "offer_received"})
         return super().create(vals_list)
 
-    def action_refuse_offer(self) -> bool:
+    def action_refuse_offer(self):
         for record in self:
             record.status = "refused"
             record.property_id.write(
@@ -71,14 +72,15 @@ def action_refuse_offer(self) -> bool:
             )
         return True
 
-    def action_accept_offer(self) -> bool:
+    def action_accept_offer(self):
         for record in self:
-            record.property_id.offer_ids.filtered(lambda x: x.status == "accepted").write({"status": "refused"})
+            record.property_id.offer_ids.write({"status": "refused"})
             record.status = "accepted"
             record.property_id.write(
                 {
                     "selling_price": record.price,
                     "buyer_id": record.partner_id,
+                    "state": "offer_accepted",
                 }
             )
 

estate/models/estate_property_type.py

@@ -13,7 +13,7 @@ class EstatePropertyType(models.Model):
     offer_count = fields.Integer(compute="_compute_offer_count")
 
     @api.depends("offer_ids")
-    def _compute_offer_count(self) -> None:
+    def _compute_offer_count(self):
         for record in self:
             record.offer_count = len(record.offer_ids.filtered(lambda x: x.property_type_id.name == record.name))
 

estate/models/res_users.py

@@ -1,7 +1,7 @@
 from odoo import fields, models
 
 
-class ResUsrs(models.Model):
+class ResUsers(models.Model):
     _inherit = "res.users"
 
     property_ids = fields.One2many(

estate/views/estate_property_views.xml

@@ -34,9 +34,9 @@
             <form string="Properties">
                 <header>
                     <button name="action_cancel_property" type="object" string="Cancel"
-                        invisible="state in ('cancelled', 'sold',)"/>
+                        invisible="state in ('canceled', 'sold',)"/>
                     <button name="action_sold_property" type="object" string="Sold"
-                        invisible="state in ('cancelled', 'sold',)"/>
+                        invisible="state in ('canceled', 'sold',)"/>
                     <field name="state" widget="statusbar"
                         statusbar_visible="new,offer_received,offer_accepted,sold"
                         options="{'clickable': '1'}"/>
@@ -82,7 +82,7 @@
                         </page>
                         <page string="Offers">
                             <field name="offer_ids"
-                                readonly="state in ('offer_accepted', 'sold', 'cancelled')"/>
+                                readonly="state in ('offer_accepted', 'sold', 'canceled')"/>
                         </page>
                         <page string="Other Info">
                             <group>
@@ -123,7 +123,7 @@
         <field name="name">estate.property.kanban</field>
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
-            <kanban default_group_by="property_type_id" records_draggable="False" groups_draggable="False">
+            <kanban default_group_by="property_type_id" records_draggable="0" groups_draggable="0">
                 <field name="state"/>
                 <templates>
                     <t t-name="card">

estate/views/res_users_views.xml

@@ -5,11 +5,6 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form"/>
         <field name="arch" type="xml">
-            <!-- <xpath expr="//page[@name='account_security']" position="after">
-                <page string="Properties" name="estate_properties">
-                    <field name="property_ids"/>
-                </page>
-            </xpath> -->
             <notebook position="inside">
                 <page string="Properties" name="estate_properties">
                     <field name="property_ids"/>

estate_account/__manifest__.py

@@ -3,7 +3,5 @@
     "installable": True,
     "category": "Tutorials/RealEstate",
     "depends": ["account", "estate"],
-    # "data": [
-    # ],
     "license": "LGPL-3",
 }

estate_account/models/estate_property.py

@@ -5,6 +5,7 @@ class EstateProperty(models.Model):
     _inherit = "estate.property"
 
     def action_sold_property(self):
+        res = super().action_sold_property()
         invoice_vals_list = []
         purchase_journal = self.env["account.journal"].search([("type", "=", "sale")], limit=1)
         for record in self:
@@ -31,4 +32,4 @@ def action_sold_property(self):
             }
             invoice_vals_list.append(invoice_vals)
         self.env["account.move"].create(invoice_vals_list)
-        return super().action_sold_property()
+        return res