From 24780a6ea0c310e141cdb12b8d113c2a50f3290d Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Mon, 19 May 2025 14:00:56 +0200
Subject: [PATCH 01/14] [ADD] Estate: Adding the new Real Estate Module's
 directory. In this PR, I initialized the basic structure of the new Estate
 module directory (manifest and init files). This work is related to the
 second chapter of the server framework 101 official documentation by Odoo.

---
 estate/__init__.py     |  0
 estate/__manifest__.py | 15 +++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 estate/__init__.py
 create mode 100644 estate/__manifest__.py

diff --git a/estate/__init__.py b/estate/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
new file mode 100644
index 00000000000..18b473b2c22
--- /dev/null
+++ b/estate/__manifest__.py
@@ -0,0 +1,15 @@
+{
+    'name': 'Estate',
+    'version': '1.0',
+    'category': 'Real Estate',
+    'sequence': 15,
+    'summary': 'Track Real Estate',
+    'description': "This app is made for real estate tracking.",
+    'website': 'https://www.odoo.com/page/estate',
+    'depends': [
+        'base'
+    ],
+    'installable': True,
+    'application': True,
+    'license': 'LGPL-3'
+}

From 4269025440912d288daddb9cf5df37ff04805429 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Mon, 19 May 2025 16:29:56 +0200
Subject: [PATCH 02/14] [ADD] Estate: Adding Estate Model. In this PR, I added
 the main structure of the Estate model in order to create the estate_property
 table. This work is related to the third chapter of the technical onboarding
 (Server framework 101) from Odoo.

---
 estate/__init__.py               |  1 +
 estate/models/__init__.py        |  1 +
 estate/models/estate_property.py | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 estate/models/__init__.py
 create mode 100644 estate/models/estate_property.py

diff --git a/estate/__init__.py b/estate/__init__.py
index e69de29bb2d..0650744f6bc 100644
--- a/estate/__init__.py
+++ b/estate/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
new file mode 100644
index 00000000000..5e1963c9d2f
--- /dev/null
+++ b/estate/models/__init__.py
@@ -0,0 +1 @@
+from . import estate_property
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
new file mode 100644
index 00000000000..bcabd1a367a
--- /dev/null
+++ b/estate/models/estate_property.py
@@ -0,0 +1,25 @@
+from odoo import models, fields
+
+
+class EstateModel(models.Model):
+    _name = "estate_property"
+    _description = "Real Estate"
+    _order = "sequence"
+
+    name = fields.Char('Name', required=True)
+    description = fields.Char('Description')
+    post_code = fields.Char('Post Code')
+    date_availability = fields.Date('Available From')
+    expected_price = fields.Float('Expected Price', required=True)
+    selling_price = fields.Float('Selling Price')
+    bedrooms = fields.Integer('Bedrooms Count')
+    living_area = fields.Float('Living Area size')
+    facades = fields.Integer('Number of facades')
+    garage = fields.Boolean('Has garage')
+    garden = fields.Boolean('Has garden')
+    garden_area = fields.Integer('Garden area')
+    garden_orientation = fields.Selection(
+        string='Garden Orientation',
+        selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
+        help="Garden orientation selection"
+    )

From 7f3c5785f63032102ab0f52c2218c931b67850a8 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Tue, 20 May 2025 09:09:06 +0200
Subject: [PATCH 03/14] [ADD] Estate: Adding security access csv file. In this
 PR, I added the security access csv file (ir.model.access.csv) for the new
 Estate Model inorder to remove the undesired warning: WARNING rd-demo
 odoo.modules.loading: The models ['estate.property'] have no access rules in
 module estate, consider adding some, like:
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink.
 This commit is related to the 4th chapter of the Server Framework 101 from
 Odoo's documentation.

---
 estate/__manifest__.py              | 3 +++
 estate/security/ir.model.access.csv | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 estate/security/ir.model.access.csv

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 18b473b2c22..eb59e79dd80 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -9,6 +9,9 @@
     'depends': [
         'base'
     ],
+    'data': [
+        'security/ir.model.access.csv',
+    ],
     'installable': True,
     'application': True,
     'license': 'LGPL-3'
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
new file mode 100644
index 00000000000..32389642d4f
--- /dev/null
+++ b/estate/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1

From 62e444343904a515f7b40234284a34d82ff38797 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Tue, 20 May 2025 10:37:01 +0200
Subject: [PATCH 04/14] [IMP] Estate: Adding estate property view and menus. In
 this commit, I added the estate property view and menus in order to start
 interacting with our new model using the UI. I also added two new attributes
 to the estate property model, which are active and state, and I set some
 attributes to have a default values and to not be copied when a duplication
 is created. This is related to the 5th chapter of the Server Framework 101
 Odoo's course.

---
 estate/__manifest__.py                 |  2 ++
 estate/models/estate_property.py       | 17 +++++++++++++----
 estate/views/estate_menus.xml          |  8 ++++++++
 estate/views/estate_property_views.xml |  8 ++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 estate/views/estate_menus.xml
 create mode 100644 estate/views/estate_property_views.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index eb59e79dd80..cd0087af1a4 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -11,6 +11,8 @@
     ],
     'data': [
         'security/ir.model.access.csv',
+        'views/estate_property_views.xml',
+        'views/estate_menus.xml'
     ],
     'installable': True,
     'application': True,
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index bcabd1a367a..d22b97641a6 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,18 +1,26 @@
 from odoo import models, fields
+from dateutil.relativedelta import relativedelta
 
 
 class EstateModel(models.Model):
     _name = "estate_property"
     _description = "Real Estate"
-    _order = "sequence"
 
     name = fields.Char('Name', required=True)
     description = fields.Char('Description')
     post_code = fields.Char('Post Code')
-    date_availability = fields.Date('Available From')
+    state = fields.Selection(
+        string="State",
+        selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')],
+        help="Estate current state",
+        required=True,
+        default='new',
+        copy=False
+    )
+    date_availability = fields.Date('Available From', copy=False, default=lambda self: fields.Date.today() + relativedelta(months=3))
     expected_price = fields.Float('Expected Price', required=True)
-    selling_price = fields.Float('Selling Price')
-    bedrooms = fields.Integer('Bedrooms Count')
+    selling_price = fields.Float('Selling Price', readonly=True, copy=False)
+    bedrooms = fields.Integer('Bedrooms Count', default=2)
     living_area = fields.Float('Living Area size')
     facades = fields.Integer('Number of facades')
     garage = fields.Boolean('Has garage')
@@ -23,3 +31,4 @@ class EstateModel(models.Model):
         selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
         help="Garden orientation selection"
     )
+    active = fields.Boolean('Is Active', default=True)
diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml
new file mode 100644
index 00000000000..338e1d54f78
--- /dev/null
+++ b/estate/views/estate_menus.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<odoo>
+    <menuitem id="estate_property_menu_root" name="Estate">
+        <menuitem id="estate_property_first_level_menu" name="Estates">
+            <menuitem id="estate_property_menu_action" action="model_estate_property_action"/>
+        </menuitem>
+    </menuitem>
+</odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
new file mode 100644
index 00000000000..f403335fd17
--- /dev/null
+++ b/estate/views/estate_property_views.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="model_estate_property_action" model="ir.actions.act_window">
+        <field name="name">Estate Action</field>
+        <field name="res_model">estate_property</field>
+        <field name="view_mode">list,form</field>
+    </record>
+</odoo>

From 830ba914d800ae0fa7dfe1cf2086ee1ec98a1cdf Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Tue, 20 May 2025 13:41:10 +0200
Subject: [PATCH 05/14] [IMP] Adding basic views for estate property view. In
 this commit, I added a customizable list view for the estate property view.
 Also, I added the search, filter and group by feature using specific
 attributes of the estate property. This part is based on the 6th chapter of
 Server Framework 101 Odoo's documentation.

---
 estate/views/estate_property_views.xml | 75 ++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index f403335fd17..8f8aae18596 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -1,5 +1,80 @@
 <?xml version="1.0"?>
 <odoo>
