[IMP] estate: Server101 WIP Chapter 11

VincentJanssen-Code · VincentJanssen-Code · commit 044f5d927b9d · 2025-12-16T13:17:22.000+01:00
[CLN] estate: code cleanup to match Ruff

[CLN] estate: Server101 Cleanup

[CLN] estate: Server101 Cleanup final
diff --git a/estate/__init__.py b/estate/__init__.py
@@ -1 +1 @@
-from . import models
+from . import models
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
@@ -1,19 +1,18 @@
-# -*- coding: utf-8 -*-
 {
-    'name':"estate",
-    'description':"test",
+    'name': "estate",
+    'description': "test",
     'depends': [
         'base_setup'
     ],
     'category': "Tutorials",
     'installable': True,
     'application': True,
-    'data':[
+    'data': [
         'views/estate_property_views.xml',
         'views/estate_property_type_views.xml',
         'views/estate_property_tag_views.xml',
         'views/estate_property_offer_views.xml',
         'views/estate_menu_views.xml',
         'security/ir.model.access.csv']
 
-}
+}
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
@@ -1,4 +1,4 @@
 from . import estate_property
 from . import estate_property_type
 from . import estate_property_tag
-from . import estate_property_offer
+from . import estate_property_offer
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
@@ -1,70 +1,70 @@
 from dateutil.relativedelta import relativedelta
-from odoo import fields, models,api,exceptions
-from odoo.tools.float_utils import float_compare, float_is_zero;
-from odoo.exceptions import ValidationError;
+from odoo import fields, models, api, exceptions
+from odoo.tools.float_utils import float_compare, float_is_zero
+from odoo.exceptions import ValidationError
 
 
 class EstateProperty(models.Model):
     _name = "estate.property"
     _description = "Property"
-    _positif_expected_price = models.Constraint("CHECK (expected_price > 0)","A price can't be negatif");
-    _positif_selling_price = models.Constraint("CHECK (selling_price > 0)","A price can't be negatif");
+    _order = "id desc"
 
-    state = fields.Selection(selection = [("New","New"), ("Offer_Received","Offer Received") ,("Offer_Accepted","Offer Accepted"), ("Sold","Sold"), ("Cancelled","Cancelled")])
-    active = fields.Boolean('Active',default=True)
-    name = fields.Char(required=True,default="Unkown")
+    _positif_expected_price = models.Constraint("CHECK (expected_price > 0)", "A price can't be negatif")
+    _positif_selling_price = models.Constraint("CHECK (selling_price > 0)", "A price can't be negatif")
+
+    state = fields.Selection(selection=[("New", "New"), ("Offer_Received", "Offer Received"), ("Offer_Accepted", "Offer Accepted"), ("Sold", "Sold"), ("Cancelled", "Cancelled")])
+    active = fields.Boolean('Active', default=True)
+    name = fields.Char(required=True, default="Unkown")
     description = fields.Text()
     postcode = fields.Char()
-    date_availability = fields.Date("Available From",copy=False,default= fields.Datetime.today() + relativedelta(months=3))
-    last_seen= fields.Date("Last Seen", default=fields.Datetime.now)
+    date_availability = fields.Date("Available From", copy=False, default=fields.Datetime.today() + relativedelta(months=3))
+    last_seen = fields.Date("Last Seen", default=fields.Datetime.now)
     expected_price = fields.Float(required=True)
-    selling_price = fields.Float(readonly=True,copy=False)
-    best_price = fields.Float(string="Best Price",compute="_get_best_price")
+    selling_price = fields.Float(readonly=True, copy=False)
+    best_price = fields.Float(string="Best Price", compute="_get_best_price")
     bedrooms = fields.Integer(default=2)
     living_area = fields.Integer()
     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')])
