[IMP] estate: auto-refuse other offers when one is marked done and clean up field declarations

jcha-odoo · jcha-odoo · commit 9ac4d892aa08 · 2025-07-29T15:40:07.000+05:30
- Added functionality to automatically refuse other offers once one offer is marked done
- Removed redundant checks and rearranged field declarations to reduce lines and enhance code readability
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
@@ -16,61 +16,23 @@ class EstateProperty(models.Model):
     # -----------------------------
     # Field Declarations
     # -----------------------------
-    name = fields.Char(
-        string='Title',
-        required=True,
-        help='Title or name of the property.'
-    )
-    description = fields.Text(
-        string='Description',
-        help='Detailed description of the property.'
-    )
-    postcode = fields.Char(
-        string='Postcode',
-        help='Postal code of the property location.'
-    )
+    name = fields.Char(string='Title', required=True, help='Title or name of the property.')
+    description = fields.Text(string='Description', help='Detailed description of the property.')
+    postcode = fields.Char(string='Postcode', help='Postal code of the property location.')
     date_availability = fields.Date(
         string='Availability From',
         copy=False,
         default=(date.today() + relativedelta(months=3)),
         help='Date from which the property will be available.'
     )
-    expected_price = fields.Float(
-        string='Expected Price',
-        required=True,
-        help='Price expected by the seller for this property.'
-    )
-    selling_price = fields.Float(
-        string='Selling Price',
-        readonly=True,
-        copy=False,
-        help='Final selling price once the property is sold.'
-    )
-    bedrooms = fields.Integer(
-        string='Bedrooms',
-        default=2,
-        help='Number of bedrooms in the property.'
-    )
-    living_area = fields.Integer(
-        string='Living Area (sqm)',
-        help='Living area size in square meters.'
-    )
-    facades = fields.Integer(
-        string='Facades',
-        help='Number of facades of the property.'
-    )
-    garage = fields.Integer(
-        string='Garage',
-        help='Number of garage spaces.'
-    )
-    garden = fields.Boolean(
-        string='Garden',
-        help='Whether the property has a garden.'
-    )
-    garden_area = fields.Integer(
-        string='Garden Area (sqm)',
-        help='Size of the garden area in square meters.'
-    )
+    expected_price = fields.Float(string='Expected Price', required=True, help='Price expected by the seller for this property.')
+    selling_price = fields.Float(string='Selling Price', readonly=True, copy=False, help='Final selling price once the property is sold.')
+    bedrooms = fields.Integer(string='Bedrooms', default=2, help='Number of bedrooms in the property.')
+    living_area = fields.Integer(string='Living Area (sqm)', help='Living area size in square meters.')
+    facades = fields.Integer(string='Facades', help='Number of facades of the property.')
+    garage = fields.Integer(string='Garage', help='Number of garage spaces.')
+    garden = fields.Boolean(string='Garden', help='Whether the property has a garden.')
+    garden_area = fields.Integer(string='Garden Area (sqm)', help='Size of the garden area in square meters.')
     garden_orientation = fields.Selection(
         string='Garden Orientation',
         selection=[
@@ -79,9 +41,7 @@ class EstateProperty(models.Model):
             ('east', 'East'),
             ('west', 'West'),
         ],
-        default='north',
-        help='Direction the garden faces.'
-    )
+        default='north', help='Direction the garden faces.')
     state = fields.Selection(
         string='Status',
         selection=[
@@ -91,51 +51,20 @@ class EstateProperty(models.Model):
             ('sold', 'Sold'),
             ('cancelled', 'Cancelled'),
         ],
-        required=True,
-        copy=False,
-        default='new',
-        help='Current status of the property.'
-    )
-    active = fields.Boolean(
-        string='Active',
-        default=True,
-        help='Whether the property is active and visible.'
-    )
-    property_type_id = fields.Many2one(
-        'estate.property.type',
-        string='Property Type',
-        help='Type or category of the property.'
-    )
-    buyer_id = fields.Many2one(
-        'res.partner',
-        string='Buyer',
-        copy=False,
-        help='Partner who bought the property.'
-    )
-    sales_id = fields.Many2one(
-        'res.users',
-        string='Salesman',
-        default=lambda self: self.env.user,
-        help='Salesperson responsible for the property.'
-    )
-    tag_ids = fields.Many2many(
-        'estate.property.tag',
-        string='Tags',
-        help='Tags to classify the property.'
-    )
-    offer_ids = fields.One2many(
-        'estate.property.offer',
-        'property_id',
-        string='Offers',
-        help='Offers made on this property.'
-    )
+        required=True, copy=False, default='new', help='Current status of the property.'
+    )
+    active = fields.Boolean(string='Active', default=True, help='Whether the property is active and visible.')
+    property_type_id = fields.Many2one('estate.property.type', string='Property Type', help='Type or category of the property.')
+    buyer_id = fields.Many2one('res.partner', string='Buyer', copy=False, help='Partner who bought the property.')
+    sales_id = fields.Many2one('res.users', string='Salesman', default=lambda self: self.env.user, help='Salesperson responsible for the property.')
+    tag_ids = fields.Many2many('estate.property.tag', string='Tags', help='Tags to classify the property.')
+    offer_ids = fields.One2many('estate.property.offer', 'property_id', string='Offers', help='Offers made on this property.')
 
     # -----------------------------
     # SQL Constraints
     # -----------------------------
     _sql_constraints = [
-        ('check_expected_price', 'CHECK(expected_price > 0)', 'Expected price cannot be negative.'),
-        ('check_selling_price', 'CHECK(selling_price > 0)', 'Selling price cannot be negative.'),
+        ('check_expected_price', 'CHECK(expected_price > 0)', 'Expected price cannot be negative.')
     ]
 
     # -----------------------------