+    <record id="model_estate_property_search" model="ir.ui.view">
+        <field name="name">estate.property.search</field>
+        <field name="model">estate_property</field>
+        <field name="arch" type="xml">
+            <search string="Properties Search">
+                <field name="name" string="Property Name"/>
+                <field name="post_code" string="Post Code"/>
+                <field name="expected_price" string="Expected Price"/>
+                <field name="bedrooms" string="Bedrooms"/>
+                <field name="facades" string="Facades"/>
+                <separator/>
+                <filter name="availability" string="Availability" domain="[('date_availability', '&gt;', context_today())]"/>
+                <group expand="1" string="Group By">
+                    <filter name="post_code" string="Post Code" context="{'group_by':'post_code'}"/>
+                </group> 
+            </search>
+        </field>
+    </record>
+
+    <record id="model_estate_property_form" model="ir.ui.view">
+        <field name="name">estate.property.form</field>
+        <field name="model">estate_property</field>
+        <field name="arch" type="xml">
+            <form string="Property Form">
+                <sheet>
+                    <div>
+                        <h1>
+                            <field name="name" string="Title"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="post_code" string="Post Code"/>
+                            <field name="date_availability" string="Available From"/>
+                        </group>
+                        <group>
+                            <field name="expected_price" string="Expected Price"/>
+                            <field name="selling_price" string="Selling Price"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Description">
+                            <group>
+                                <field name="description" string="Description"/>
+                                <field name="bedrooms" string="Bedrooms"/>
+                                <field name="living_area" string="Living Area (sqm)"/>
+                                <field name="facades" string="Facades"/>
+                                <field name="garage" string="Garage"/>
+                                <field name="garden" string="Garden"/>
+                                <field name="garden_area" string="Garden Area (sqm)"/>
+                                <field name="garden_orientation" string="Garden Orientation"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="model_estate_property_list" model="ir.ui.view">
+        <field name="name">estate.property.list</field>
+        <field name="model">estate_property</field>
+        <field name="arch" type="xml">
+            <list string="Properties">
+                <field name="name" string="Title"/>
+                <field name="post_code" string="Postcode"/>
+                <field name="bedrooms" string="Bedrooms"/>
+                <field name="living_area" string="Living Area (sqm)"/>
+                <field name="expected_price" string="Expected Price"/>
+                <field name="selling_price" string="Selling Price"/>
+                <field name="date_availability" string="Available From"/>
+            </list>
+        </field>
+    </record>
+
     <record id="model_estate_property_action" model="ir.actions.act_window">
         <field name="name">Estate Action</field>
         <field name="res_model">estate_property</field>

From 64b95a0f651d800412ca40cd536f473d4715f4e5 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Tue, 20 May 2025 17:09:26 +0200
Subject: [PATCH 06/14] [IMP] Estate: Adding Estate Relationships with Offers,
 types and tags. In this commit, I added the needed relationships between
 types, tags and offers using Many2one, Many2many and One2many. I also added
 the needed views, forms and actions (only for tags and types). I added a new
 notebook page within the estate property view model to display and edit the
 list of offers. This commit is related to the 7th chapter of Server Framework
 101 in Odoo's documentation.

---
 estate/__manifest__.py                       |  3 ++
 estate/models/__init__.py                    |  3 ++
 estate/models/estate_property.py             |  9 +++-
 estate/models/estate_property_offer.py       | 15 ++++++
 estate/models/estate_property_tag.py         |  8 ++++
 estate/models/estate_property_type.py        |  8 ++++
 estate/security/ir.model.access.csv          |  3 ++
 estate/views/estate_menus.xml                |  4 +-
 estate/views/estate_property_offer_views.xml | 48 ++++++++++++++++++++
 estate/views/estate_property_tag_views.xml   | 42 +++++++++++++++++
 estate/views/estate_property_type_views.xml  | 42 +++++++++++++++++
 estate/views/estate_property_views.xml       | 40 ++++++++++++----
 12 files changed, 212 insertions(+), 13 deletions(-)
 create mode 100644 estate/models/estate_property_offer.py
 create mode 100644 estate/models/estate_property_tag.py
 create mode 100644 estate/models/estate_property_type.py
 create mode 100644 estate/views/estate_property_offer_views.xml
 create mode 100644 estate/views/estate_property_tag_views.xml
 create mode 100644 estate/views/estate_property_type_views.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index cd0087af1a4..8caf9c92d35 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -11,6 +11,9 @@
     ],
     'data': [
         'security/ir.model.access.csv',
+        'views/estate_property_tag_views.xml',
+        'views/estate_property_offer_views.xml',
+        'views/estate_property_type_views.xml',
         'views/estate_property_views.xml',
         'views/estate_menus.xml'
     ],
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index 5e1963c9d2f..2f1821a39c1 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -1 +1,4 @@
 from . import estate_property
+from . import estate_property_type
+from . import estate_property_tag
+from . import estate_property_offer
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index d22b97641a6..2eef6a52081 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -2,8 +2,8 @@
 from dateutil.relativedelta import relativedelta
 
 
-class EstateModel(models.Model):
-    _name = "estate_property"
+class EstateProperty(models.Model):
+    _name = "estate.property"
     _description = "Real Estate"
 
     name = fields.Char('Name', required=True)
@@ -32,3 +32,8 @@ class EstateModel(models.Model):
         help="Garden orientation selection"
     )
     active = fields.Boolean('Is Active', default=True)
+    property_type_id = fields.Many2one('estate.property.type', string='Property Type')
+    buyer_id = fields.Many2one('res.partner', 'Buyer', copy=False)
+    salesperson_id = fields.Many2one('res.users', 'Salesperson', index=True, default=lambda self: self.env.user)
+    tag_ids = fields.Many2many('estate.property.tag', string='Tags')
+    offer_ids = fields.One2many('estate.property.offer', 'property_id', string='Offers')
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
new file mode 100644
index 00000000000..7049166136b
--- /dev/null
+++ b/estate/models/estate_property_offer.py
@@ -0,0 +1,15 @@
+from odoo import models, fields
+
+
+class EstatePropertyOffer(models.Model):
+    _name = "estate.property.offer"
+    _description = "Estate Property Offer"
+
+    price = fields.Float(string="Price")
+    status = fields.Selection(
+        string="Status",
+        selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
+        copy=False
+    )
+    partner_id = fields.Many2one('res.partner', required=True, string="Partner")
+    property_id = fields.Many2one('estate.property', required=True, string="Property")
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
new file mode 100644
index 00000000000..5a39d04c914
--- /dev/null
+++ b/estate/models/estate_property_tag.py
@@ -0,0 +1,8 @@
+from odoo import models, fields
+
+
+class EstatePropertyTag(models.Model):
+    _name = 'estate.property.tag'
+    _description = 'Estate Property Tags'
+
+    name = fields.Char(string='Name', required=True)
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
new file mode 100644
index 00000000000..b08647d76bc
--- /dev/null
+++ b/estate/models/estate_property_type.py
@@ -0,0 +1,8 @@
+from odoo import models, fields
+
+
+class EstatePropertyType(models.Model):
+    _name = "estate.property.type"
+    _description = "Estate Property Type"
+
+    name = fields.Char(string="Property Type", required=True)
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index 32389642d4f..89f97c50842 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -1,2 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1
+access_estate_property_type,access_estate_property_type,model_estate_property_type,base.group_user,1,1,1,1
+access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,base.group_user,1,1,1,1
+access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,base.group_user,1,1,1,1
diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml
index 338e1d54f78..8c07cc02118 100644
--- a/estate/views/estate_menus.xml
+++ b/estate/views/estate_menus.xml
@@ -2,7 +2,9 @@
 <odoo>
     <menuitem id="estate_property_menu_root" name="Estate">
         <menuitem id="estate_property_first_level_menu" name="Estates">