-    total_area = fields.Float(compute="_get_total_area",string="Total Area");
-    property_type_id = fields.Many2one("estate.property.type",string="Type")
-    buyer_id = fields.Many2one("res.partner",string="Buyer")
-    seller_id = fields.Many2one("res.users",default=lambda self : self.env.user,string="Seller")
-    tag_ids = fields.Many2many("estate.property.tag",string="Tags")
-    offer_ids = fields.One2many("estate.property.offer","property_id",string="Offers")
+    garden_orientation = fields.Selection(selection=[('North', 'North'), ('South', 'South'), ('East', 'East'), ('West', 'West')])
+    total_area = fields.Float(compute="_get_total_area", string="Total Area")
+    property_type_id = fields.Many2one("estate.property.type", string="Type")
+    buyer_id = fields.Many2one("res.partner", string="Buyer")
+    seller_id = fields.Many2one("res.users", default=lambda self: self.env.user, string="Seller")
+    tag_ids = fields.Many2many("estate.property.tag", string="Tags")
+    offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers")
 
     def sell_property(self):
         for record in self:
-            if(record.state == "Cancelled"):
+            if (record.state == "Cancelled"):
                 raise exceptions.UserError("Can't sell cancelled property.")
             record.state = "Sold"
             return True
-        
+
     def cancel_property(self):
         for record in self:
-            if(record.state == "Sold"):
+            if (record.state == "Sold"):
                 raise exceptions.UserError("Can't cancel sold property.")
             record.state = "Cancelled"
             return True
 
-    @api.depends('living_area','garden_area')
+    @api.depends('living_area', 'garden_area')
     def _get_total_area(self):
         for record in self:
-            record.total_area = record.garden_area + record.living_area;
-
+            record.total_area = record.garden_area + record.living_area
 
     @api.depends('offer_ids')
     def _get_best_price(self):
         for record in self:
-            max:int = 0
-
-            if(len(record.offer_ids)==0):
+            max: int = 0
+            if (len(record.offer_ids) == 0):
                 record.best_price = 0
                 continue
-        
+
             for offer in record.offer_ids:
-                if(offer.price >= max):
+                if (offer.price >= max):
                     max = offer.price
                 record.best_price = max
 
@@ -73,10 +73,10 @@ def _garden_pre_fill(self):
         self.garden_area = 10 if self.garden else 0
         self.garden_orientation = 'North' if self.garden else ''
 
-    @api.constrains('selling_price','expected_price')
+    @api.constrains('selling_price', 'expected_price')
     def _check_prices(self):
-            for record in self:
-                if float_is_zero(record.selling_price,2):
-                    return;
-                if(float_compare(record.selling_price,record.expected_price*.8,2) == -1):
-                    raise ValidationError(f"Selling price is too low {record.selling_price}");
+        for record in self:
+            if float_is_zero(record.selling_price, 2):
+                continue
+            if (float_compare(record.selling_price, record.expected_price * 0.8, 2) == -1):
+                raise ValidationError(f"Selling price is too low {record.selling_price}")
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
@@ -6,39 +6,38 @@
 class EstatePropertyOffer(models.Model):
     _name = "estate.property.offer"
     _description = "Property Offer"
-    _postif_price = models.Constraint("CHECK (price > 0)", "A price can't be negatif");
+    _order = "price desc"
+
+    _postif_price = models.Constraint("CHECK (price > 0)", "A price can't be negatif")
+
     price = fields.Float(string="Price")
-    status = fields.Selection(copy=False,selection = [("Accepted","Accepted"),("Refused","Refused")])
-    partner_id = fields.Many2one('res.partner',required=True)
+    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)
-    validity = fields.Integer(string="Validity Duration",default=7)
-    date_deadline = fields.Date(string="Deadline",compute="_get_date_deadline",inverse="_set_date_deadline")
+    validity = fields.Integer(string="Validity Duration", default=7)
+    date_deadline = fields.Date(string="Deadline", compute="_get_date_deadline", inverse="_set_date_deadline")
 
     def accept_offer(self):
         for record in self:
-            if(record.property_id.selling_price == 0):
-                record.status = "Accepted";
-                print(type(record.property_id.seller_id))
-                print(type(record.partner_id))
-                record.property_id.buyer_id = record.partner_id;
-                record.property_id.selling_price = record.price;
-        
-        return True;
-    
+            if (record.property_id.selling_price == 0):
+                record.status = "Accepted"
+                record.property_id.buyer_id = record.partner_id
+                record.property_id.selling_price = record.price
+        return True
+
     def refused_offer(self):
         for record in self:
-            record.status = "Refused";
-        return True;
-
+            record.status = "Refused"
+        return True
 
     @api.depends("validity")
     def _get_date_deadline(self):
         for record in self:
-            if(isinstance(record.create_date,bool)):
+            if (isinstance(record.create_date, bool)):
                 record.date_deadline = fields.Datetime.now() + relativedelta(days=record.validity)
                 return
             record.date_deadline = record.create_date + relativedelta(days=record.validity)
 
     def _set_date_deadline(self):
         for record in self:
-            record.validity = (datetime.combine(record.date_deadline,time()) - record.create_date).days
+            record.validity = (datetime.combine(record.date_deadline, time()) - record.create_date).days
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
@@ -4,5 +4,8 @@
 class EstatePropertyTag(models.Model):
     _name = "estate.property.tag"
     _description = "Property Tag"
-    _unique_tag = models.UniqueIndex("(name)","Tag name must be unique in database")
-    name = fields.Char(required=True, unique=True)
+    _order = "name asc"
+
+    _unique_tag = models.UniqueIndex("(name)", "Tag name must be unique in database")
+
+    name = fields.Char(required=True)
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
@@ -4,5 +4,10 @@
 class EstatePropertyType(models.Model):
     _name = "estate.property.type"
     _description = "Property Type"
+    _order = "sequence, name asc"
+
+    _unique_type = models.UniqueIndex("(name)", "Property type name must be unique in database")
+
     name = fields.Char(required=True)
-    _unique_type = models.UniqueIndex("(name)","Property type name must be unique in database")
+    property_ids = fields.One2many("estate.property", "property_type_id")
+    sequence = fields.Integer('Sequence', default=1, help="use to order the list inside the type view")
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
@@ -11,16 +11,34 @@
         <field name ="name">estate.property.type.form</field>
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
-            <form string="Property list">
+            <form string="Property type Form">
                 <sheet>
                     <group>
                         <h1 class="mb32">
                             <field name="name"/>
                         </h1>
                     </group>
+                    <field name="property_ids">
+                        <list>
+                            <field name="name"/>
+                            <field name="expected_price"/>
+                            <field name="state"/>
+                        </list>
+                    </field>
                 </sheet>
             </form>
         </field>
     </record>
 
+    <record id="estate_property_type_model_list" model="ir.ui.view">
+        <field name ="name">estate.property.type.list</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <list string="Property type list">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+            </list>
+        </field>
+    </record>
+    
 </odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
@@ -29,6 +29,7 @@
                 <header>
                     <button name="sell_property" type="object" string="Sell"/>
                     <button name="cancel_property" type="object" string="Cancel"/>
+                    <field name="state" widget="statusbar" statusbar_visible="New,Offer_Received,Offer_Accepted,Sold,Cancelled"/>
                 </header>
                 <sheet>
                     <group>
@@ -38,11 +39,11 @@
                     </group>
                     <group>
                         <field name="tag_ids" widget="many2many_tags"/>
-                        <field name="state"/>
+                        
                     </group>
                     <group>
                         <group>
-                            <field name="property_type_id"/>
+                            <field name="property_type_id" options="{'no_create_edit': true}"/>
                             <field name="postcode"/>
                             <field name="date_availability"/>
                         </group>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from . import models`
	`1`	`+from . import models`