@@ -191,23 +120,6 @@ def action_cancel(self):
     # -----------------------------
     # Constraints
     # -----------------------------
-    @api.constrains('selling_price', 'expected_price')
-    def _check_selling_price(self):
-        """
-        Ensure selling price is at least 90% of expected price.
-        Raises ValidationError if condition is not met.
-        """
-        for record in self:
-            if record.selling_price and record.selling_price < 0.9 * record.expected_price:
-                raise ValidationError(
-                    _("The selling price must be at least 90%% of the expected price.\n"
-                        "Expected Price: %(expected).2f\nSelling Price: %(selling).2f")
-                    % {
-                        'expected': record.expected_price,
-                        'selling': record.selling_price
-                    }
-                )
-
     @api.constrains('selling_price', 'expected_price')
     def _check_selling_price_above_90_percent(self):
         """
@@ -219,14 +131,14 @@ def _check_selling_price_above_90_percent(self):
                 continue
             min_acceptable_price = 0.9 * record.expected_price
             if float_compare(record.selling_price, min_acceptable_price, precision_digits=2) < 0:
-                raise ValidationError(
-                    _("The selling price must be at least 90%% of the expected price.\n"
-                        "Expected Price: %(expected_price).2f\nSelling Price: %(selling_price).2f")
-                    % {
+                raise ValidationError(_(
+                    "The selling price must be at least 90%% of the expected price.\n"
+                    "Expected Price: %(expected_price).2f\nSelling Price: %(selling_price).2f",
+                    {
                         'expected_price': record.expected_price,
                         'selling_price': record.selling_price
                     }
-                )
+                ))
 
     @api.ondelete(at_uninstall=False)
     def _check_can_be_deleted(self):
@@ -236,4 +148,4 @@ def _check_can_be_deleted(self):
         """
         for record in self:
             if record.state not in ['new', 'cancelled']:
-                raise UserError("You can only delete properties that are New or Cancelled.")
+                raise UserError('You can only delete properties that are New or Cancelled.')
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
@@ -16,60 +16,30 @@ class EstatePropertyOffer(models.Model):
     # SQL Constraints
     # -----------------------------
     _sql_constraints = [
-        ('check_offer_price', 'CHECK(price >= 0)', 'Offer price cannot be negative or zero.'),
+        ('check_offer_price', 'CHECK(price > 0)', 'Offer price cannot be negative or zero.'),
     ]
 
     # -----------------------------
     # Field Declarations
     # -----------------------------
-    price = fields.Float(
-        string='Price',
-        required=True,
-        help='The offer price proposed by the partner.'
-    )
-
+    price = fields.Float(string='Price', required=True, help='The offer price proposed by the partner.')
     status = fields.Selection(
         string='Status',
         selection=[
             ('accepted', 'Accepted'),
             ('refused', 'Refused'),
         ],
-        copy=False,
-        help='Current status of the offer: Accepted or Refused.'
-    )
-
-    validity = fields.Integer(
-        string='Validity (days)',
-        default=7,
-        help='Number of days this offer remains valid from the creation date.'
+        copy=False, help='Current status of the offer: Accepted or Refused.'
     )
-
+    validity = fields.Integer(string='Validity (days)', default=7, help='Number of days this offer remains valid from the creation date.')
     date_deadline = fields.Date(
-        string='Deadline',
-        compute='_compute_date_deadline',
+        string='Deadline', compute='_compute_date_deadline',
         inverse='_inverse_date_deadline',
         help='Deadline date until which the offer is valid.'
     )
-
-    partner_id = fields.Many2one(
-        'res.partner',
-        string='Partner',
-        required=True,
-        help='The partner who made this offer.'
-    )
-
-    property_id = fields.Many2one(
-        'estate.property',
-        string='Property',
-        required=True,
-        help='The property this offer is related to.'
-    )
-
-    property_type_id = fields.Many2one(
-        related='property_id.property_type_id',
-        store=True,
-        help='Type of the related property.'
-    )
+    partner_id = fields.Many2one('res.partner', string='Partner', required=True, help='The partner who made this offer.')
+    property_id = fields.Many2one('estate.property', string='Property', required=True, help='The property this offer is related to.')
+    property_type_id = fields.Many2one(related='property_id.property_type_id', store=True, help='Type of the related property.')
 
     # -----------------------------
     # Compute / Inverse Methods
@@ -144,6 +114,8 @@ def action_confirm(self):
             record.property_id.selling_price = record.price
             record.property_id.buyer_id = record.partner_id
 