-            <menuitem id="estate_property_menu_action" action="model_estate_property_action"/>
+            <menuitem id="estate_property_menu_action" action="estate_property_action"/>
+            <menuitem id="estate_property_type_menu_action" action="estate_property_type_action"/>
+            <menuitem id="estate_property_tag_menu_action" action="estate_property_tag_action"/>
         </menuitem>
     </menuitem>
 </odoo>
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
new file mode 100644
index 00000000000..454af2677d2
--- /dev/null
+++ b/estate/views/estate_property_offer_views.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="estate_property_offer_view_search" model="ir.ui.view">
+        <field name="name">estate.property.offer.search</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <search string="Property offer Search">
+                <field name="partner_id" string="Partner"/>
+                <field name="property_id" string="Property"/>
+                <field name="price" string="Price"/>
+                <separator/>
+                <group expand="1" string="Group By">
+                    <filter name="status" string="Status" context="{'group_by':'status'}"/>
+                </group> 
+            </search>
+        </field>
+    </record>
+
+    <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">
+            <form string="Property tag Form">
+                <sheet>
+                    <group>
+                        <field name="price" string="Price"/>
+                        <field name="status" string="Status"/>
+                        <field name="partner_id" string="Partner"/>
+                        <field name="property_id" string="Property"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <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">
+            <list string="Tags">
+                <field name="price" string="Price"/>
+                <field name="status" string="Status"/>
+                <field name="partner_id" string="Partner"/>
+                <field name="property_id" string="Property"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
new file mode 100644
index 00000000000..f6e81a725a5
--- /dev/null
+++ b/estate/views/estate_property_tag_views.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="estate_property_tag_view_search" model="ir.ui.view">
+        <field name="name">estate.property.tag.search</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <search string="Property tags Search">
+                <field name="name" string="Tag Name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="estate_property_tag_view_form" model="ir.ui.view">
+        <field name="name">estate.property.tag.form</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <form string="Property tag Form">
+                <sheet>
+                    <group>
+                        <field name="name" string="Name"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <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">
+            <list string="Tags">
+                <field name="name" string="Name"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="estate_property_tag_action" model="ir.actions.act_window">
+        <field name="name">Property tag Action</field>
+        <field name="res_model">estate.property.tag</field>
+        <field name="view_mode">list,form</field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
new file mode 100644
index 00000000000..d5eae1bc78e
--- /dev/null
+++ b/estate/views/estate_property_type_views.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="estate_property_type_view_search" model="ir.ui.view">
+        <field name="name">estate.property.type.search</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <search string="Property types Search">
+                <field name="name" string="Type Name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="estate_property_type_view_form" model="ir.ui.view">
+        <field name="name">estate.property.type.form</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <form string="Property type Form">
+                <sheet>
+                    <group>
+                        <field name="name" string="Name"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="estate_property_type_view_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 Types">
+                <field name="name" string="Name"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="estate_property_type_action" model="ir.actions.act_window">
+        <field name="name">Property Type Action</field>
+        <field name="res_model">estate.property.type</field>
+        <field name="view_mode">list,form</field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 8f8aae18596..37442994997 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <odoo>
-    <record id="model_estate_property_search" model="ir.ui.view">
+    <record id="estate_property_view_search" model="ir.ui.view">
         <field name="name">estate.property.search</field>
-        <field name="model">estate_property</field>
+        <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <search string="Properties Search">
+                <field name="property_type_id" string="Property Type"/>
                 <field name="name" string="Property Name"/>
                 <field name="post_code" string="Post Code"/>
                 <field name="expected_price" string="Expected Price"/>
@@ -12,16 +13,17 @@
                 <field name="facades" string="Facades"/>
                 <separator/>
                 <filter name="availability" string="Availability" domain="[('date_availability', '&gt;', context_today())]"/>
-                <group expand="1" string="Group By">
+                <group expand="2" string="Group By">
                     <filter name="post_code" string="Post Code" context="{'group_by':'post_code'}"/>
+                    <filter name="property_type_id" string="Property Type" context="{'group_by':'property_type_id'}"/>
                 </group> 
             </search>
         </field>
     </record>
 
-    <record id="model_estate_property_form" model="ir.ui.view">
+    <record id="estate_property_view_form" model="ir.ui.view">
         <field name="name">estate.property.form</field>
-        <field name="model">estate_property</field>
+        <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <form string="Property Form">
                 <sheet>
@@ -30,8 +32,10 @@
                             <field name="name" string="Title"/>
                         </h1>
                     </div>
+                    <field name="tag_ids" widget="many2many_tags"/>
                     <group>
                         <group>
+                            <field name="property_type_id" string="Property Type"/>
                             <field name="post_code" string="Post Code"/>
                             <field name="date_availability" string="Available From"/>
                         </group>
@@ -53,15 +57,30 @@
                                 <field name="garden_orientation" string="Garden Orientation"/>
                             </group>
                         </page>
+                        <page string="Offers">
+                            <field name="offer_ids" editable="bottom">
+                                <list editable="bottom">
+                                    <field name="price"/>
+                                    <field name="partner_id"/>
+                                    <field name="status"/>
+                                </list>
+                            </field>
+                        </page>                     
+                        <page string="Other Info">
+                            <group>
+                                <field name="buyer_id" string="Buyer"/>
+                                <field name="salesperson_id" string="Salesperson"/>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
         </field>
     </record>
 
-    <record id="model_estate_property_list" model="ir.ui.view">
+    <record id="estate_property_view_list" model="ir.ui.view">
         <field name="name">estate.property.list</field>
-        <field name="model">estate_property</field>
+        <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <list string="Properties">
                 <field name="name" string="Title"/>
@@ -71,13 +90,14 @@
                 <field name="expected_price" string="Expected Price"/>
                 <field name="selling_price" string="Selling Price"/>
                 <field name="date_availability" string="Available From"/>
+                <field name="property_type_id" string="Property Type"/>
             </list>
         </field>
     </record>
 
-    <record id="model_estate_property_action" model="ir.actions.act_window">
-        <field name="name">Estate Action</field>
-        <field name="res_model">estate_property</field>
+    <record id="estate_property_action" model="ir.actions.act_window">
+        <field name="name">Properties</field>
+        <field name="res_model">estate.property</field>
         <field name="view_mode">list,form</field>
     </record>
 </odoo>

From 190a7c2efd7a9d3ed479da38d6f6f57b8e33d3c4 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Wed, 21 May 2025 10:24:42 +0200
Subject: [PATCH 07/14] [IMP] Estate: Adding computed fields to estate property
 model. In this commit, I added the following computed fields: - Estate
 Property: best_price and total_area - Estate Offer: validaty and
 date_deadline Also, I introduced the onchange method to set default values of
 the garden area and garden orientation when the garden attribute is set to
 True. This commit is related to the 8th chapter of Server Framework 101
 Odoo's official documentation.

---
 estate/models/estate_property.py       | 22 ++++++++++++++++++++--
 estate/models/estate_property_offer.py | 16 +++++++++++++++-
 estate/views/estate_property_views.xml |  4 ++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 2eef6a52081..24bfc172b01 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,5 +1,5 @@
-from odoo import models, fields
 from dateutil.relativedelta import relativedelta
+from odoo import api, fields, models
 
 
 class EstateProperty(models.Model):
@@ -20,20 +20,38 @@ class EstateProperty(models.Model):
     date_availability = fields.Date('Available From', copy=False, default=lambda self: fields.Date.today() + relativedelta(months=3))
     expected_price = fields.Float('Expected Price', required=True)
     selling_price = fields.Float('Selling Price', readonly=True, copy=False)
+    best_price = fields.Float('Best Price', compute='_compute_best_price')
     bedrooms = fields.Integer('Bedrooms Count', default=2)
     living_area = fields.Float('Living Area size')
     facades = fields.Integer('Number of facades')
     garage = fields.Boolean('Has garage')
     garden = fields.Boolean('Has garden')
-    garden_area = fields.Integer('Garden area')
+    garden_area = fields.Float('Garden area')
     garden_orientation = fields.Selection(
         string='Garden Orientation',
         selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
         help="Garden orientation selection"
     )
+    total_area = fields.Float('Total Area', compute='_compute_total_area')
     active = fields.Boolean('Is Active', default=True)
     property_type_id = fields.Many2one('estate.property.type', string='Property Type')
     buyer_id = fields.Many2one('res.partner', 'Buyer', copy=False)
     salesperson_id = fields.Many2one('res.users', 'Salesperson', index=True, default=lambda self: self.env.user)
     tag_ids = fields.Many2many('estate.property.tag', string='Tags')
     offer_ids = fields.One2many('estate.property.offer', 'property_id', string='Offers')
+
+    @api.depends('living_area', 'garden_area')
+    def _compute_total_area(self):
+        for record in self:
+            record.total_area = record.living_area + record.garden_area
+
+    @api.depends('offer_ids.price')
+    def _compute_best_price(self):
+        for record in self:
+            prices = record.offer_ids.mapped('price')
+            record.best_price = max(prices) if prices else 0
+
+    @api.onchange('garden')
+    def _onchange_garden_checkbox(self):
+        self.garden_area = 10 if self.garden else 0
+        self.garden_orientation = 'north' if self.garden else None
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 7049166136b..8c625e0bc8c 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -1,4 +1,5 @@
-from odoo import models, fields
+from odoo import models, fields, api
+from datetime import timedelta
 
 
 class EstatePropertyOffer(models.Model):
@@ -11,5 +12,18 @@ class EstatePropertyOffer(models.Model):
         selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
         copy=False
     )
+    validity = fields.Integer(string="Validity (days)", default=7)
+    date_deadline = fields.Date(string="Deadline", compute="_compute_date_deadline", inverse="_inverse_date_deadline", store=True)
     partner_id = fields.Many2one('res.partner', required=True, string="Partner")
     property_id = fields.Many2one('estate.property', required=True, string="Property")
+
+    @api.depends('create_date', 'validity')
+    def _compute_date_deadline(self):
+        for offer in self:
+            create_date = offer.create_date or fields.Datetime.now()
+            offer.date_deadline = create_date.date() + timedelta(days=offer.validity)
+
+    def _inverse_date_deadline(self):
+        for offer in self:
+            create_date = offer.create_date or fields.Datetime.now()
+            offer.validity = (offer.date_deadline - create_date.date()).days if offer.date_deadline else 0
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 37442994997..3aa8c06b22a 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -40,6 +40,7 @@
                             <field name="date_availability" string="Available From"/>
                         </group>
                         <group>
+                            <field name="best_price" string="Best Price"/>
                             <field name="expected_price" string="Expected Price"/>
                             <field name="selling_price" string="Selling Price"/>
                         </group>
@@ -55,12 +56,15 @@
                                 <field name="garden" string="Garden"/>
                                 <field name="garden_area" string="Garden Area (sqm)"/>
                                 <field name="garden_orientation" string="Garden Orientation"/>
+                                <field name="total_area" string="Total Area"/>
                             </group>
                         </page>
                         <page string="Offers">
                             <field name="offer_ids" editable="bottom">
                                 <list editable="bottom">
                                     <field name="price"/>
+                                    <field name="validity"/>
+                                    <field name="date_deadline"/>
                                     <field name="partner_id"/>
                                     <field name="status"/>
                                 </list>

From 8ce976bea69ac5f7810f533189ca1c45d0cf77d5 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Wed, 21 May 2025 13:26:24 +0200
Subject: [PATCH 08/14] [IMP] Estate: Adding button actions for estate. In this
 commit, I added buttons to the estate form view in order to set an estate as
 sold or canceled. Also, I did the same thing within the offer line, to accept
 or reject offers. This work is related to the 9th chapter of Server Framework
 101 from Odoo's documentation.

---
 estate/models/estate_property.py       | 22 +++++++++++++++++++
 estate/models/estate_property_offer.py | 30 +++++++++++++++++++++++++-
 estate/views/estate_property_views.xml |  7 ++++++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 24bfc172b01..c2a4ea4751c 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,5 +1,6 @@
 from dateutil.relativedelta import relativedelta
 from odoo import api, fields, models
+from odoo.exceptions import UserError
 
 
 class EstateProperty(models.Model):
@@ -55,3 +56,24 @@ def _compute_best_price(self):
     def _onchange_garden_checkbox(self):
         self.garden_area = 10 if self.garden else 0
         self.garden_orientation = 'north' if self.garden else None
+
+    def action_set_sold(self):
+        for record in self:
+            if (record.state == 'sold'):
+                raise UserError('Property Already Sold')
+            if record.state != 'canceled':
+                record.active = False
+                record.state = 'sold'
+            else:
+                raise UserError("Cannot sell a canceled property")
+        return True
+
+    def action_set_cancel(self):
+        for record in self:
+            if record.state == 'sold':
+                raise UserError('Cannot cancel a sold property')
+            if (record.state == 'canceled'):
+                raise UserError("Property Already canceled")
+            record.active = False
+            record.state = 'canceled'
+        return True
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 8c625e0bc8c..b68959b65ba 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -1,6 +1,8 @@
-from odoo import models, fields, api
 from datetime import timedelta
 
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+
 
 class EstatePropertyOffer(models.Model):
     _name = "estate.property.offer"
@@ -27,3 +29,29 @@ def _inverse_date_deadline(self):
         for offer in self:
             create_date = offer.create_date or fields.Datetime.now()
             offer.validity = (offer.date_deadline - create_date.date()).days if offer.date_deadline else 0
+
+    def action_set_accept(self):
+        for record in self:
+            if (record.property_id.state in ('offer accepted', 'sold')):
+                raise UserError('An offer already accepted for this property')
+            if (record.property_id.state == 'canceled'):
+                raise UserError('Property canceled')
+            if (record.status in ('refused', 'accepted')):
+                raise UserError('Offer already accepted/refused')
+
+            record.property_id.selling_price = record.price
+            record.property_id.state = 'offer accepted'
+            record.property_id.buyer_id = record.partner_id
+            record.status = 'accepted'
+        return True
+
+    def action_set_refuse(self):
+        for record in self:
+            if (record.property_id.state in ('offer accepted', 'sold')):
+                raise UserError('An offer already accepted for this property')
+            if (record.property_id.state == 'canceled'):
+                raise UserError('Property canceled')
+            if (record.status in ('accepted', 'refused')):
+                raise UserError('Offer already accepted/refused')
+            record.status = 'refused'
+        return True
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 3aa8c06b22a..e984fa3ee74 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -27,6 +27,10 @@
         <field name="arch" type="xml">
             <form string="Property Form">
                 <sheet>
+                    <div>
+                        <button name="action_set_sold" type="object" string="Sold" class="btn-primary me-2"/>
+                        <button name="action_set_cancel" type="object" string="Cancel" class="btn-secondary"/>
+                    </div>
                     <div>
                         <h1>
                             <field name="name" string="Title"/>
@@ -40,6 +44,7 @@
                             <field name="date_availability" string="Available From"/>
                         </group>
                         <group>
+                            <field name="state" string="State"/>
                             <field name="best_price" string="Best Price"/>
                             <field name="expected_price" string="Expected Price"/>
                             <field name="selling_price" string="Selling Price"/>
@@ -66,6 +71,8 @@
                                     <field name="validity"/>
                                     <field name="date_deadline"/>
                                     <field name="partner_id"/>
+                                    <button name="action_set_accept" type="object" icon="fa-check" title="accept"/>
+                                    <button name="action_set_refuse" type="object" icon="fa-times" title="refuse"/>
                                     <field name="status"/>
                                 </list>
                             </field>

From bb3b38e002e0fc587a1af4b500e8d58bf3f41c50 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Wed, 21 May 2025 14:39:09 +0200
Subject: [PATCH 09/14] [IMP] Estate: Adding SQL and Python constraints to
 estate related models. In this commit, I added the sql and python constraints
 for the prices of the estate and the offers. This commit is related to the
 10th chapter of the Server Framework 101 Odoo's documentation.