+        (self.property_id.offer_ids - record).write({'status': 'refused'})
+
     def action_refuse(self):
         """
         Refuse the offer by setting its status to 'refused'.
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
@@ -10,15 +10,8 @@ class EstatePropertyTag(models.Model):
     # -----------------------------
     # Fields
     # -----------------------------
-    name = fields.Char(
-        string='Property Tag',
-        required=True,
-        help='Name of the tag used to categorize or label properties.'
-    )
-    color = fields.Integer(
-        string='Color',
-        help='Color code used to visually distinguish this tag.'
-    )
+    name = fields.Char(string='Property Tag', required=True, help='Name of the tag used to categorize or label properties.')
+    color = fields.Integer(string='Color', help='Color code used to visually distinguish this tag.')
 
     # -----------------------------
     # SQL Constraints
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
@@ -10,33 +10,11 @@ class EstatePropertyType(models.Model):
     # -----------------------------
     # Fields
     # -----------------------------
-    name = fields.Char(
-        string='Property Type',
-        required=True,
-        help='Name of the property type (e.g., Apartment, House).'
-    )
-    property_ids = fields.One2many(
-        'estate.property',
-        'property_type_id',
-        string='Properties',
-        help='Properties categorized under this type.'
-    )
-    offer_ids = fields.One2many(
-        'estate.property.offer',
-        'property_type_id',
-        string='Offers',
-        help='Offers associated with properties of this type.'
-    )
-    sequence = fields.Integer(
-        string='Sequence',
-        default=10,
-        help='Used to order property types in lists and views.'
-    )
-    offer_count = fields.Integer(
-        string='Number of Offers',
-        compute='_compute_offer_count',
-        help='Total number of offers made on properties of this type.'
-    )
+    name = fields.Char(string='Property Type', required=True, help='Name of the property type (e.g., Apartment, House).')
+    property_ids = fields.One2many('estate.property', 'property_type_id', string='Properties', help='Properties categorized under this type.')
+    offer_ids = fields.One2many('estate.property.offer', 'property_type_id', string='Offers', help='Offers associated with properties of this type.')
+    sequence = fields.Integer(string='Sequence', default=10, help='Used to order property types in lists and views.')
+    offer_count = fields.Integer(string='Number of Offers', compute='_compute_offer_count', help='Total number of offers made on properties of this type.')
 
     # -----------------------------
     # SQL Constraints
diff --git a/estate/views/estate_property_offer_view.xml b/estate/views/estate_property_offer_view.xml
@@ -44,7 +44,7 @@
 
         <!-- Property Offer Actions -->
         <record id="estate_property_offer_action" model="ir.actions.act_window">
-            <field name="name">estate.property.offer.action</field>
+            <field name="name">Property Offers</field>
             <field name="res_model">estate.property.offer</field>
             <field name="view_mode">list,form</field>
         </record>
diff --git a/estate/views/estate_property_tag_view.xml b/estate/views/estate_property_tag_view.xml
@@ -40,7 +40,7 @@
 
         <!-- Property Tag Actions -->
         <record id="estate_property_tag_action" model="ir.actions.act_window">
-            <field name="name">estate.property.tag.action</field>
+            <field name="name">Property Tags</field>
             <field name="res_model">estate.property.tag</field>
             <field name="view_mode">list,form</field>
         </record>
diff --git a/estate/views/estate_property_type_view.xml b/estate/views/estate_property_type_view.xml
@@ -66,9 +66,9 @@
 
         <!-- Property Type Actions -->
         <record id="estate_property_type_action" model="ir.actions.act_window">
-            <field name="name">estate.property.type.action</field>
+            <field name="name">Properties Types</field>
             <field name="res_model">estate.property.type</field>
-            <field name="view_mode">form,list</field>
+            <field name="view_mode">list,form</field>
         </record>
     </data>
 </odoo>
diff --git a/estate/views/estate_property_view.xml b/estate/views/estate_property_view.xml
@@ -8,7 +8,7 @@
                 <kanban default_group_by="property_type_id" groups_draggable="1" records_draggable="1">
                         <field name="state" />
                     <templates>
-                        <t t-name="kanban-box">
+                        <t t-name="card">
                             <div>
                                 <h4>
                                     <field name="name" />
@@ -53,7 +53,6 @@
 
                     <!-- Optional fields (can be toggled in UI) -->
                     <field name="description" optional="hide" />
-                    <field name="date_availability" optional="hide" invisible="1" />
                     <field name="selling_price" optional="hide" />
                     <field name="bedrooms" optional="hide" />
                     <field name="living_area" optional="hide" />
@@ -100,11 +99,13 @@
                             type="object"
                             string="Sold"
                             class="btn-primary"
+                            confirm="Are you sure you want to sold this?"
                             invisible="state == 'sold' or state == 'cancelled'" />
 
                         <button name="action_cancel"
                             type="object"
                             string="Cancel"
+                            confirm="Are you sure you want to cancel it?"
                             invisible="state == 'sold' or state == 'cancelled'" />
 
 
@@ -185,7 +186,7 @@
 
         <!-- Estate Property Actions -->
         <record id="estate_property_action" model="ir.actions.act_window">
-            <field name="name">estate.property.action</field>
+            <field name="name">Properties</field>
             <field name="res_model">estate.property</field>
             <field name="view_mode">kanban,list,form</field>
             <field name="context">{'search_default_available_properties': 1}</field>
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