---
 estate/models/estate_property.py       | 21 +++++++++++++++++----
 estate/models/estate_property_offer.py |  4 ++++
 estate/models/estate_property_tag.py   |  5 ++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index c2a4ea4751c..9461aca8aef 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,11 +1,16 @@
 from dateutil.relativedelta import relativedelta
 from odoo import api, fields, models
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools.float_utils import float_compare, float_is_zero
 
 
 class EstateProperty(models.Model):
     _name = "estate.property"
     _description = "Real Estate"
+    _sql_constraints = [
+        ('check_expected_price', 'CHECK(expected_price > 0)', 'Expected price must be strictly positve'),
+        ('check_selling_price', 'CHECK(selling_price >= 0)', 'Selling price must be positive')
+    ]
 
     name = fields.Char('Name', required=True)
     description = fields.Char('Description')
@@ -41,7 +46,8 @@ class EstateProperty(models.Model):
     tag_ids = fields.Many2many('estate.property.tag', string='Tags')
     offer_ids = fields.One2many('estate.property.offer', 'property_id', string='Offers')
 
-    @api.depends('living_area', 'garden_area')
+
+    @api.depends('living_area','garden_area')
     def _compute_total_area(self):
         for record in self:
             record.total_area = record.living_area + record.garden_area
@@ -57,12 +63,20 @@ def _onchange_garden_checkbox(self):
         self.garden_area = 10 if self.garden else 0
         self.garden_orientation = 'north' if self.garden else None
 
+    @api.constrains('selling_price','expected_price')
+    def _check_selling_price(self):
+        for record in self:
+            if float_is_zero(record.selling_price, precision_digits=2):
+                continue
+
+            if float_compare(record.selling_price, record.expected_price * 0.9, precision_digits=2) < 0:
+                raise ValidationError("Selling price cannot be lower than 90% of the expected price.")
+
     def action_set_sold(self):
         for record in self:
             if (record.state == 'sold'):
                 raise UserError('Property Already Sold')
             if record.state != 'canceled':
-                record.active = False
                 record.state = 'sold'
             else:
                 raise UserError("Cannot sell a canceled property")
@@ -74,6 +88,5 @@ def action_set_cancel(self):
                 raise UserError('Cannot cancel a sold property')
             if (record.state == 'canceled'):
                 raise UserError("Property Already canceled")
-            record.active = False
             record.state = 'canceled'
         return True
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index b68959b65ba..59a2c254086 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -7,6 +7,9 @@
 class EstatePropertyOffer(models.Model):
     _name = "estate.property.offer"
     _description = "Estate Property Offer"
+    _sql_constraints = [
+        ('check_offer_price', 'CHECK(price >= 0)', 'Offer price must be strictly positive')
+    ]
 
     price = fields.Float(string="Price")
     status = fields.Selection(
@@ -19,6 +22,7 @@ class EstatePropertyOffer(models.Model):
     partner_id = fields.Many2one('res.partner', required=True, string="Partner")
     property_id = fields.Many2one('estate.property', required=True, string="Property")
 
+
     @api.depends('create_date', 'validity')
     def _compute_date_deadline(self):
         for offer in self:
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index 5a39d04c914..d91b740aa42 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -1,8 +1,11 @@
-from odoo import models, fields
+from odoo import fields, models
 
 
 class EstatePropertyTag(models.Model):
     _name = 'estate.property.tag'
     _description = 'Estate Property Tags'
+    _sql_constraints = [
+        ('check_name_unique', 'UNIQUE(name)', "Tag name must be unique")
+    ]
 
     name = fields.Char(string='Name', required=True)

From 5782795df800dd6dc3820da8948ecf66cef374cf Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Thu, 22 May 2025 10:40:28 +0200
Subject: [PATCH 10/14] [IMP] Estate: Improving UI with customizations. In this
 commit, I improved the UI to adapt it to the business needs of the estate
 module. I added decorations based on conditions, status bar widget, managing
 orders display in the list, manual ordering, and a stat button for related
 fields. This commit is related to the 11th chapter of Server Framework 101
 from Odoo's official documentation.

---
 estate/models/estate_property.py             |  6 ++--
 estate/models/estate_property_offer.py       |  3 +-
 estate/models/estate_property_tag.py         |  2 ++
 estate/models/estate_property_type.py        | 17 ++++++---
 estate/views/estate_property_offer_views.xml | 11 +++++-
 estate/views/estate_property_tag_views.xml   |  2 +-
 estate/views/estate_property_type_views.xml  | 25 ++++++++++++-
 estate/views/estate_property_views.xml       | 37 +++++++++++---------
 8 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 9461aca8aef..337cff2d92a 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -11,6 +11,7 @@ class EstateProperty(models.Model):
         ('check_expected_price', 'CHECK(expected_price > 0)', 'Expected price must be strictly positve'),
         ('check_selling_price', 'CHECK(selling_price >= 0)', 'Selling price must be positive')
     ]
+    _order = 'id desc'
 
     name = fields.Char('Name', required=True)
     description = fields.Char('Description')
@@ -46,8 +47,7 @@ class EstateProperty(models.Model):
     tag_ids = fields.Many2many('estate.property.tag', string='Tags')
     offer_ids = fields.One2many('estate.property.offer', 'property_id', string='Offers')
 
-
-    @api.depends('living_area','garden_area')
+    @api.depends('living_area', 'garden_area')
     def _compute_total_area(self):
         for record in self:
             record.total_area = record.living_area + record.garden_area
@@ -63,7 +63,7 @@ def _onchange_garden_checkbox(self):
         self.garden_area = 10 if self.garden else 0
         self.garden_orientation = 'north' if self.garden else None
 
-    @api.constrains('selling_price','expected_price')
+    @api.constrains('selling_price', 'expected_price')
     def _check_selling_price(self):
         for record in self:
             if float_is_zero(record.selling_price, precision_digits=2):
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 59a2c254086..ac3772e5671 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -10,6 +10,7 @@ class EstatePropertyOffer(models.Model):
     _sql_constraints = [
         ('check_offer_price', 'CHECK(price >= 0)', 'Offer price must be strictly positive')
     ]
+    _order = 'price desc'
 
     price = fields.Float(string="Price")
     status = fields.Selection(
@@ -21,7 +22,7 @@ class EstatePropertyOffer(models.Model):
     date_deadline = fields.Date(string="Deadline", compute="_compute_date_deadline", inverse="_inverse_date_deadline", store=True)
     partner_id = fields.Many2one('res.partner', required=True, string="Partner")
     property_id = fields.Many2one('estate.property', required=True, string="Property")
-
+    property_type_id = fields.Many2one(related='property_id.property_type_id', store=True, string='Property Type')
 
     @api.depends('create_date', 'validity')
     def _compute_date_deadline(self):
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index d91b740aa42..3ade3e1271b 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -7,5 +7,7 @@ class EstatePropertyTag(models.Model):
     _sql_constraints = [
         ('check_name_unique', 'UNIQUE(name)', "Tag name must be unique")
     ]
+    _order = 'name'
 
     name = fields.Char(string='Name', required=True)
+    color = fields.Integer('Color')
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index b08647d76bc..8d646d6106a 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -1,8 +1,17 @@
-from odoo import models, fields
+from odoo import fields, models
 
 
 class EstatePropertyType(models.Model):
-    _name = "estate.property.type"
-    _description = "Estate Property Type"
+    _name = 'estate.property.type'
+    _description = 'Estate Property Type'
+    _order = 'name'
 
-    name = fields.Char(string="Property Type", required=True)
+    name = fields.Char(string='Property Type', required=True)
+    sequence = fields.Integer('Sequence', default=1, help='Used to order offer types. Lower is better.')
+    property_ids = fields.One2many('estate.property', 'property_type_id', string='Properties')
+    offer_ids = fields.One2many('estate.property.offer', 'property_type_id', string='Properties offers')
+    offer_count = fields.Integer(compute='_compute_offer_count', string='Offers Count')
+
+    def _compute_offer_count(self):
+        for record in self:
+            record.offer_count = len(record.offer_ids)
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
index 454af2677d2..d2dc0bd4c1a 100644
--- a/estate/views/estate_property_offer_views.xml
+++ b/estate/views/estate_property_offer_views.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0"?>
 <odoo>
+    <record id="action_estate_property_offer" model="ir.actions.act_window">
+        <field name="name">Offers</field>
+        <field name="res_model">estate.property.offer</field>
+        <field name="view_mode">list,form</field>
+        <field name="domain">[('property_type_id', '=', active_id)]</field>
+    </record>
+
     <record id="estate_property_offer_view_search" model="ir.ui.view">
         <field name="name">estate.property.offer.search</field>
         <field name="model">estate.property.offer</field>
@@ -37,9 +44,11 @@
         <field name="name">estate.property.offer.list</field>
         <field name="model">estate.property.offer</field>
         <field name="arch" type="xml">
-            <list string="Tags">
+            <list string="Tags" editable="bottom">
                 <field name="price" string="Price"/>
                 <field name="status" string="Status"/>
+                <field name="validity" string="Validity"/>
+                <field name="date_deadline" string="Date deadline"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="property_id" string="Property"/>
             </list>
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
index f6e81a725a5..38b2e193fc4 100644
--- a/estate/views/estate_property_tag_views.xml
+++ b/estate/views/estate_property_tag_views.xml
@@ -28,7 +28,7 @@
         <field name="name">estate.property.tag.list</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">
-            <list string="Tags">
+            <list string="Tags" editable="top">
                 <field name="name" string="Name"/>
             </list>
         </field>
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
index d5eae1bc78e..ef40fd98992 100644
--- a/estate/views/estate_property_type_views.xml
+++ b/estate/views/estate_property_type_views.xml
@@ -15,10 +15,32 @@
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
             <form string="Property type Form">
+                <header>
+                    <button type="action"
+                            name="%(estate.action_estate_property_offer)d"
+                            string="Offers"
+                            icon="fa-envelope"
+                            context="{'search_default_property_type_id': 1}"
+                            domain="[('property_type_id', '=', active_id)]"
+                            class="oe_stat_button"/>
+                </header>
                 <sheet>
                     <group>
-                        <field name="name" string="Name"/>
+                        <h1>
+                            <field name="name" string="Name"/>
+                        </h1>
                     </group>
+                    <notebook>
+                        <page string="Properties">
+                            <field name="property_ids">
+                                <list>
+                                    <field name="name" string="Name"/>
+                                    <field name="expected_price" string="Expected Price"/>
+                                    <field name="state" string="State"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
@@ -29,6 +51,7 @@
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
             <list string="Property Types">
+                <field name="sequence" widget="handle"/>
                 <field name="name" string="Name"/>
             </list>
         </field>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index e984fa3ee74..3e6e1f7bc4a 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -11,6 +11,7 @@
                 <field name="expected_price" string="Expected Price"/>
                 <field name="bedrooms" string="Bedrooms"/>
                 <field name="facades" string="Facades"/>
+                <field name="living_area" string="Living Area" filter_domain="[('living_area', '>=', self)]"/>
                 <separator/>
                 <filter name="availability" string="Availability" domain="[('date_availability', '&gt;', context_today())]"/>
                 <group expand="2" string="Group By">
@@ -27,24 +28,24 @@
         <field name="arch" type="xml">
             <form string="Property Form">
                 <sheet>
-                    <div>
-                        <button name="action_set_sold" type="object" string="Sold" class="btn-primary me-2"/>
-                        <button name="action_set_cancel" type="object" string="Cancel" class="btn-secondary"/>
-                    </div>
+                    <header>
+                        <button name="action_set_sold" type="object" string="Sold" class="btn-primary" invisible="not (state in ('new', 'offer received', 'offer accepted'))"/>
+                        <button name="action_set_cancel" type="object" string="Cancel" class="btn-secondary" invisible="not (state in ('new', 'offer received'))"/>
+                        <field name="state" widget="statusbar" string="State" statusbar_visible="new,offer received,offer accepted,sold"/>
+                    </header>
                     <div>
                         <h1>
                             <field name="name" string="Title"/>
                         </h1>
                     </div>
-                    <field name="tag_ids" widget="many2many_tags"/>
+                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
                     <group>
                         <group>
-                            <field name="property_type_id" string="Property Type"/>
+                            <field name="property_type_id" string="Property Type" options="{'no_create': true}"/>
                             <field name="post_code" string="Post Code"/>
                             <field name="date_availability" string="Available From"/>
                         </group>
                         <group>
-                            <field name="state" string="State"/>
                             <field name="best_price" string="Best Price"/>
                             <field name="expected_price" string="Expected Price"/>
                             <field name="selling_price" string="Selling Price"/>
@@ -59,24 +60,24 @@
                                 <field name="facades" string="Facades"/>
                                 <field name="garage" string="Garage"/>
                                 <field name="garden" string="Garden"/>
-                                <field name="garden_area" string="Garden Area (sqm)"/>
-                                <field name="garden_orientation" string="Garden Orientation"/>
+                                <field name="garden_area" string="Garden Area (sqm)" invisible="not garden"/>
+                                <field name="garden_orientation" string="Garden Orientation" invisible="not garden"/>
                                 <field name="total_area" string="Total Area"/>
                             </group>
                         </page>
                         <page string="Offers">
-                            <field name="offer_ids" editable="bottom">
-                                <list editable="bottom">
+                            <field name="offer_ids" editable="bottom" readonly="state in ('sold', 'canceled', 'offer accepted')">
+                                <list editable="bottom" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'">
                                     <field name="price"/>
                                     <field name="validity"/>
                                     <field name="date_deadline"/>
                                     <field name="partner_id"/>
-                                    <button name="action_set_accept" type="object" icon="fa-check" title="accept"/>
-                                    <button name="action_set_refuse" type="object" icon="fa-times" title="refuse"/>
-                                    <field name="status"/>
+                                    <field name="property_type_id"/>
+                                    <button name="action_set_accept" type="object" icon="fa-check" title="accept" invisible="status in ('accepted', 'refused')"/>
+                                    <button name="action_set_refuse" type="object" icon="fa-times" title="refuse" invisible="status in ('accepted', 'refused')"/>
                                 </list>
                             </field>
-                        </page>                     
+                        </page>
                         <page string="Other Info">
                             <group>
                                 <field name="buyer_id" string="Buyer"/>
@@ -93,15 +94,16 @@
         <field name="name">estate.property.list</field>
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
-            <list string="Properties">
+            <list string="Properties" decoration-success="state in ['offer received', 'offer accepted']" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
                 <field name="name" string="Title"/>
                 <field name="post_code" string="Postcode"/>
                 <field name="bedrooms" string="Bedrooms"/>
                 <field name="living_area" string="Living Area (sqm)"/>
                 <field name="expected_price" string="Expected Price"/>
                 <field name="selling_price" string="Selling Price"/>
-                <field name="date_availability" string="Available From"/>
+                <field name="date_availability" string="Available From" optional="True"/>
                 <field name="property_type_id" string="Property Type"/>
+                <field name="state" string="State"/>
             </list>
         </field>
     </record>
@@ -109,6 +111,7 @@
     <record id="estate_property_action" model="ir.actions.act_window">
         <field name="name">Properties</field>
         <field name="res_model">estate.property</field>
+        <field name="context">{'search_default_availability': True}</field>
         <field name="view_mode">list,form</field>
     </record>
 </odoo>

From 8d30b55a6e903ff983cb8f86c57df274b2f63e34 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Thu, 22 May 2025 13:40:13 +0200
Subject: [PATCH 11/14] [IMP] Estate: Adding inheritence to the users view. In
 this commit, I created a new model inherited from the res.users and its view
 which is inherited from the parent view base.view_users_form. I also
 overrided the unlink (using ondelete decoration) for the property and the
 create for the property offer. I fixed the comment from ABHA to keep the same
 order of the records in the views (search, form, list, and actions). This
 commit is related to the 12th chapter of Server Framework 101 from Odoo's
 official documentation.

---
 estate/__manifest__.py                       |  1 +
 estate/models/__init__.py                    | 11 ++++++----
 estate/models/estate_property.py             |  6 ++++++
 estate/models/estate_property_offer.py       | 10 ++++++++++
 estate/models/res_users.py                   |  7 +++++++
 estate/views/estate_property_offer_views.xml | 14 ++++++-------
 estate/views/res_users_views.xml             | 21 ++++++++++++++++++++
 7 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 estate/models/res_users.py
 create mode 100644 estate/views/res_users_views.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 8caf9c92d35..e5744636848 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -15,6 +15,7 @@
         'views/estate_property_offer_views.xml',
         'views/estate_property_type_views.xml',
         'views/estate_property_views.xml',
+        'views/res_users_views.xml',
         'views/estate_menus.xml'
     ],
     'installable': True,
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index 2f1821a39c1..8d1b0ed8937 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -1,4 +1,7 @@
-from . import estate_property
-from . import estate_property_type
-from . import estate_property_tag
-from . import estate_property_offer
+from . import (
+    estate_property,
+    estate_property_offer,
+    estate_property_tag,
+    estate_property_type,
+    res_users,
+)
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 337cff2d92a..78f2ea62f36 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -72,6 +72,12 @@ def _check_selling_price(self):
             if float_compare(record.selling_price, record.expected_price * 0.9, precision_digits=2) < 0:
                 raise ValidationError("Selling price cannot be lower than 90% of the expected price.")
 
+    @api.ondelete(at_uninstall=False)
+    def _unlink_if_state_is_new_or_canceled(self):
+        invalid_records = self.filtered(lambda r: r.state not in ('new', 'canceled'))
+        if invalid_records:
+            raise UserError("You can only delete properties in NEW or CANCELED state.")
+
     def action_set_sold(self):
         for record in self:
             if (record.state == 'sold'):
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index ac3772e5671..052a580b2aa 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -30,6 +30,16 @@ def _compute_date_deadline(self):
             create_date = offer.create_date or fields.Datetime.now()
             offer.date_deadline = create_date.date() + timedelta(days=offer.validity)
 
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            property = self.env['estate.property'].browse(vals['property_id'])
+            if property.state == 'new':
+                property.state = 'offer received'
+            if any(offer.price >= vals['price'] for offer in property.offer_ids):
+                raise UserError("Cannot create offer: there is already an offer with an equal or higher price.")
+        return super().create(vals_list)
+
     def _inverse_date_deadline(self):
         for offer in self:
             create_date = offer.create_date or fields.Datetime.now()
diff --git a/estate/models/res_users.py b/estate/models/res_users.py
new file mode 100644
index 00000000000..4822c83e461
--- /dev/null
+++ b/estate/models/res_users.py
@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+    property_ids = fields.One2many('estate.property', 'salesperson_id', domain=[('state', 'in', ['new', 'offer received'])])
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
index d2dc0bd4c1a..66773e301c8 100644
--- a/estate/views/estate_property_offer_views.xml
+++ b/estate/views/estate_property_offer_views.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0"?>
 <odoo>
-    <record id="action_estate_property_offer" model="ir.actions.act_window">
-        <field name="name">Offers</field>
-        <field name="res_model">estate.property.offer</field>
-        <field name="view_mode">list,form</field>
-        <field name="domain">[('property_type_id', '=', active_id)]</field>
-    </record>
-
     <record id="estate_property_offer_view_search" model="ir.ui.view">
         <field name="name">estate.property.offer.search</field>
         <field name="model">estate.property.offer</field>
@@ -54,4 +47,11 @@
             </list>
         </field>
     </record>
+
+    <record id="action_estate_property_offer" model="ir.actions.act_window">
+        <field name="name">Offers</field>
+        <field name="res_model">estate.property.offer</field>
+        <field name="view_mode">list,form</field>
+        <field name="domain">[('property_type_id', '=', active_id)]</field>
+    </record>
 </odoo>
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml
new file mode 100644
index 00000000000..0b69278ddf6
--- /dev/null
+++ b/estate/views/res_users_views.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="users_form_inherit_estate_view_form" model="ir.ui.view">
+        <field name="name">res.users.form.inherit.estate</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page string="Properties">
+                    <field name="property_ids">
+                        <list editable="bottom">
+                            <field name="name"/>
+                            <field name="state"/>
+                            <field name="expected_price"/>
+                        </list>
+                    </field>
+                </page>
+            </notebook>
+        </field>
+    </record>
+</odoo>

From 741a3ee468935f03ae8c4e03c79f271b785dc51f Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Fri, 23 May 2025 10:00:33 +0200
Subject: [PATCH 12/14] [IMP] Estate: Adding link between Estate and Invoicing
 modules. In this commit, I created the link between the estate and invoicing
 modules using a bridge module 'Estate Account'. I also overrided the
 'action_set_sold' to create an invoice when a property sold. This work is
 related to the 13th chapter of Server Framework 101 from Odoo's official
 documentation.

---
 estate_account/__init__.py                  |  1 +
 estate_account/__manifest__.py              | 15 +++++++++++
 estate_account/models/__init__.py           |  1 +
 estate_account/models/estate_account.py     |  6 +++++
 estate_account/models/estate_property.py    | 29 +++++++++++++++++++++
 estate_account/security/ir.model.access.csv |  2 ++
 6 files changed, 54 insertions(+)
 create mode 100644 estate_account/__init__.py
 create mode 100644 estate_account/__manifest__.py
 create mode 100644 estate_account/models/__init__.py
 create mode 100644 estate_account/models/estate_account.py
 create mode 100644 estate_account/models/estate_property.py
 create mode 100644 estate_account/security/ir.model.access.csv

diff --git a/estate_account/__init__.py b/estate_account/__init__.py
new file mode 100644
index 00000000000..0650744f6bc
--- /dev/null
+++ b/estate_account/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
new file mode 100644
index 00000000000..defe5088754
--- /dev/null
+++ b/estate_account/__manifest__.py
@@ -0,0 +1,15 @@
+{
+    'name': 'Estate Account',
+    'version': '1.0',
+    'category': 'Real Estate Accounting',
+    'summary': 'Link module to invoice sold estate properties',
+    'description': 'Generates invoices for sold properties when both Estate and Accounting apps are installed.',
+    'author': 'Odoo',
+    'depends': ['estate', 'account'],
+    'data': [
+        'security/ir.model.access.csv'
+    ],
+    'application': False,
+    'auto_install': True,
+    'license': 'LGPL-3',
+}
diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py
new file mode 100644
index 00000000000..5e129cd02ef
--- /dev/null
+++ b/estate_account/models/__init__.py
@@ -0,0 +1 @@
+from . import estate_account, estate_property
diff --git a/estate_account/models/estate_account.py b/estate_account/models/estate_account.py
new file mode 100644
index 00000000000..2eb09c44f5d
--- /dev/null
+++ b/estate_account/models/estate_account.py
@@ -0,0 +1,6 @@
+from odoo import models
+
+
+class EstateAccount(models.Model):
+    _name = 'estate.account'
+    _description = 'Estate Account Model (for invoinving).'
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
new file mode 100644
index 00000000000..553f129f089
--- /dev/null
+++ b/estate_account/models/estate_property.py
@@ -0,0 +1,29 @@
+from odoo import Command, models
+from odoo.exceptions import UserError
+
+
+class EstatePropert(models.Model):
+    _inherit = 'estate.property'
+
+    def action_set_sold(self):
+        for property in self:
+            if not property.buyer_id:
+                raise UserError('Cannot create invoice: the property has no buyer.')
+            move_vals = {
+                'partner_id': property.buyer_id.id,
+                'move_type': 'out_invoice',
+                'line_ids': [
+                    Command.create({
+                        'name': 'Selling price 6%',
+                        'quantity': 1,
+                        'price_unit': self.selling_price * 0.6
+                    }),
+                    Command.create({
+                        'name': 'Administrative fees',
+                        'quantity': 1,
+                        'price_unit': 100000
+                    })
+                ]
+            }
+            self.env['account.move'].create(move_vals)
+        return super().action_set_sold()
diff --git a/estate_account/security/ir.model.access.csv b/estate_account/security/ir.model.access.csv
new file mode 100644
index 00000000000..aea2c342f7b
--- /dev/null
+++ b/estate_account/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_estate_account,access_estate_account,model_estate_account,base.group_user,1,1,1,1

From 05f168d9ec2c9df5a32cd7db10094ecacba0a291 Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Fri, 23 May 2025 11:17:44 +0200
Subject: [PATCH 13/14] [IMP] Estate: Adding Kanban view to estate property. In
 this commit, I added the kanban view to the estate property with the ability
 to display some information under specific conditions using the template
 conditions. Also, properties are grouped by property type and the drag and
 drop is disabled. This work is related to the 14th chapter of Server
 Framework 101 from Odoo's official documentation.

---
 estate/views/estate_property_views.xml | 29 +++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 3e6e1f7bc4a..5f89f44d094 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -1,5 +1,32 @@
 <?xml version="1.0"?>
 <odoo>
+    <record id="estate_property_view_kanban" model="ir.ui.view">
+        <field name="name">estate.property.kanban</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <kanban records_draggable="False" default_group_by="property_type_id" edit="False">
+                <templates>
+                    <t t-name="card">
+                        <div class="col g-0">
+                            <field name='name' class="fw-bolder"/>
+                            <field name="expected_price" invisible="1"/>
+                            <div>
+                                Expected Price: <field name="expected_price"/>
+                            </div>
+                            <div t-if="record.best_price.value > 0">
+                                Best Offer: <field name="best_price"/>
+                            </div>
+                            <div t-if="record.selling_price.value > 0">
+                                Selling Price: <field name="selling_price"/>
+                            </div>
+                            <field name="tag_ids"/>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
     <record id="estate_property_view_search" model="ir.ui.view">
         <field name="name">estate.property.search</field>
         <field name="model">estate.property</field>
@@ -112,6 +139,6 @@
         <field name="name">Properties</field>
         <field name="res_model">estate.property</field>
         <field name="context">{'search_default_availability': True}</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list,form,kanban</field>
     </record>
 </odoo>

From 3d26bd8e299b1103383fe36f2ae563aeb89591bc Mon Sep 17 00:00:00 2001
From: karygauss03 <karim.omrane@supcom.tn>
Date: Fri, 30 May 2025 16:01:30 +0200
Subject: [PATCH 14/14] [FIX] Estate: Fixing ABHA comments. In this commit, I
 fixed the received comments from ABHA.

---
 estate/models/__init__.py                   |  8 +-------
 estate/models/estate_property.py            |  8 +++++++-
 estate/models/estate_property_offer.py      | 10 +++++-----
 estate/models/estate_property_type.py       |  3 ++-
 estate/views/res_users_views.xml            |  2 +-
 estate_account/__manifest__.py              |  4 +---
 estate_account/models/__init__.py           |  2 +-
 estate_account/models/estate_account.py     |  6 ------
 estate_account/security/ir.model.access.csv |  2 --
 9 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 estate_account/models/estate_account.py
 delete mode 100644 estate_account/security/ir.model.access.csv

diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index 8d1b0ed8937..5e31bd00c8b 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -1,7 +1 @@
-from . import (
-    estate_property,
-    estate_property_offer,
-    estate_property_tag,
-    estate_property_type,
-    res_users,
-)
+from . import estate_property, estate_property_offer, estate_property_tag, estate_property_type, res_users
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 78f2ea62f36..246b0ecaaab 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,4 +1,5 @@
 from dateutil.relativedelta import relativedelta
+
 from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools.float_utils import float_compare, float_is_zero
@@ -18,7 +19,12 @@ class EstateProperty(models.Model):
     post_code = fields.Char('Post Code')
     state = fields.Selection(
         string="State",
-        selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')],
+        selection=[
+            ('new', 'New'),
+            ('offer received', 'Offer Received'),
+            ('offer accepted', 'Offer Accepted'),
+            ('sold', 'Sold'),
+            ('canceled', 'Canceled')],
         help="Estate current state",
         required=True,
         default='new',
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 052a580b2aa..7a1eb098962 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -30,6 +30,11 @@ def _compute_date_deadline(self):
             create_date = offer.create_date or fields.Datetime.now()
             offer.date_deadline = create_date.date() + timedelta(days=offer.validity)
 
+    def _inverse_date_deadline(self):
+        for offer in self:
+            create_date = offer.create_date or fields.Datetime.now()
+            offer.validity = (offer.date_deadline - create_date.date()).days if offer.date_deadline else 0
+
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
@@ -40,11 +45,6 @@ def create(self, vals_list):
                 raise UserError("Cannot create offer: there is already an offer with an equal or higher price.")
         return super().create(vals_list)
 
-    def _inverse_date_deadline(self):
-        for offer in self:
-            create_date = offer.create_date or fields.Datetime.now()
-            offer.validity = (offer.date_deadline - create_date.date()).days if offer.date_deadline else 0
-
     def action_set_accept(self):
         for record in self:
             if (record.property_id.state in ('offer accepted', 'sold')):
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index 8d646d6106a..7564a7b755f 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -1,4 +1,4 @@
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class EstatePropertyType(models.Model):
@@ -12,6 +12,7 @@ class EstatePropertyType(models.Model):
     offer_ids = fields.One2many('estate.property.offer', 'property_type_id', string='Properties offers')
     offer_count = fields.Integer(compute='_compute_offer_count', string='Offers Count')
 
+    @api.depends('offer_ids')
     def _compute_offer_count(self):
         for record in self:
             record.offer_count = len(record.offer_ids)
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml
index 0b69278ddf6..f9a669cbb33 100644
--- a/estate/views/res_users_views.xml
+++ b/estate/views/res_users_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <odoo>
-    <record id="users_form_inherit_estate_view_form" model="ir.ui.view">
+    <record id="res_users_view_form" model="ir.ui.view">
         <field name="name">res.users.form.inherit.estate</field>
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form"/>
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
index defe5088754..9a7bb7a9d7a 100644
--- a/estate_account/__manifest__.py
+++ b/estate_account/__manifest__.py
@@ -6,9 +6,7 @@
     'description': 'Generates invoices for sold properties when both Estate and Accounting apps are installed.',
     'author': 'Odoo',
     'depends': ['estate', 'account'],
-    'data': [
-        'security/ir.model.access.csv'
-    ],
+    'data': [],
     'application': False,
     'auto_install': True,
     'license': 'LGPL-3',
diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py
index 5e129cd02ef..5e1963c9d2f 100644
--- a/estate_account/models/__init__.py
+++ b/estate_account/models/__init__.py
@@ -1 +1 @@
-from . import estate_account, estate_property
+from . import estate_property
diff --git a/estate_account/models/estate_account.py b/estate_account/models/estate_account.py
deleted file mode 100644
index 2eb09c44f5d..00000000000
--- a/estate_account/models/estate_account.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from odoo import models
-
-
-class EstateAccount(models.Model):
-    _name = 'estate.account'
-    _description = 'Estate Account Model (for invoinving).'
diff --git a/estate_account/security/ir.model.access.csv b/estate_account/security/ir.model.access.csv
deleted file mode 100644
index aea2c342f7b..00000000000
--- a/estate_account/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_estate_account,access_estate_account,model_estate_account,base.group_user,1,1,1,1