From 1f3f54573428d3358ff78fa9f286411707ba35b7 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Tue, 8 Oct 2024 18:54:14 +0530
Subject: [PATCH 01/16] Cover chepter1 to chepter5

---
 estate/__init__.py                     |  3 ++
 estate/__manifest__.py                 | 21 ++++++++++
 estate/models/__init__.py              |  2 +
 estate/models/estate_property.py       | 36 ++++++++++++++++
 estate/models/test_model.py            |  7 ++++
 estate/security/ir.model.access.csv    |  2 +
 estate/views/estate_menu.xml           | 57 ++++++++++++++++++++++++++
 estate/views/estate_property_views.xml | 41 ++++++++++++++++++
 8 files changed, 169 insertions(+)
 create mode 100644 estate/__init__.py
 create mode 100644 estate/__manifest__.py
 create mode 100644 estate/models/__init__.py
 create mode 100644 estate/models/estate_property.py
 create mode 100644 estate/models/test_model.py
 create mode 100644 estate/security/ir.model.access.csv
 create mode 100644 estate/views/estate_menu.xml
 create mode 100644 estate/views/estate_property_views.xml

diff --git a/estate/__init__.py b/estate/__init__.py
new file mode 100644
index 00000000000..5305644df14
--- /dev/null
+++ b/estate/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
\ No newline at end of file
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
new file mode 100644
index 00000000000..f3b3ee5a62e
--- /dev/null
+++ b/estate/__manifest__.py
@@ -0,0 +1,21 @@
+{
+    'name': "Real State",
+    # 'version': '1.0',
+    'depends': ['base'],
+    'author': "Sahil Mangukiya",
+    # 'category': 'Category',
+    'description': "This is my First tutorial module.",
+    # data files always loaded at installation
+    'data': [
+        'security/ir.model.access.csv',
+
+        'views/estate_property_views.xml',
+        'views/estate_menu.xml'
+    ],
+    # data files containing optionally loaded demonstration data
+    'demo': [
+    ],
+    'installable': True,
+    'application': True,
+    'auto_install': False
+}
\ No newline at end of file
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
new file mode 100644
index 00000000000..88d10acbe55
--- /dev/null
+++ b/estate/models/__init__.py
@@ -0,0 +1,2 @@
+from . import test_model
+from . import estate_property
\ No newline at end of file
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
new file mode 100644
index 00000000000..8522c180dbd
--- /dev/null
+++ b/estate/models/estate_property.py
@@ -0,0 +1,36 @@
+from odoo import models, fields
+from datetime import timedelta
+
+class estateProperty(models.Model):
+        _name = "estate_property"
+        _description = "This is property Table."
+
+        name = fields.Char(required=True)
+        description = fields.Text()
+        postcode = fields.Char()
+        data_availability = fields.Date(
+            default=lambda self: fields.Date.today() + timedelta(days=90),
+            copy=False
+        )
+        expected_price = fields.Float(required=True)
+        selling_price = fields.Float(readonly=True, copy=False)
+        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(
+            string = 'Orientation',
+            selection = [('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
+            help = "Garden Orientation is avialable in four faces of direction."
+        )
+        active = fields.Boolean(default=False)
+        state = fields.Selection(
+            string = 'State',
+            selection = [('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
+            help = "Offer available in five type.",
+            required=True,
+            copy=False,
+            default='new' 
+        )
\ No newline at end of file
diff --git a/estate/models/test_model.py b/estate/models/test_model.py
new file mode 100644
index 00000000000..fb4115d09ef
--- /dev/null
+++ b/estate/models/test_model.py
@@ -0,0 +1,7 @@
+from odoo import models, fields
+
+class TestModel(models.Model):
+    _name = "test_model"
+    _description = "This is test Table."
+
+    
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
new file mode 100644
index 00000000000..0e11f47e58d
--- /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
\ No newline at end of file
diff --git a/estate/views/estate_menu.xml b/estate/views/estate_menu.xml
new file mode 100644
index 00000000000..ddb1c7aba7f
--- /dev/null
+++ b/estate/views/estate_menu.xml
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <menuitem id="estate_menu_root" name="Real State">
+
+        <menuitem id="estate_menu_first_level_setting" name="Setting" sequence="1">
+                
+            <menuitem id="estate_menu_second_level_Try" name = "Try" action="estate_private_action" sequence="4"/>
+            
+            <menuitem id="estate_menu_second_level_setting" name="Parent" sequence="1" >    
+                <menuitem
+                    id="estate_third_level_setting_SS"
+                    action="estate_private_action" sequence="2"/>
+                
+                <menuitem
+                    id="estate_third_level_setting_second_DFJDK"
+                    name="hello"
+                    action="estate_private34_action" sequence="1"  />
+
+            </menuitem>
+
+            <menuitem id="estate_menu_second_level_setting_pp" name="Config" sequence="3">
+                
+                <menuitem id="estate_menu_third_level_setting" name="Sahil" sequence="2">
+
+                    <menuitem
+                        id="estate_third_level_setting"
+                        action="estate_private_action"/>
+
+
+                </menuitem>
+
+                
+                <menuitem
+                    id="estate_third_level_setting_second"
+                    name="hello"
+                    action="estate_private34_action" sequence="1" />
+
+            </menuitem>
+        
+        </menuitem>
+
+        <menuitem id="estate_menu_first_level_custom" name="Custom" sequence="2">
+            
+            <menuitem id="estate_menu_second_level_custom" action="estate_custom_action"/>
+        
+        </menuitem>
+
+        <menuitem id="estate_menu_first_level_private" name="Private" sequence="3">
+            
+            <menuitem id="estate_menu_second_level_private" action="estate_private_action"/>
+        
+        </menuitem>
+
+
+    </menuitem>
+    
+</odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
new file mode 100644
index 00000000000..a958d74bded
--- /dev/null
+++ b/estate/views/estate_property_views.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="estate_private_action" model="ir.actions.act_window">
+       <field name="name">Private</field>
+       <field name="res_model">estate_property</field>
+       <field name="view_mode">list,form</field>
+    </record>
+    
+    <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>
+
+     <record id="estate_custom_action" model="ir.actions.act_window">
+        <field name="name">Custom</field>
+        <field name="res_model">estate_property</field>
+        <field name="view_mode">list,form</field>
+     </record>
+
+
+
+     <record id="estate_private34_action" model="ir.actions.act_window">
+        <field name="name">Private34</field>
+        <field name="res_model">estate_property</field>
+        <field name="view_mode">list,form</field>
+     </record>
+
+     <record id="estate_property_view_tree" model="ir.ui.view">
+        <field name="name">estate_property_view_tree</field>
+        <field name="model">estate_property</field>
+        <field name="arch" type="xml">
+            <tree string="list_tree">
+                <field name="name"/>
+                <field name="expected_price"/>
+            </tree>
+        </field>
+     </record>
+
+
+</odoo> 

From 5f2df6c6402f8332f52af0335abe14b3b11b5ad7 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Thu, 10 Oct 2024 16:57:28 +0530
Subject: [PATCH 02/16] [ADD] estate_property: implemented upto chapter-7
 (Relations Between Models)

Completed the first three chapters of the Odoo developer tutorials.
Set up the development environment.
Created the real estate module and model with various fields.
Established access rights for the model.
Developed initial XML views for the module.
Added relational models for estate properties, offers, tags, and types:
Implemented One2many, Many2many, and Many2one relationships in models ()
Created basic views (search, list, form) for these models
Implemented filters, groupby, and domain functionalities.
---
 estate/__manifest__.py                      |   3 +-
 estate/models/__init__.py                   |   6 +-
 estate/models/estate_property.py            |  28 ++++-
 estate/models/estate_property_offer.py      |  23 ++++
 estate/models/estate_property_tag.py        |   8 ++
 estate/models/estate_property_type.py       |  11 ++
 estate/models/test_estate_property_offer.py |  23 ++++
 estate/models/test_model.py                 |   6 +-
 estate/security/ir.model.access.csv         |   6 +-
 estate/views/estate_menu.xml                |  31 +++--
 estate/views/estate_property_tag_views.xml  |   8 ++
 estate/views/estate_property_type_views.xml |  32 +++++
 estate/views/estate_property_views.xml      | 129 +++++++++++++++++---
 13 files changed, 274 insertions(+), 40 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/models/test_estate_property_offer.py
 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 f3b3ee5a62e..b39f63e01ef 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -8,7 +8,8 @@
     # data files always loaded at installation
     'data': [
         'security/ir.model.access.csv',
-
+        'views/estate_property_type_views.xml',
+        'views/estate_property_tag_views.xml',
         'views/estate_property_views.xml',
         'views/estate_menu.xml'
     ],
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index 88d10acbe55..b2693faef3e 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -1,2 +1,6 @@
 from . import test_model
-from . import estate_property
\ No newline at end of file
+from . import estate_property
+from . import estate_property_type
+from . import estate_property_tag
+from . import estate_property_offer
+from . import test_estate_property_offer
\ No newline at end of file
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 8522c180dbd..df6c9397463 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,8 +1,8 @@
-from odoo import models, fields
+from odoo import models, fields # type: ignore
 from datetime import timedelta
 
 class estateProperty(models.Model):
-        _name = "estate_property"
+        _name = "estate.property"
         _description = "This is property Table."
 
         name = fields.Char(required=True)
@@ -33,4 +33,26 @@ class estateProperty(models.Model):
             required=True,
             copy=False,
             default='new' 
-        )
\ No newline at end of file
+        )
+        property_type_id = fields.Many2one(
+                'estate.property.type',
+                'Property Type'
+        )
+        seller_id = fields.Many2one(
+                'res.users',
+                'Salesman',
+                default=lambda self: self.env.user
+        )
+        buyer_id = fields.Many2one(
+                'res.partner',
+                'Buyer'
+        )
+        tag_ids = fields.Many2many(
+                comodel_name='estate.property.tag',
+                string='Tag'
+        )
+        offer_ids = fields.One2many(
+                'estate.property.offer', 
+                'property_id'
+        )
+        
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
new file mode 100644
index 00000000000..872d3e3add7
--- /dev/null
+++ b/estate/models/estate_property_offer.py
@@ -0,0 +1,23 @@
+from odoo import models, fields # type: ignore
+
+class estatePropertyOffer(models.Model):
+
+    _name = "estate.property.offer"
+    _description = "This is offer table"
+
+    price = fields.Float(required=True)
+    status = fields.Selection(
+        string='Status',
+        selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
+    )
+    partner_id = fields.Many2one(
+        'res.partner',
+        string='Buyer',
+        required=True
+    )
+    property_id = fields.Many2one(
+        'estate.property',
+        string='Property',
+        required=True
+    )
+    
\ No newline at end of file
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
new file mode 100644
index 00000000000..6f72ed5f7c3
--- /dev/null
+++ b/estate/models/estate_property_tag.py
@@ -0,0 +1,8 @@
+from odoo import models, fields # type: ignore
+
+class estatePropertyTag(models.Model):
+    
+    _name = "estate.property.tag"
+    _description = "This is property Tag model"
+
+    name = fields.Char(required=True, string="Tag")
\ No newline at end of file
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
new file mode 100644
index 00000000000..8eec044305e
--- /dev/null
+++ b/estate/models/estate_property_type.py
@@ -0,0 +1,11 @@
+from odoo import models, fields # type: ignore
+
+class estatePropertyType(models.Model):
+    _name = "estate.property.type"
+    _description = "This is property Type table."
+
+    name = fields.Char(required=True)
+
+
+
+
diff --git a/estate/models/test_estate_property_offer.py b/estate/models/test_estate_property_offer.py
new file mode 100644
index 00000000000..97ef8cfae5e
--- /dev/null
+++ b/estate/models/test_estate_property_offer.py
@@ -0,0 +1,23 @@
+from odoo import models, fields # type: ignore
+
+class TestEstatePropertyOffer(models.Model):
+    _name = "test.estate.property.offer"
+    _description = "This is test offer Table."
+    
+    test_price = fields.Float(required=True)
+    test_status = fields.Selection(
+        string='Status',
+        selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
+        copy=False,
+        help="status of offer"
+    )
+    test_partner_id = fields.Many2one(
+        'res.partner',
+        required=True
+    )
+    test_property_id = fields.Many2one(
+        'estate.property',
+        required=True
+    )
+
+    
diff --git a/estate/models/test_model.py b/estate/models/test_model.py
index fb4115d09ef..babc2190671 100644
--- a/estate/models/test_model.py
+++ b/estate/models/test_model.py
@@ -1,7 +1,5 @@
-from odoo import models, fields
+from odoo import models, fields # type: ignore
 
 class TestModel(models.Model):
-    _name = "test_model"
+    _name = "test.model"
     _description = "This is test Table."
-
-    
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index 0e11f47e58d..b85b3c5c846 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -1,2 +1,6 @@
 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
\ No newline at end of file
+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
+test_access_estate_property_offer,access_test_estate_property_offer,model_test_estate_property_offer,base.group_user,1,1,1,1
diff --git a/estate/views/estate_menu.xml b/estate/views/estate_menu.xml
index ddb1c7aba7f..926e6466c19 100644
--- a/estate/views/estate_menu.xml
+++ b/estate/views/estate_menu.xml
@@ -2,8 +2,17 @@
 <odoo>
     <menuitem id="estate_menu_root" name="Real State">
 
-        <menuitem id="estate_menu_first_level_setting" name="Setting" sequence="1">
-                
+        <menuitem id="estate_menu_first_level_setting" name="Setting">
+            <menuitem
+                id="estate_property_type_second_level_menu"
+                action="estate_property_type_action"/>
+            
+            <menuitem
+                id="estate_property_tag_second_level_menu"
+                action="estate_property_tag_action"/>
+        </menuitem>
+        
+        <menuitem id="estate_menu_first_level_custom" name="Custom" sequence="2">
             <menuitem id="estate_menu_second_level_Try" name = "Try" action="estate_private_action" sequence="4"/>
             
             <menuitem id="estate_menu_second_level_setting" name="Parent" sequence="1" >    
@@ -15,31 +24,27 @@
                     id="estate_third_level_setting_second_DFJDK"
                     name="hello"
                     action="estate_private34_action" sequence="1"  />
-
+    
             </menuitem>
-
+    
             <menuitem id="estate_menu_second_level_setting_pp" name="Config" sequence="3">
                 
                 <menuitem id="estate_menu_third_level_setting" name="Sahil" sequence="2">
-
+    
                     <menuitem
                         id="estate_third_level_setting"
                         action="estate_private_action"/>
-
-
+    
+    
                 </menuitem>
-
+    
                 
                 <menuitem
                     id="estate_third_level_setting_second"
                     name="hello"
                     action="estate_private34_action" sequence="1" />
-
+    
             </menuitem>
-        
-        </menuitem>
-
-        <menuitem id="estate_menu_first_level_custom" name="Custom" sequence="2">
             
             <menuitem id="estate_menu_second_level_custom" action="estate_custom_action"/>
         
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
new file mode 100644
index 00000000000..644626faad0
--- /dev/null
+++ b/estate/views/estate_property_tag_views.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="estate_property_tag_action" model="ir.actions.act_window">
+        <field name="name">Property Tag</field>
+        <field name="res_model">estate.property.tag</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
new file mode 100644
index 00000000000..8419f20b135
--- /dev/null
+++ b/estate/views/estate_property_type_views.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="estate_property_type_action" model="ir.actions.act_window">
+        <field name="name">Properties Types</field>
+        <field name="res_model">estate.property.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <!-- <record id="estate_property_type_view_tree" model="ir.ui.view">
+        <field name="name">estate_property_type_view_tree</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <tree string="Property Type">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record> -->
+
+    <!-- <record id="estate_property_type_view_form" model="ir.ui.view">
+        <field name="name">estate_property_type_view_form</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <form string="Property Type">
+                <sheet>
+                    <group>
+                        fie
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record> -->
+</odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index a958d74bded..3ba3f69b7ab 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -1,41 +1,136 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+   <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>
+
     <record id="estate_private_action" model="ir.actions.act_window">
-       <field name="name">Private</field>
-       <field name="res_model">estate_property</field>
+       <field name="name">BreadCrums</field>
+       <field name="res_model">estate.property</field>
        <field name="view_mode">list,form</field>
     </record>
     
-    <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 id="estate_private34_action" model="ir.actions.act_window">
+        <field name="name">ijij</field>
+        <field name="res_model">estate.property</field>
+        <field name="view_mode">list,form</field>
      </record>
 
      <record id="estate_custom_action" model="ir.actions.act_window">
         <field name="name">Custom</field>
-        <field name="res_model">estate_property</field>
-        <field name="view_mode">list,form</field>
-     </record>
-
-
-
-     <record id="estate_private34_action" model="ir.actions.act_window">
-        <field name="name">Private34</field>
-        <field name="res_model">estate_property</field>
+        <field name="res_model">estate.property</field>
         <field name="view_mode">list,form</field>
      </record>
 
      <record id="estate_property_view_tree" model="ir.ui.view">
         <field name="name">estate_property_view_tree</field>
-        <field name="model">estate_property</field>
+        <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <tree string="list_tree">
                 <field name="name"/>
-                <field name="expected_price"/>
+                <!-- <field name="expected_price" invisible="1"/> -->
+                <!-- <field name="active" invisible="122" /> -->
+                 <field name="expected_price" />
+                 <field name="active" />
+                <field name="selling_price" />
+                <field name="state" />
             </tree>
         </field>
      </record>
 
+     <record id="estate_property_view_form" model="ir.ui.view">
+      <field name="name">estate_property_view_form</field>
+      <field name="model">estate.property</field>
+      <field name="arch" type="xml">
+         <form string="My New House">
+            <sheet>
+               <group>
+                   <group>
+                        <field name="tag_ids" widget="many2many_tags" />
+                        <field name="property_type_id"/>
+                       <field name="name"/>
+                       <field name="expected_price"/>
+                       <!-- <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/>
+                       <field name="expected_price"/> -->
+                     </group>
+                     <group>
+                      <field name="state"/>
+                      <field name="garden"/>
+                      <field name="selling_price" />
+                      <field name="postcode" />
+                   </group>
+               </group>
+               
+               <notebook>
+                   <page string="Description">
+                       <!-- <field name="selling_price"/> -->
+                       <group>
+                           <group>
+                              <field name="name"/>
+                              <field name="expected_price"/>
+                           </group>
+                           <group>
+                              <field name="state"/>
+                              <field name="garden"/>
+                              <field name="selling_price" />
+                           </group>
+                        </group>
+                   </page>
+                   <page string="Vendor">
+                       <!-- <field name="selling_price"/> -->
+                   </page>
+                   <page string="Other Info">
+                     <group>
+                        <field name="seller_id"/>
+                        <field name="buyer_id"/>
+                     </group>
+                   </page>
+                   <page string="Offer">
+                        <field name="offer_ids">
+                           <tree>
+                              <field name="price"/>
+                              <field name="status" />
+                              <field name="partner_id"/>
+                              <field name="property_id" />
+                           </tree>
+                        </field>
+                   </page>
+               </notebook>
+           </sheet>
+         </form>
+      </field>
+     </record>
+
+     <record id="estate_property_view_search" model="ir.ui.view">
+      <field name="name">estate_property_view_search</field>
+      <field name="model">estate.property</field>
+      <field name="arch" type="xml">
+         <search string="Test">
+            <field name="name" string="Carrer" />
+            <!-- <separator/> -->
+            <field name="selling_price" />
+            <field name="expected_price" />
+            <filter name="expected_price" string="Expected Price" domain="[('expected_price', '&lt;=', '0')]" />
+            <group expand="1" string="Group By">
+               <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"/>
+               <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms', 'residual_visible':True}"/> 
+               <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms', 'residual_visible':True}"/>
+            </group>
+         </search>
+      </field>
+     </record>
+
 
 </odoo> 

From 2f380fa7495c6b86601becd4398e6f0300948592 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Thu, 17 Oct 2024 19:05:10 +0530
Subject: [PATCH 03/16] [IMP] estate_property: computed Fields And Onchanges

- Added computed fields for total area and best offer in estate property model.
- Implemented inverse method for offer validity date computation.
- Created onchange method to auto-fill garden area and orientation based on
garden field.
---
 estate/models/__init__.py                   |  2 +-
 estate/models/estate_property.py            | 59 ++++++++++++++++++---
 estate/models/estate_property_offer.py      | 35 +++++++++++-
 estate/models/estate_property_tag.py        | 14 ++++-
 estate/models/estate_property_type.py       |  2 +
 estate/security/ir.model.access.csv         |  1 +
 estate/views/estate_menu.xml                |  6 +--
 estate/views/estate_property_tag_views.xml  | 15 ++++++
 estate/views/estate_property_type_views.xml |  5 +-
 estate/views/estate_property_views.xml      | 31 +++++------
 10 files changed, 140 insertions(+), 30 deletions(-)

diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index b2693faef3e..525b3559722 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -3,4 +3,4 @@
 from . import estate_property_type
 from . import estate_property_tag
 from . import estate_property_offer
-from . import test_estate_property_offer
\ No newline at end of file
+from . import test_estate_property_offer
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index df6c9397463..2b20acf8b6a 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,4 +1,4 @@
-from odoo import models, fields # type: ignore
+from odoo import models, fields, api # type: ignore
 from datetime import timedelta
 
 class estateProperty(models.Model):
@@ -14,7 +14,7 @@ class estateProperty(models.Model):
         )
         expected_price = fields.Float(required=True)
         selling_price = fields.Float(readonly=True, copy=False)
-        bedrooms = fields.Integer(default=2)
+        bedrooms = fields.Integer(change_default=True)
         living_area = fields.Integer()
         facades = fields.Integer()
         garage = fields.Boolean()
@@ -25,7 +25,7 @@ class estateProperty(models.Model):
             selection = [('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
             help = "Garden Orientation is avialable in four faces of direction."
         )
-        active = fields.Boolean(default=False)
+        active = fields.Boolean(default=True)
         state = fields.Selection(
             string = 'State',
             selection = [('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
@@ -35,8 +35,12 @@ class estateProperty(models.Model):
             default='new' 
         )
         property_type_id = fields.Many2one(
-                'estate.property.type',
-                'Property Type'
+                comodel_name='estate.property.type',
+                string='Property Type',
+                domain="[('number', '>=', 0)]",
+                ondelete='cascade',
+                store=False # 3 option: cascade, set null, restrict
+                # index, traking, store, compute, related
         )
         seller_id = fields.Many2one(
                 'res.users',
@@ -49,10 +53,53 @@ class estateProperty(models.Model):
         )
         tag_ids = fields.Many2many(
                 comodel_name='estate.property.tag',
-                string='Tag'
+                string='Tag',
+                relation='property_join_tag',
+                column1='property_id',
+                column2='tag_id'
         )
+        # estate_property_tag_rel automatically made
         offer_ids = fields.One2many(
                 'estate.property.offer', 
                 'property_id'
         )
+        number = fields.Integer(related='property_type_id.number')
+        totalArea = fields.Integer(compute='_compute_total_area', store=True)
+        percentage_garden = fields.Float(compute='_compute_total_area')
+        percentage_living = fields.Float(compute='_compute_total_area')
+
+        best_offer = fields.Float(compute='_compute_best_offer')
+
+        @api.depends('garden_area', 'living_area')
+        def _compute_total_area(self):
+                self.totalArea = self.garden_area + self.living_area
+                # self.percentage_garden = ((self.garden_area) / (self.totalArea)) * 100
+                # self.percentage_living = ((self.living_area) / (self.totalArea)) * 100
+
+        @api.depends('offer_ids.price')
+        def _compute_best_offer(self):
+                # for record in self:
+                #         if record.offer_ids:
+                #                 prices = [line.price for line in record.offer_ids]
+                #                 record.best_offer = max(prices) if prices else 0.0
+                #         else:
+                #                 record.best_offer = 0.0  # Set to 0 if there are no offers
+                for record in self:
+                        if record.offer_ids:
+                                record.best_offer = max(record.offer_ids.mapped('price'))
+                        else:
+                                record.best_offer = 0.0
+
+        @api.onchange('garden')
+        def _onchange_garden(self):
+                if self.garden:
+                        self.garden_area = 10
+                        self.garden_orientation = 'north'
+                else:
+                        self.garden_area = 0
+                        self.garden_orientation = False
+
+
+        # offer = fields.Integer(related='offer_ids.id')
+        # property_record = self.env['estate.property'].browse(1)
         
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 872d3e3add7..10a1e1d49c2 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -1,4 +1,5 @@
-from odoo import models, fields # type: ignore
+from odoo import models, fields, api # type: ignore
+from datetime import timedelta, datetime
 
 class estatePropertyOffer(models.Model):
 
@@ -18,6 +19,36 @@ class estatePropertyOffer(models.Model):
     property_id = fields.Many2one(
         'estate.property',
         string='Property',
-        required=True
+        ondelete='set null'
     )
+    validity = fields.Integer(default=7, string="Validity")
+    date_deadline = fields.Date(compute='_compute_date_deadline', inverse='_compute_validity', string="Date Deadline")
+    sum = fields.Integer(compute='_compute_sum', string="Sum")
+    sum2 = fields.Integer(compute='_compute_sum2', string="Sum2")
+
+    @api.depends('validity')
+    def _compute_date_deadline(self):
+        for record in self:
+            if record.create_date:
+                record.date_deadline = record.create_date + timedelta(record.validity)
+            else:
+                record.date_deadline = datetime.today() + timedelta(record.validity)
+
+    @api.depends('date_deadline') 
+    def _compute_validity(self):
+        for record in self:
+            if record.date_deadline and record.create_date:
+                record.validity = (record.date_deadline - record.create_date.date()).days
+            else:
+                record.validity = (record.date_deadline - datetime.today()).days
+
+    @api.depends('validity')
+    def _compute_sum(self):
+        for record in self:
+            record.sum = 7 + record.validity
+
+    @api.depends('sum')
+    def _compute_sum2(self):
+        for record in self:
+            record.sum2 = 7 + record.sum
     
\ No newline at end of file
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index 6f72ed5f7c3..5723f4e689a 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -5,4 +5,16 @@ class estatePropertyTag(models.Model):
     _name = "estate.property.tag"
     _description = "This is property Tag model"
 
-    name = fields.Char(required=True, string="Tag")
\ No newline at end of file
+    name = fields.Char(required=True, string="Tag")
+    active = fields.Boolean(required=True)
+    # property_ids = fields.Many2many(
+    #             comodel_name='estate.property',
+    #             string='Properrrrty',
+    #             relation='property_join_tag',
+    #             column1='property_id',
+    #             column2='tag_id'
+    #     )
+    property_ids = fields.Many2many(
+        comodel_name='estate.property',
+        string='properties'
+    )
\ No newline at end of file
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index 8eec044305e..25035550b48 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -5,6 +5,8 @@ class estatePropertyType(models.Model):
     _description = "This is property Type table."
 
     name = fields.Char(required=True)
+    active = fields.Boolean(Default=False)
+    number = fields.Integer()
 
 
 
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index b85b3c5c846..f5db56aa0bb 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -4,3 +4,4 @@ access_estate_property_type,access_estate_property_type,model_estate_property_ty
 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
 test_access_estate_property_offer,access_test_estate_property_offer,model_test_estate_property_offer,base.group_user,1,1,1,1
+
diff --git a/estate/views/estate_menu.xml b/estate/views/estate_menu.xml
index 926e6466c19..cec9c7cf392 100644
--- a/estate/views/estate_menu.xml
+++ b/estate/views/estate_menu.xml
@@ -12,7 +12,7 @@
                 action="estate_property_tag_action"/>
         </menuitem>
         
-        <menuitem id="estate_menu_first_level_custom" name="Custom" sequence="2">
+        <!-- <menuitem id="estate_menu_first_level_custom" name="Custom" sequence="2">
             <menuitem id="estate_menu_second_level_Try" name = "Try" action="estate_private_action" sequence="4"/>
             
             <menuitem id="estate_menu_second_level_setting" name="Parent" sequence="1" >    
@@ -48,9 +48,9 @@
             
             <menuitem id="estate_menu_second_level_custom" action="estate_custom_action"/>
         
-        </menuitem>
+        </menuitem> -->
 
-        <menuitem id="estate_menu_first_level_private" name="Private" sequence="3">
+        <menuitem id="estate_menu_first_level_private" name="Advertisements" sequence="3">
             
             <menuitem id="estate_menu_second_level_private" action="estate_private_action"/>
         
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
index 644626faad0..3cbe63e898c 100644
--- a/estate/views/estate_property_tag_views.xml
+++ b/estate/views/estate_property_tag_views.xml
@@ -5,4 +5,19 @@
         <field name="res_model">estate.property.tag</field>
         <field name="view_mode">tree,form</field>
     </record>
+    <record id="estate_property_tag_view_form" model="ir.ui.view">
+        <field name="name">estate_property_tag_view_form</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <form string="">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="active"/>
+                        <!-- <field name="property_ids"/> -->
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
index 8419f20b135..2ab8c5b0349 100644
--- a/estate/views/estate_property_type_views.xml
+++ b/estate/views/estate_property_type_views.xml
@@ -6,15 +6,16 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <!-- <record id="estate_property_type_view_tree" model="ir.ui.view">
+    <record id="estate_property_type_view_tree" model="ir.ui.view">
         <field name="name">estate_property_type_view_tree</field>
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
             <tree string="Property Type">
                 <field name="name"/>
+                <field name="number" />
             </tree>
         </field>
-    </record> -->
+    </record>
 
     <!-- <record id="estate_property_type_view_form" model="ir.ui.view">
         <field name="name">estate_property_type_view_form</field>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 3ba3f69b7ab..a5935258971 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -7,7 +7,7 @@
     </record>
 
     <record id="estate_private_action" model="ir.actions.act_window">
-       <field name="name">BreadCrums</field>
+       <field name="name">Properties</field>
        <field name="res_model">estate.property</field>
        <field name="view_mode">list,form</field>
     </record>
@@ -36,6 +36,7 @@
                  <field name="active" />
                 <field name="selling_price" />
                 <field name="state" />
+                <field name="best_offer" />
             </tree>
         </field>
      </record>
@@ -45,6 +46,7 @@
       <field name="model">estate.property</field>
       <field name="arch" type="xml">
          <form string="My New House">
+            <!-- <button string="action_sold" name="action_name" type="object" class="oe_highlight"/> -->
             <sheet>
                <group>
                    <group>
@@ -52,24 +54,15 @@
                         <field name="property_type_id"/>
                        <field name="name"/>
                        <field name="expected_price"/>
-                       <!-- <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/>
-                       <field name="expected_price"/> -->
-                     </group>
-                     <group>
+                   </group>
+                   <group>
                       <field name="state"/>
                       <field name="garden"/>
                       <field name="selling_price" />
                       <field name="postcode" />
+                      <field name="number" string="Number" />
+                      <field name="bedrooms" />
+                      <field name="best_offer" />
                    </group>
                </group>
                
@@ -80,11 +73,17 @@
                            <group>
                               <field name="name"/>
                               <field name="expected_price"/>
+                              <field name="garden_area" />
+                              <field name="garden_orientation" />
+                              <field name="living_area" />
                            </group>
                            <group>
                               <field name="state"/>
                               <field name="garden"/>
                               <field name="selling_price" />
+                              <field name="totalArea" />
+                              <!-- <field name="percentage_garden" />
+                              <field name="percentage_living" /> -->
                            </group>
                         </group>
                    </page>
@@ -104,6 +103,8 @@
                               <field name="status" />
                               <field name="partner_id"/>
                               <field name="property_id" />
+                              <field name="validity" />
+                              <field name="date_deadline" />
                            </tree>
                         </field>
                    </page>

From 6152cae7cb576bfe951c150f3532bf17ae8d724e Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Fri, 18 Oct 2024 12:56:57 +0530
Subject: [PATCH 04/16] [IMP] estate_property: sql/python constraints and
 action buttons for property

- Added 'Cancel' and 'Sold' buttons to estate.property model with business
logic.
- Ensured canceled properties cannot be sold and sold properties cannot be
canceled.
- Added 'Accept' and 'Refuse' buttons to estate.property.offer model.
- Set buyer and selling price when an offer is accepted.
- Added SQL constraints to enforce unique property tag and type names.
- Ensured property expected price, selling price, and offer price are strictly
positive using SQL constraints.
- Added Python constraint to validate selling price is at least 90% of the
expected price.
---
 estate/models/estate_property.py       | 24 ++++++++++++++++++++++++
 estate/models/estate_property_offer.py | 17 +++++++++++++++++
 estate/models/estate_property_tag.py   |  5 ++++-
 estate/models/estate_property_type.py  |  4 ++++
 estate/views/estate_property_views.xml |  9 +++++++--
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 2b20acf8b6a..0005992079f 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,5 +1,6 @@
 from odoo import models, fields, api # type: ignore
 from datetime import timedelta
+from odoo.exceptions import UserError, ValidationError
 
 class estateProperty(models.Model):
         _name = "estate.property"
@@ -70,6 +71,11 @@ class estateProperty(models.Model):
 
         best_offer = fields.Float(compute='_compute_best_offer')
 
+        _sql_constraints = [
+                ('check_selling_price','CHECK(selling_price >= 0)','A property selling price must be positive.'),
+                ('check_expected_price','CHECK(expected_price > 0)','A property expected price must be strictly positive.')
+        ]
+
         @api.depends('garden_area', 'living_area')
         def _compute_total_area(self):
                 self.totalArea = self.garden_area + self.living_area
@@ -102,4 +108,22 @@ def _onchange_garden(self):
 
         # offer = fields.Integer(related='offer_ids.id')
         # property_record = self.env['estate.property'].browse(1)
+
+        def action_sold(self):
+                if(self.state == 'cancelled'):
+                        raise UserError("You can not mark a cancelled property as sold.")
+                self.state = 'sold'
+        
+        def action_cancelled(self):
+                if(self.state == 'sold'):
+                        raise UserError("You can not mark sold property as cancelled")
+                self.state = 'cancelled'
+
+        @api.constrains('selling_price', 'expected_price')
+        def _check_selling_price(self):
+                for record in self:
+                        if record.selling_price < (0.9 * record.expected_price) and (record.selling_price > 0):
+                               raise ValidationError("Selling price cannot be lower than 90 percentage of the expected price.")
+
         
+                        
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 10a1e1d49c2..2316f4be50d 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -26,6 +26,10 @@ class estatePropertyOffer(models.Model):
     sum = fields.Integer(compute='_compute_sum', string="Sum")
     sum2 = fields.Integer(compute='_compute_sum2', string="Sum2")
 
+    _sql_constraints = [
+            ('check_offer_price','CHECK(price > 0)','A property offer price must be strictly positive.')
+    ]
+
     @api.depends('validity')
     def _compute_date_deadline(self):
         for record in self:
@@ -51,4 +55,17 @@ def _compute_sum(self):
     def _compute_sum2(self):
         for record in self:
             record.sum2 = 7 + record.sum
+
+    def action_accept(self):
+            self.status = 'accepted'
+            self.property_id.buyer_id = self.partner_id
+            self.property_id.selling_price = self.price
+
+    def action_refuse(self):
+            if(self.status == 'accepted'):
+                self.status = 'refused'
+                self.property_id.buyer_id = False
+                self.property_id.selling_price = False
+            else: 
+                self.status = 'refused'
     
\ No newline at end of file
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index 5723f4e689a..67726632318 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -17,4 +17,7 @@ class estatePropertyTag(models.Model):
     property_ids = fields.Many2many(
         comodel_name='estate.property',
         string='properties'
-    )
\ No newline at end of file
+    )
+    _sql_constraints = [
+            ('check_unique_tag_name','UNIQUE(name)','This tag is already exists.')
+    ]
\ No newline at end of file
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index 25035550b48..ebb302904c6 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -8,6 +8,10 @@ class estatePropertyType(models.Model):
     active = fields.Boolean(Default=False)
     number = fields.Integer()
 
+    _sql_constraints = [
+            ('check_unique_type_name','UNIQUE(name)','This type is already exists.')
+    ]
+
 
 
 
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index a5935258971..75a59e28e15 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -46,7 +46,10 @@
       <field name="model">estate.property</field>
       <field name="arch" type="xml">
          <form string="My New House">
-            <!-- <button string="action_sold" name="action_name" type="object" class="oe_highlight"/> -->
+            <header>
+               <button string="Sold" name="action_sold" type="object"/>
+               <button string="Cancel" name="action_cancelled" type="object" />
+            </header>
             <sheet>
                <group>
                    <group>
@@ -100,11 +103,13 @@
                         <field name="offer_ids">
                            <tree>
                               <field name="price"/>
-                              <field name="status" />
                               <field name="partner_id"/>
                               <field name="property_id" />
                               <field name="validity" />
                               <field name="date_deadline" />
+                              <button string="" name="action_accept" type="object" icon="fa-check" />
+                              <button name="action_refuse" type="object" icon="fa-times" />
+                              <field name="status" />
                            </tree>
                         </field>
                    </page>

From e3806dd99c8f68ef2d9e6a25d17d5e4e45260508 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Sun, 20 Oct 2024 16:48:31 +0530
Subject: [PATCH 05/16] [IMP] estate: completed chapter 11

Chapter 11
- Added inline list view for property types to display offers.
- Implemented statusbar widget to show property states.
- Established default sorting for property and offer models.
- Introduced manual ordering for property types using a sequence field.
- Enabled conditional display of buttons based on property state.
- Applied color decorations to property and offer list views.
- Made estate.property.offer and estate.property.tag list views editable.
- Set default filter for 'Available' properties in the action.
- Improved search functionality for living area filtering.
- Added stat button to property type form to view related offers.
---
 estate/__manifest__.py                       |  1 +
 estate/models/estate_property.py             |  7 ++--
 estate/models/estate_property_offer.py       |  8 ++++
 estate/models/estate_property_tag.py         |  2 +
 estate/models/estate_property_type.py        | 16 +++++++-
 estate/views/estate_menu.xml                 |  2 +-
 estate/views/estate_property_offer_views.xml | 24 +++++++++++
 estate/views/estate_property_tag_views.xml   | 11 ++++-
 estate/views/estate_property_type_views.xml  | 30 +++++++++++---
 estate/views/estate_property_views.xml       | 42 ++++++++++----------
 10 files changed, 110 insertions(+), 33 deletions(-)
 create mode 100644 estate/views/estate_property_offer_views.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index b39f63e01ef..d76ec0ea22f 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -9,6 +9,7 @@
     'data': [
         'security/ir.model.access.csv',
         'views/estate_property_type_views.xml',
+        'views/estate_property_offer_views.xml',
         'views/estate_property_tag_views.xml',
         'views/estate_property_views.xml',
         'views/estate_menu.xml'
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 0005992079f..738166658d4 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -5,6 +5,8 @@
 class estateProperty(models.Model):
         _name = "estate.property"
         _description = "This is property Table."
+        _order = "selling_price desc, name"
+        # _order = "number"
 
         name = fields.Char(required=True)
         description = fields.Text()
@@ -29,7 +31,7 @@ class estateProperty(models.Model):
         active = fields.Boolean(default=True)
         state = fields.Selection(
             string = 'State',
-            selection = [('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
+            selection = [('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
             help = "Offer available in five type.",
             required=True,
             copy=False,
@@ -39,8 +41,7 @@ class estateProperty(models.Model):
                 comodel_name='estate.property.type',
                 string='Property Type',
                 domain="[('number', '>=', 0)]",
-                ondelete='cascade',
-                store=False # 3 option: cascade, set null, restrict
+                ondelete='cascade' # 3 option: cascade, set null, restrict
                 # index, traking, store, compute, related
         )
         seller_id = fields.Many2one(
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 2316f4be50d..fc4382ad40b 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -5,6 +5,7 @@ class estatePropertyOffer(models.Model):
 
     _name = "estate.property.offer"
     _description = "This is offer table"
+    _order = "id desc"
 
     price = fields.Float(required=True)
     status = fields.Selection(
@@ -30,6 +31,13 @@ class estatePropertyOffer(models.Model):
             ('check_offer_price','CHECK(price > 0)','A property offer price must be strictly positive.')
     ]
 
+    property_type_id = fields.Many2one(
+        comodel_name="estate.property.type",
+        related="property_id.property_type_id",
+        store=True
+    )
+    
+
     @api.depends('validity')
     def _compute_date_deadline(self):
         for record in self:
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index 67726632318..810e6869270 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -4,6 +4,7 @@ class estatePropertyTag(models.Model):
     
     _name = "estate.property.tag"
     _description = "This is property Tag model"
+    _order = "name"
 
     name = fields.Char(required=True, string="Tag")
     active = fields.Boolean(required=True)
@@ -18,6 +19,7 @@ class estatePropertyTag(models.Model):
         comodel_name='estate.property',
         string='properties'
     )
+    color = fields.Integer(default=12)
     _sql_constraints = [
             ('check_unique_tag_name','UNIQUE(name)','This tag is already exists.')
     ]
\ No newline at end of file
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index ebb302904c6..0b92ca41ea5 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -1,16 +1,28 @@
-from odoo import models, fields # type: ignore
+from odoo import models, fields, api # type: ignore
 
 class estatePropertyType(models.Model):
     _name = "estate.property.type"
     _description = "This is property Type table."
+    _order = "sequence, name desc"
 
     name = fields.Char(required=True)
-    active = fields.Boolean(Default=False)
+    _order = "name"
+    active = fields.Boolean(default=True)
     number = fields.Integer()
+    sequence = fields.Integer('Sequence', default=5)
+
+    property_ids = fields.One2many('estate.property', 'property_type_id', string='Property')
+    offer_ids = fields.One2many('estate.property.offer', 'property_type_id')
+    offer_count = fields.Integer(compute="_compute_offer_count")
 
     _sql_constraints = [
             ('check_unique_type_name','UNIQUE(name)','This type is already exists.')
     ]
+    
+    @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/estate_menu.xml b/estate/views/estate_menu.xml
index cec9c7cf392..8a52b7b11ae 100644
--- a/estate/views/estate_menu.xml
+++ b/estate/views/estate_menu.xml
@@ -52,7 +52,7 @@
 
         <menuitem id="estate_menu_first_level_private" name="Advertisements" sequence="3">
             
-            <menuitem id="estate_menu_second_level_private" action="estate_private_action"/>
+            <menuitem id="estate_menu_second_level_private" action="estate_property_action"/>
         
         </menuitem>
 
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
new file mode 100644
index 00000000000..0a99252b5f9
--- /dev/null
+++ b/estate/views/estate_property_offer_views.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="estate_property_offer_action" model="ir.actions.act_window">
+        <field name="name">Offers</field>
+        <field name="res_model">estate.property.offer</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('property_type_id','=',active_id)]</field>
+    </record>
+
+    <record id="estate_property_offer_view_tree" model="ir.ui.view">
+        <field name="name">estate_property_offer_view_tree</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <tree decoration-success="status == 'accepted'" decoration-danger="status == 'refused'">
+                <field name="price"></field>
+                <field name="status"></field>
+                <field name="partner_id"></field>
+                <field name="property_id"></field>
+                <field name="validity"></field>
+                <field name="date_deadline"></field>
+            </tree>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
index 3cbe63e898c..291aae11687 100644
--- a/estate/views/estate_property_tag_views.xml
+++ b/estate/views/estate_property_tag_views.xml
@@ -5,11 +5,20 @@
         <field name="res_model">estate.property.tag</field>
         <field name="view_mode">tree,form</field>
     </record>
+    <!-- <record id="estate_property_tag_view_tree" model="ir.ui.view">
+        <field name="name">estate_property_tag_view_tree</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <tree editable="true">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record> -->
     <record id="estate_property_tag_view_form" model="ir.ui.view">
         <field name="name">estate_property_tag_view_form</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">
-            <form string="">
+            <form>
                 <sheet>
                     <group>
                         <field name="name"/>
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
index 2ab8c5b0349..529a9617ed3 100644
--- a/estate/views/estate_property_type_views.xml
+++ b/estate/views/estate_property_type_views.xml
@@ -11,23 +11,41 @@
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
             <tree string="Property Type">
+                <field name="sequence" widget="handle"/>
                 <field name="name"/>
                 <field name="number" />
             </tree>
         </field>
     </record>
 
-    <!-- <record id="estate_property_type_view_form" model="ir.ui.view">
+    <record id="estate_property_type_view_form" model="ir.ui.view">
         <field name="name">estate_property_type_view_form</field>
         <field name="model">estate.property.type</field>
         <field name="arch" type="xml">
-            <form string="Property Type">
+            <form>
                 <sheet>
-                    <group>
-                        fie
-                    </group>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="%(estate_property_offer_action)d" type="action" class="oe_stat_button" icon="fa-money">
+                            <field name="offer_count" string="Offers" widget="statinfo"/>
+                        </button>
+                    </div>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <field name="active" string="Active"/>
+                    <notebook>
+                        <page string="Properties">
+                            <field name="property_ids">
+                                <tree create="False">
+                                    <field name="name" string="Title"/>
+                                    <field name="expected_price"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
-    </record> -->
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 75a59e28e15..6264093d780 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -4,9 +4,10 @@
         <field name="name">Properties</field>
         <field name="res_model">estate.property</field>
         <field name="view_mode">list,form</field>
+        <field name="context">{'search_default_state' : True}</field>
     </record>
 
-    <record id="estate_private_action" model="ir.actions.act_window">
+    <!-- <record id="estate_private_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>
@@ -22,13 +23,13 @@
         <field name="name">Custom</field>
         <field name="res_model">estate.property</field>
         <field name="view_mode">list,form</field>
-     </record>
+     </record> -->
 
      <record id="estate_property_view_tree" model="ir.ui.view">
         <field name="name">estate_property_view_tree</field>
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
-            <tree string="list_tree">
+            <tree string="list_tree" default_order="expected_price desc, name desc" decoration-success="state == 'offer received' or state == 'offer accepted'" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
                 <field name="name"/>
                 <!-- <field name="expected_price" invisible="1"/> -->
                 <!-- <field name="active" invisible="122" /> -->
@@ -37,6 +38,7 @@
                 <field name="selling_price" />
                 <field name="state" />
                 <field name="best_offer" />
+                <field name="data_availability" optional="true" />
             </tree>
         </field>
      </record>
@@ -47,14 +49,15 @@
       <field name="arch" type="xml">
          <form string="My New House">
             <header>
-               <button string="Sold" name="action_sold" type="object"/>
-               <button string="Cancel" name="action_cancelled" type="object" />
+               <button string="Sold" name="action_sold" type="object" class="oe_highlight" invisible="state == 'sold' or state == 'cancelled'" />
+               <button string="Cancel" name="action_cancelled" type="object" invisible="state == 'sold' or state == 'cancelled'" />
+               <field name="state" widget="statusbar" options="{'clickable':'1'}"/>
             </header>
             <sheet>
                <group>
                    <group>
-                        <field name="tag_ids" widget="many2many_tags" />
-                        <field name="property_type_id"/>
+                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                        <field name="property_type_id" options="{'no_create': true}" />
                        <field name="name"/>
                        <field name="expected_price"/>
                    </group>
@@ -76,8 +79,8 @@
                            <group>
                               <field name="name"/>
                               <field name="expected_price"/>
-                              <field name="garden_area" />
-                              <field name="garden_orientation" />
+                              <field name="garden_area" invisible="not garden" />
+                              <field name="garden_orientation" invisible="not garden"/>
                               <field name="living_area" />
                            </group>
                            <group>
@@ -100,15 +103,15 @@
                      </group>
                    </page>
                    <page string="Offer">
-                        <field name="offer_ids">
-                           <tree>
+                        <field name="offer_ids" readonly="state == 'offer accepted' or state == 'sold' or state == 'cancelled'" >
+                           <tree editable="true" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'" >
                               <field name="price"/>
                               <field name="partner_id"/>
                               <field name="property_id" />
                               <field name="validity" />
                               <field name="date_deadline" />
-                              <button string="" name="action_accept" type="object" icon="fa-check" />
-                              <button name="action_refuse" type="object" icon="fa-times" />
+                              <button name="action_accept" type="object" icon="fa-check" invisible="status == 'accepted' or status == 'refused'" />
+                              <button name="action_refuse" type="object" icon="fa-times" invisible="status == 'accepted' or status == 'refused'" />
                               <field name="status" />
                            </tree>
                         </field>
@@ -124,15 +127,14 @@
       <field name="model">estate.property</field>
       <field name="arch" type="xml">
          <search string="Test">
-            <field name="name" string="Carrer" />
-            <!-- <separator/> -->
+            <field name="name" string="Name" />
             <field name="selling_price" />
-            <field name="expected_price" />
-            <filter name="expected_price" string="Expected Price" domain="[('expected_price', '&lt;=', '0')]" />
-            <group expand="1" string="Group By">
+            <field name="expected_price" string="Expected Price" />
+            <field string="Living Area" name="living_area" filter_domain="[('living_area','>=',self)]" />
+            <filter string="Available" name="state" domain="['|',('state','=','new'),('state','=','sold')]" />
+            <group expand="true" string="Group By">
                <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"/>
-               <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms', 'residual_visible':True}"/> 
-               <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms', 'residual_visible':True}"/>
+               <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms'}"/> 
             </group>
          </search>
       </field>

From 87e485599d34d7105c8ba1edce700a3ee177a7ed Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Tue, 22 Oct 2024 10:54:40 +0530
Subject: [PATCH 06/16] [IMP] estate: complete chapter 12, 13, 14

- Prevent deletion of properties unless their state is 'New' or 'Canceled'.
- Ensure that new offers cannot be created with a price lower than existing
offers and setting the state to 'Offer Received' upon creation.
- Introduce a property_ids field in the res.users model, establishing a
one-to-many relationship with properties, and applying a domain filter to
show only properties in states 'New' or 'Offer Received'.
- Extend the user form view to include the property_ids in a new notebook page.

- Created a new module to connect the real estate and invoicing.
- Modified the property sold action to automatically create a customer
invoice with two line items.

- Created a basic Kanban view to display property names in clickable cards.
- Added fields for expected price, best price, selling price, and tags, with
conditional visibility for prices.
- Grouped properties by type by default and disabled drag-and-drop functionality.
---
 estate/__manifest__.py                      |  4 +-
 estate/models/__init__.py                   |  3 +-
 estate/models/estate_property.py            | 10 +++-
 estate/models/estate_property_offer.py      | 59 ++++++++++-----------
 estate/models/estate_property_tag.py        | 11 ++--
 estate/models/estate_property_type.py       | 14 ++++-
 estate/models/res_users.py                  | 10 ++++
 estate/models/test_estate_property_offer.py | 23 --------
 estate/models/test_model.py                 |  5 --
 estate/security/ir.model.access.csv         |  1 -
 estate/views/estate_property_tag_views.xml  |  1 -
 estate/views/estate_property_views.xml      | 37 ++++++++++++-
 estate/views/res_users_views.xml            | 15 ++++++
 estate_account/__init__.py                  |  1 +
 estate_account/__manifest__.py              | 12 +++++
 estate_account/models/__init__.py           |  1 +
 estate_account/models/estate_property.py    | 32 +++++++++++
 17 files changed, 167 insertions(+), 72 deletions(-)
 create mode 100644 estate/models/res_users.py
 delete mode 100644 estate/models/test_estate_property_offer.py
 delete mode 100644 estate/models/test_model.py
 create mode 100644 estate/views/res_users_views.xml
 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_property.py

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index d76ec0ea22f..22d09fa903b 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -8,8 +8,10 @@
     # data files always loaded at installation
     'data': [
         'security/ir.model.access.csv',
-        'views/estate_property_type_views.xml',
+        
+        'views/res_users_views.xml',
         'views/estate_property_offer_views.xml',
+        'views/estate_property_type_views.xml',
         'views/estate_property_tag_views.xml',
         'views/estate_property_views.xml',
         'views/estate_menu.xml'
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index 525b3559722..a9459ed5906 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -1,6 +1,5 @@
-from . import test_model
 from . import estate_property
 from . import estate_property_type
 from . import estate_property_tag
 from . import estate_property_offer
-from . import test_estate_property_offer
+from . import res_users
\ No newline at end of file
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 738166658d4..6be7eb47e2e 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -63,7 +63,8 @@ class estateProperty(models.Model):
         # estate_property_tag_rel automatically made
         offer_ids = fields.One2many(
                 'estate.property.offer', 
-                'property_id'
+                'property_id',
+                ondelete='restrict'
         )
         number = fields.Integer(related='property_type_id.number')
         totalArea = fields.Integer(compute='_compute_total_area', store=True)
@@ -126,5 +127,10 @@ def _check_selling_price(self):
                         if record.selling_price < (0.9 * record.expected_price) and (record.selling_price > 0):
                                raise ValidationError("Selling price cannot be lower than 90 percentage of the expected price.")
 
-        
+        # @api.ondelete(at_uninstall=False)
+        def _gfgfg(self):
+                for record in self:
+                        if record.state not in ("new", "cancelled"):
+                                raise UserError("You can not delete a property which are in offer received, offer accepted or sold state.")
+
                         
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index fc4382ad40b..cdfb16f53be 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -1,5 +1,6 @@
-from odoo import models, fields, api # type: ignore
+from odoo import models, fields, api
 from datetime import timedelta, datetime
+from odoo.exceptions import UserError
 
 class estatePropertyOffer(models.Model):
 
@@ -8,46 +9,29 @@ class estatePropertyOffer(models.Model):
     _order = "id desc"
 
     price = fields.Float(required=True)
-    status = fields.Selection(
-        string='Status',
-        selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
-    )
-    partner_id = fields.Many2one(
-        'res.partner',
-        string='Buyer',
-        required=True
-    )
-    property_id = fields.Many2one(
-        'estate.property',
-        string='Property',
-        ondelete='set null'
-    )
+    status = fields.Selection(string='Status', selection=[('accepted', 'Accepted'), ('refused', 'Refused')])
     validity = fields.Integer(default=7, string="Validity")
-    date_deadline = fields.Date(compute='_compute_date_deadline', inverse='_compute_validity', string="Date Deadline")
+    date_deadline = fields.Date(compute='_compute_deadline', inverse='_inverse_deadline', string="Date Deadline")
     sum = fields.Integer(compute='_compute_sum', string="Sum")
     sum2 = fields.Integer(compute='_compute_sum2', string="Sum2")
 
+    partner_id = fields.Many2one('res.partner', string='Buyer', required=True)
+    property_id = fields.Many2one('estate.property', string='Property')
+    property_type_id = fields.Many2one(comodel_name="estate.property.type", related="property_id.property_type_id", store=True)
+    
     _sql_constraints = [
             ('check_offer_price','CHECK(price > 0)','A property offer price must be strictly positive.')
     ]
 
-    property_type_id = fields.Many2one(
-        comodel_name="estate.property.type",
-        related="property_id.property_type_id",
-        store=True
-    )
-    
-
     @api.depends('validity')
-    def _compute_date_deadline(self):
+    def _compute_deadline(self):
         for record in self:
             if record.create_date:
                 record.date_deadline = record.create_date + timedelta(record.validity)
             else:
                 record.date_deadline = datetime.today() + timedelta(record.validity)
 
-    @api.depends('date_deadline') 
-    def _compute_validity(self):
+    def _inverse_deadline(self):
         for record in self:
             if record.date_deadline and record.create_date:
                 record.validity = (record.date_deadline - record.create_date.date()).days
@@ -65,9 +49,17 @@ def _compute_sum2(self):
             record.sum2 = 7 + record.sum
 
     def action_accept(self):
-            self.status = 'accepted'
-            self.property_id.buyer_id = self.partner_id
-            self.property_id.selling_price = self.price
+        for record in self:
+            if record.property_id.state in ['sold', 'offer accepted']:
+                raise UserError("Already one offer is accepted.")
+
+            if record.status == 'accepted':
+                continue
+
+            record.status = 'accepted'
+            record.property_id.state = 'offer accepted'
+            record.property_id.buyer_id = self.partner_id
+            record.property_id.selling_price = self.price
 
     def action_refuse(self):
             if(self.status == 'accepted'):
@@ -76,4 +68,11 @@ def action_refuse(self):
                 self.property_id.selling_price = False
             else: 
                 self.status = 'refused'
-    
\ No newline at end of file
+    
+    @api.model
+    def create(self, offer):
+        property_id = self.env["estate.property"].browse(offer["property_id"])
+        if offer["price"] < max(property_id.offer_ids.mapped("price") + [0]):
+            raise UserError("Offer price must be higher than existing offer.")
+        property_id.state = "offer received"
+        return super().create(offer)
\ No newline at end of file
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index 810e6869270..680c8981191 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -15,10 +15,13 @@ class estatePropertyTag(models.Model):
     #             column1='property_id',
     #             column2='tag_id'
     #     )
-    property_ids = fields.Many2many(
-        comodel_name='estate.property',
-        string='properties'
-    )
+    # property_ids = fields.Many2many(
+    #     comodel_name='estate.property',
+    #     string='properties'
+    # )
+
+    # property_type_id = 
+
     color = fields.Integer(default=12)
     _sql_constraints = [
             ('check_unique_tag_name','UNIQUE(name)','This tag is already exists.')
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index 0b92ca41ea5..95b9c594f1a 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -8,12 +8,19 @@ class estatePropertyType(models.Model):
     name = fields.Char(required=True)
     _order = "name"
     active = fields.Boolean(default=True)
-    number = fields.Integer()
+    number = fields.Integer(default=10)
     sequence = fields.Integer('Sequence', default=5)
 
     property_ids = fields.One2many('estate.property', 'property_type_id', string='Property')
     offer_ids = fields.One2many('estate.property.offer', 'property_type_id')
+#     tag_ids = fields.Many2many(
+#         comodel_name= 'estate.property.tag',
+#         relation='type_join_tag',
+#         column1='type_id',
+#         column2='tag_id'
+#     )
     offer_count = fields.Integer(compute="_compute_offer_count")
+#     tag_count = fields.Integer(compute="_compute_tag_count")
 
     _sql_constraints = [
             ('check_unique_type_name','UNIQUE(name)','This type is already exists.')
@@ -24,6 +31,11 @@ def _compute_offer_count(self):
         for record in self:
                 record.offer_count = len(record.offer_ids)
 
+    @api.depends('tag_ids')
+    def _compute_tag_count(self):
+        for record in self:
+                record.tag_count = len(record.tag_ids)
+
 
 
 
diff --git a/estate/models/res_users.py b/estate/models/res_users.py
new file mode 100644
index 00000000000..a3d674d6181
--- /dev/null
+++ b/estate/models/res_users.py
@@ -0,0 +1,10 @@
+from odoo import fields, models
+
+class resUser(models.Model):
+    _inherit = "res.users"
+
+    property_ids = fields.One2many(
+        comodel_name="estate.property",
+        inverse_name="seller_id",
+        domain=[('state','in',['new','offer received'])]
+    )
\ No newline at end of file
diff --git a/estate/models/test_estate_property_offer.py b/estate/models/test_estate_property_offer.py
deleted file mode 100644
index 97ef8cfae5e..00000000000
--- a/estate/models/test_estate_property_offer.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from odoo import models, fields # type: ignore
-
-class TestEstatePropertyOffer(models.Model):
-    _name = "test.estate.property.offer"
-    _description = "This is test offer Table."
-    
-    test_price = fields.Float(required=True)
-    test_status = fields.Selection(
-        string='Status',
-        selection=[('accepted', 'Accepted'), ('refused', 'Refused')],
-        copy=False,
-        help="status of offer"
-    )
-    test_partner_id = fields.Many2one(
-        'res.partner',
-        required=True
-    )
-    test_property_id = fields.Many2one(
-        'estate.property',
-        required=True
-    )
-
-    
diff --git a/estate/models/test_model.py b/estate/models/test_model.py
deleted file mode 100644
index babc2190671..00000000000
--- a/estate/models/test_model.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from odoo import models, fields # type: ignore
-
-class TestModel(models.Model):
-    _name = "test.model"
-    _description = "This is test Table."
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index f5db56aa0bb..c097c4b42cb 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -3,5 +3,4 @@ access_estate_property,access_estate_property,model_estate_property,base.group_u
 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
-test_access_estate_property_offer,access_test_estate_property_offer,model_test_estate_property_offer,base.group_user,1,1,1,1
 
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
index 291aae11687..46e05181d76 100644
--- a/estate/views/estate_property_tag_views.xml
+++ b/estate/views/estate_property_tag_views.xml
@@ -23,7 +23,6 @@
                     <group>
                         <field name="name"/>
                         <field name="active"/>
-                        <!-- <field name="property_ids"/> -->
                     </group>
                 </sheet>
             </form>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 6264093d780..57f48df453e 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -3,7 +3,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="view_mode">list,form</field>
+        <field name="view_mode">list,form,kanban</field>
         <field name="context">{'search_default_state' : True}</field>
     </record>
 
@@ -60,6 +60,7 @@
                         <field name="property_type_id" options="{'no_create': true}" />
                        <field name="name"/>
                        <field name="expected_price"/>
+                       <field name="buyer_id" />
                    </group>
                    <group>
                       <field name="state"/>
@@ -122,6 +123,39 @@
       </field>
      </record>
 
+     <record id="estate_property_view_kanban" model="ir.ui.view">
+      <field name="name">estate.property.view.kanban</field>
+      <field name="model">estate.property</field>
+      <field name="arch" type="xml">
+         <kanban default_group_by="property_type_id" records_draggable="False">
+            <field name="state"/>
+            <templates>
+               <t t-name="kanban-box">
+                  <div class="oe_kanban_global_click">
+                     <h3>
+                        <field name="name"/>
+                     </h3>
+                     <div>
+                        Expected Price:
+                        <field name="expected_price"/>
+                     </div>
+                     <div t-if="record.state.raw_value == 'offer received'" >
+                        Best Offer Price:
+                        <field name="best_offer"/>
+                     </div>
+                     <div t-if="record.state.raw_value == 'offer accepted'" >
+                        Selling price:
+                        <field name="selling_price"/>
+                     </div>
+                     <div style="margin-top: 10px;"></div>
+                     <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                  </div>
+               </t>
+            </templates>
+         </kanban>
+      </field>
+     </record>
+     
      <record id="estate_property_view_search" model="ir.ui.view">
       <field name="name">estate_property_view_search</field>
       <field name="model">estate.property</field>
@@ -140,5 +174,4 @@
       </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..0ffeefd3694
--- /dev/null
+++ b/estate/views/res_users_views.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="res_user_views_form" model="ir.ui.view">
+        <field name="name">res_user_views_form</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="arch" type="xml">
+            <page name="preferences" position="before">
+                <page name="estate" string="Real Estate Properties">
+                    <field name="property_ids"/>
+                </page>
+            </page>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate_account/__init__.py b/estate_account/__init__.py
new file mode 100644
index 00000000000..9a7e03eded3
--- /dev/null
+++ b/estate_account/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
new file mode 100644
index 00000000000..6d3b60d89e6
--- /dev/null
+++ b/estate_account/__manifest__.py
@@ -0,0 +1,12 @@
+{
+    'name': "Estate Account",
+    'depends': ['estate', 'account'],
+    'author': "Sahil Mangukiya",
+    'description': "This is a estate account module.",
+    'data': [
+    ],
+    'demo': [
+    ],
+    'installable': True,
+    'application': False, 
+}
\ No newline at end of file
diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py
new file mode 100644
index 00000000000..f4c8fd6db6d
--- /dev/null
+++ b/estate_account/models/__init__.py
@@ -0,0 +1 @@
+from . import estate_property
\ No newline at end of file
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
new file mode 100644
index 00000000000..17bff665f1e
--- /dev/null
+++ b/estate_account/models/estate_property.py
@@ -0,0 +1,32 @@
+from odoo import fields, models, Command
+
+class estateProperty(models.Model):
+
+    _inherit = 'estate.property'
+
+    def action_sold(self):
+        supper_call = super().action_sold()
+
+        invoice_price = {
+            "name": self.name,
+            "quantity": 1,
+            "price_unit": self.selling_price * 1.06
+        }
+
+        invoice_administrative_fees = {
+            "name": "Administrative Fees",
+            "quantity": 1,
+            "price_unit": 100.00
+        }
+
+        self.env["account.move"].create({
+            "name": self.name + " Invoice",
+            "partner_id": self.buyer_id.id,
+            "move_type": "out_invoice",
+            "invoice_line_ids": [
+                Command.create(invoice_price),
+                Command.create(invoice_administrative_fees)
+            ]
+        }) 
+
+        return supper_call
\ No newline at end of file

From 7d59de09ade3be1553159d2dd9e17c77e1165a91 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Tue, 22 Oct 2024 20:19:52 +0530
Subject: [PATCH 07/16] [IMP] estate: define module data chapter completed

- Added standard Real Estate Property Types: Residential, Commercial,
Industrial, and Land.
- Created demo data for the estate module with properties like Big Villa and
Trailer Home.
- Created demo data offers for properties, using partners (use ref) defined in
base.
- Set Property Type to Residential for both demo properties (use ref).
- Validated one demo offer and refused the others using the function and eval.
- Created a new Property with offers added directly to the One2many field using
Command methods.
---
 estate/__init__.py                           |   4 +-
 estate/__manifest__.py                       |   9 +-
 estate/data/estate.property.type.csv         |   5 +
 estate/demo/estate_property_demo.xml         | 122 +++++++++
 estate/models/__init__.py                    |   2 +-
 estate/models/estate_property.py             |  89 ++-----
 estate/models/estate_property_offer.py       |   6 +-
 estate/models/estate_property_tag.py         |  20 +-
 estate/models/estate_property_type.py        |  26 +-
 estate/models/res_users.py                   |   7 +-
 estate/views/estate_menu.xml                 |  62 +----
 estate/views/estate_property_offer_views.xml |  14 +-
 estate/views/estate_property_tag_views.xml   |  44 +++-
 estate/views/estate_property_type_views.xml  |  20 +-
 estate/views/estate_property_views.xml       | 260 ++++++++-----------
 estate/views/res_users_views.xml             |  16 +-
 estate_account/__init__.py                   |   2 +-
 estate_account/__manifest__.py               |   4 +-
 estate_account/models/__init__.py            |   2 +-
 estate_account/models/estate_property.py     |   8 +-
 20 files changed, 369 insertions(+), 353 deletions(-)
 create mode 100644 estate/data/estate.property.type.csv
 create mode 100644 estate/demo/estate_property_demo.xml

diff --git a/estate/__init__.py b/estate/__init__.py
index 5305644df14..0650744f6bc 100644
--- a/estate/__init__.py
+++ b/estate/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
-from . import models
\ No newline at end of file
+from . import models
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 22d09fa903b..e2ad0a9348c 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -1,14 +1,11 @@
 {
     'name': "Real State",
-    # 'version': '1.0',
     'depends': ['base'],
     'author': "Sahil Mangukiya",
-    # 'category': 'Category',
     'description': "This is my First tutorial module.",
-    # data files always loaded at installation
     'data': [
         'security/ir.model.access.csv',
-        
+        'data/estate.property.type.csv',
         'views/res_users_views.xml',
         'views/estate_property_offer_views.xml',
         'views/estate_property_type_views.xml',
@@ -16,10 +13,10 @@
         'views/estate_property_views.xml',
         'views/estate_menu.xml'
     ],
-    # data files containing optionally loaded demonstration data
     'demo': [
+        'demo/estate_property_demo.xml',
     ],
     'installable': True,
     'application': True,
     'auto_install': False
-}
\ No newline at end of file
+}
diff --git a/estate/data/estate.property.type.csv b/estate/data/estate.property.type.csv
new file mode 100644
index 00000000000..74b7279c13e
--- /dev/null
+++ b/estate/data/estate.property.type.csv
@@ -0,0 +1,5 @@
+id,name
+1,"Residential"
+2,"Commercial"
+3,"Industrial"
+4,"Land"
\ No newline at end of file
diff --git a/estate/demo/estate_property_demo.xml b/estate/demo/estate_property_demo.xml
new file mode 100644
index 00000000000..05146107133
--- /dev/null
+++ b/estate/demo/estate_property_demo.xml
@@ -0,0 +1,122 @@
+<odoo>
+    <data noupdate="0">
+    
+        <record id="id1" model="estate.property">
+            <field name="name">Big villa</field>
+            <field name="state">new</field>
+            <field name="description">A nice and big villa</field>
+            <field name="postcode">12345</field>
+            <field name="data_availability">2020-02-02</field>
+            <field name="expected_price">1600000</field>
+            <field name="bedrooms">6</field>
+            <field name="living_area">100</field>
+            <field name="facades">4</field>
+            <field name="garage">True</field>
+            <field name="garden">True</field>
+            <field name="garden_area">100000</field>
+            <field name="garden_orientation">south</field>
+            <field name="property_type_id" ref="1"/>
+        </record>
+
+        <record id="id2" model="estate.property">
+            <field name="name">Trailer home</field>
+            <field name="state">cancelled</field>
+            <field name="description">Home in a trailer park</field>
+            <field name="postcode">54321</field>
+            <field name="data_availability">1970-01-01</field>
+            <field name="expected_price">100000</field>
+            <field name="selling_price">120000</field>
+            <field name="bedrooms">1</field>
+            <field name="living_area">10</field>
+            <field name="facades">4</field>
+            <field name="garage">False</field>
+            <field name="property_type_id" ref="1"/>
+        </record>
+
+        <record id="id3" model="estate.property">
+            <field name="name">Sahil's Land</field>
+            <field name="state">new</field>
+            <field name="description">This is my land, Don't play cricket!!</field>
+            <field name="postcode">12345</field>
+            <field name="data_availability">2020-02-02</field>
+            <field name="expected_price">100</field>
+            <field name="bedrooms">30</field>
+            <field name="living_area">100</field>
+            <field name="facades">4</field>
+            <field name="garage">True</field>
+            <field name="garden">True</field>
+            <field name="garden_area">100000</field>
+            <field name="garden_orientation">south</field>
+            <field name="property_type_id" ref="4"/>
+            <field name="offer_ids" eval="[
+                Command.create({
+                    'partner_id': ref('base.res_partner_12'),
+                    'price': 92,
+                    'validity': 100
+                }),
+                Command.create({
+                    'partner_id': ref('base.res_partner_2'),
+                    'price': 94,
+                    'validity': 100
+            })]"/>
+        </record>
+
+        <record id="offer_1" model="estate.property.offer">
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="price">1600000</field>
+            <field name="property_id" ref="id1"/>
+            <field name="validity">14</field>
+        </record>
+
+        <record id="offer_2" model="estate.property.offer">
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="price">1600001</field>
+            <field name="property_id" ref="id1"/>
+            <field name="validity">14</field>
+        </record>
+
+        <record id="offer_3" model="estate.property.offer">
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="price">1600002</field>
+            <field name="property_id" ref="id1"/>
+            <field name="validity">14</field>
+        </record>
+
+        <record id="offer_4" model="estate.property.offer">
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="price">100001</field>
+            <field name="property_id" ref="id2"/>
+            <field name="validity">7</field>
+        </record>
+
+        <record id="offer_5" model="estate.property.offer">
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="price">100002</field>
+            <field name="property_id" ref="id2"/>
+            <field name="validity">7</field>
+            
+        </record>
+        
+        <function model="estate.property.offer" name="action_accept">
+            <value eval="[ref('offer_1')]"/>
+        </function>
+
+        <function model="estate.property.offer" name="action_refuse">
+            <value eval="[ref('offer_2')]"/>
+        </function>
+
+        <function model="estate.property.offer" name="action_refuse">
+            <value eval="[ref('offer_3')]"/>
+        </function>
+
+        <function model="estate.property.offer" name="action_accept">
+            <value eval="[ref('offer_4')]"/>
+        </function>
+
+        <function model="estate.property.offer" name="action_refuse">
+            <value eval="[ref('offer_5')]"/>
+        </function>
+
+    </data>
+       
+</odoo>
\ No newline at end of file
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index a9459ed5906..9a2189b6382 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -2,4 +2,4 @@
 from . import estate_property_type
 from . import estate_property_tag
 from . import estate_property_offer
-from . import res_users
\ No newline at end of file
+from . import res_users
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 6be7eb47e2e..e6ca8037003 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -1,20 +1,18 @@
-from odoo import models, fields, api # type: ignore
 from datetime import timedelta
+
+from odoo import models, fields, api
 from odoo.exceptions import UserError, ValidationError
 
+
 class estateProperty(models.Model):
         _name = "estate.property"
         _description = "This is property Table."
         _order = "selling_price desc, name"
-        # _order = "number"
 
         name = fields.Char(required=True)
         description = fields.Text()
         postcode = fields.Char()
-        data_availability = fields.Date(
-            default=lambda self: fields.Date.today() + timedelta(days=90),
-            copy=False
-        )
+        data_availability = fields.Date(default=lambda self: fields.Date.today() + timedelta(days=90), copy=False)
         expected_price = fields.Float(required=True)
         selling_price = fields.Float(readonly=True, copy=False)
         bedrooms = fields.Integer(change_default=True)
@@ -24,74 +22,41 @@ class estateProperty(models.Model):
         garden = fields.Boolean()
         garden_area = fields.Integer()
         garden_orientation = fields.Selection(
-            string = 'Orientation',
-            selection = [('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
-            help = "Garden Orientation is avialable in four faces of direction."
+            string='Orientation',
+            selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
+            help="Garden Orientation is avialable in four faces of direction."
         )
         active = fields.Boolean(default=True)
         state = fields.Selection(
-            string = 'State',
-            selection = [('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
-            help = "Offer available in five type.",
+            string='State',
+            selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
+            help="Offer available in five type.",
             required=True,
             copy=False,
-            default='new' 
-        )
-        property_type_id = fields.Many2one(
-                comodel_name='estate.property.type',
-                string='Property Type',
-                domain="[('number', '>=', 0)]",
-                ondelete='cascade' # 3 option: cascade, set null, restrict
-                # index, traking, store, compute, related
-        )
-        seller_id = fields.Many2one(
-                'res.users',
-                'Salesman',
-                default=lambda self: self.env.user
-        )
-        buyer_id = fields.Many2one(
-                'res.partner',
-                'Buyer'
-        )
-        tag_ids = fields.Many2many(
-                comodel_name='estate.property.tag',
-                string='Tag',
-                relation='property_join_tag',
-                column1='property_id',
-                column2='tag_id'
-        )
-        # estate_property_tag_rel automatically made
-        offer_ids = fields.One2many(
-                'estate.property.offer', 
-                'property_id',
-                ondelete='restrict'
+            default='new'
         )
         number = fields.Integer(related='property_type_id.number')
-        totalArea = fields.Integer(compute='_compute_total_area', store=True)
-        percentage_garden = fields.Float(compute='_compute_total_area')
-        percentage_living = fields.Float(compute='_compute_total_area')
-
+        totalArea = fields.Integer(compute='_compute_total_area', store="true")
         best_offer = fields.Float(compute='_compute_best_offer')
 
+        property_type_id = fields.Many2one(comodel_name='estate.property.type', string='Property Type', domain="[('number', '>=', 0)]", ondelete='cascade')
+        seller_id = fields.Many2one('res.users', 'Salesman', default=lambda self: self.env.user)
+        buyer_id = fields.Many2one('res.partner', 'Buyer')
+        tag_ids = fields.Many2many(comodel_name='estate.property.tag', string='Tag', relation='property_join_tag', column1='property_id', column2='tag_id')
+        offer_ids = fields.One2many('estate.property.offer', 'property_id')
+
         _sql_constraints = [
-                ('check_selling_price','CHECK(selling_price >= 0)','A property selling price must be positive.'),
-                ('check_expected_price','CHECK(expected_price > 0)','A property expected price must be strictly positive.')
+                ('check_selling_price', 'CHECK(selling_price >= 0)', 'A property selling price must be positive.'), 
+                ('check_expected_price', 'CHECK(expected_price > 0)', 'A property expected price must be strictly positive.')
         ]
 
         @api.depends('garden_area', 'living_area')
         def _compute_total_area(self):
-                self.totalArea = self.garden_area + self.living_area
-                # self.percentage_garden = ((self.garden_area) / (self.totalArea)) * 100
-                # self.percentage_living = ((self.living_area) / (self.totalArea)) * 100
+                for record in self:
+                        record.totalArea = record.garden_area + record.living_area
 
         @api.depends('offer_ids.price')
         def _compute_best_offer(self):
-                # for record in self:
-                #         if record.offer_ids:
-                #                 prices = [line.price for line in record.offer_ids]
-                #                 record.best_offer = max(prices) if prices else 0.0
-                #         else:
-                #                 record.best_offer = 0.0  # Set to 0 if there are no offers
                 for record in self:
                         if record.offer_ids:
                                 record.best_offer = max(record.offer_ids.mapped('price'))
@@ -107,10 +72,6 @@ def _onchange_garden(self):
                         self.garden_area = 0
                         self.garden_orientation = False
 
-
-        # offer = fields.Integer(related='offer_ids.id')
-        # property_record = self.env['estate.property'].browse(1)
-
         def action_sold(self):
                 if(self.state == 'cancelled'):
                         raise UserError("You can not mark a cancelled property as sold.")
@@ -127,10 +88,8 @@ def _check_selling_price(self):
                         if record.selling_price < (0.9 * record.expected_price) and (record.selling_price > 0):
                                raise ValidationError("Selling price cannot be lower than 90 percentage of the expected price.")
 
-        # @api.ondelete(at_uninstall=False)
-        def _gfgfg(self):
+        @api.ondelete(at_uninstall=False)
+        def _prevent_delete(self):
                 for record in self:
                         if record.state not in ("new", "cancelled"):
                                 raise UserError("You can not delete a property which are in offer received, offer accepted or sold state.")
-
-                        
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index cdfb16f53be..5bc2954aa74 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -1,7 +1,9 @@
-from odoo import models, fields, api
 from datetime import timedelta, datetime
+
+from odoo import models, fields, api
 from odoo.exceptions import UserError
 
+
 class estatePropertyOffer(models.Model):
 
     _name = "estate.property.offer"
@@ -52,10 +54,8 @@ def action_accept(self):
         for record in self:
             if record.property_id.state in ['sold', 'offer accepted']:
                 raise UserError("Already one offer is accepted.")
-
             if record.status == 'accepted':
                 continue
-
             record.status = 'accepted'
             record.property_id.state = 'offer accepted'
             record.property_id.buyer_id = self.partner_id
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
index 680c8981191..5988f5c2fab 100644
--- a/estate/models/estate_property_tag.py
+++ b/estate/models/estate_property_tag.py
@@ -1,4 +1,5 @@
-from odoo import models, fields # type: ignore
+from odoo import models, fields
+
 
 class estatePropertyTag(models.Model):
     
@@ -8,21 +9,8 @@ class estatePropertyTag(models.Model):
 
     name = fields.Char(required=True, string="Tag")
     active = fields.Boolean(required=True)
-    # property_ids = fields.Many2many(
-    #             comodel_name='estate.property',
-    #             string='Properrrrty',
-    #             relation='property_join_tag',
-    #             column1='property_id',
-    #             column2='tag_id'
-    #     )
-    # property_ids = fields.Many2many(
-    #     comodel_name='estate.property',
-    #     string='properties'
-    # )
-
-    # property_type_id = 
-
     color = fields.Integer(default=12)
+
     _sql_constraints = [
             ('check_unique_tag_name','UNIQUE(name)','This tag is already exists.')
-    ]
\ No newline at end of file
+    ]
diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py
index 95b9c594f1a..31b225bf68e 100644
--- a/estate/models/estate_property_type.py
+++ b/estate/models/estate_property_type.py
@@ -1,4 +1,5 @@
-from odoo import models, fields, api # type: ignore
+from odoo import models, fields, api
+
 
 class estatePropertyType(models.Model):
     _name = "estate.property.type"
@@ -6,36 +7,19 @@ class estatePropertyType(models.Model):
     _order = "sequence, name desc"
 
     name = fields.Char(required=True)
-    _order = "name"
     active = fields.Boolean(default=True)
     number = fields.Integer(default=10)
     sequence = fields.Integer('Sequence', default=5)
+    offer_count = fields.Integer(compute="_compute_offer_count")
 
     property_ids = fields.One2many('estate.property', 'property_type_id', string='Property')
     offer_ids = fields.One2many('estate.property.offer', 'property_type_id')
-#     tag_ids = fields.Many2many(
-#         comodel_name= 'estate.property.tag',
-#         relation='type_join_tag',
-#         column1='type_id',
-#         column2='tag_id'
-#     )
-    offer_count = fields.Integer(compute="_compute_offer_count")
-#     tag_count = fields.Integer(compute="_compute_tag_count")
-
+    
     _sql_constraints = [
-            ('check_unique_type_name','UNIQUE(name)','This type is already exists.')
+        ('check_unique_type_name', 'UNIQUE(name)', 'This type is already exists.')
     ]
     
     @api.depends('offer_ids')
     def _compute_offer_count(self):
         for record in self:
                 record.offer_count = len(record.offer_ids)
-
-    @api.depends('tag_ids')
-    def _compute_tag_count(self):
-        for record in self:
-                record.tag_count = len(record.tag_ids)
-
-
-
-
diff --git a/estate/models/res_users.py b/estate/models/res_users.py
index a3d674d6181..933b9dcfb69 100644
--- a/estate/models/res_users.py
+++ b/estate/models/res_users.py
@@ -1,10 +1,7 @@
 from odoo import fields, models
 
+
 class resUser(models.Model):
     _inherit = "res.users"
 
-    property_ids = fields.One2many(
-        comodel_name="estate.property",
-        inverse_name="seller_id",
-        domain=[('state','in',['new','offer received'])]
-    )
\ No newline at end of file
+    property_ids = fields.One2many(comodel_name="estate.property", inverse_name="seller_id", domain=[('state', 'in', ['new', 'offer received'])])
diff --git a/estate/views/estate_menu.xml b/estate/views/estate_menu.xml
index 8a52b7b11ae..832a4c0970a 100644
--- a/estate/views/estate_menu.xml
+++ b/estate/views/estate_menu.xml
@@ -1,62 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
     <menuitem id="estate_menu_root" name="Real State">
-
-        <menuitem id="estate_menu_first_level_setting" name="Setting">
-            <menuitem
-                id="estate_property_type_second_level_menu"
-                action="estate_property_type_action"/>
-            
-            <menuitem
-                id="estate_property_tag_second_level_menu"
-                action="estate_property_tag_action"/>
+        <menuitem id="estate_menu_root_first_advertisements" name="Advertisements" sequence="1">
+            <menuitem id="estate_menu_root_first_second_property" action="estate_property_action"/>
         </menuitem>
-        
-        <!-- <menuitem id="estate_menu_first_level_custom" name="Custom" sequence="2">
-            <menuitem id="estate_menu_second_level_Try" name = "Try" action="estate_private_action" sequence="4"/>
-            
-            <menuitem id="estate_menu_second_level_setting" name="Parent" sequence="1" >    
-                <menuitem
-                    id="estate_third_level_setting_SS"
-                    action="estate_private_action" sequence="2"/>
-                
-                <menuitem
-                    id="estate_third_level_setting_second_DFJDK"
-                    name="hello"
-                    action="estate_private34_action" sequence="1"  />
-    
-            </menuitem>
-    
-            <menuitem id="estate_menu_second_level_setting_pp" name="Config" sequence="3">
-                
-                <menuitem id="estate_menu_third_level_setting" name="Sahil" sequence="2">
-    
-                    <menuitem
-                        id="estate_third_level_setting"
-                        action="estate_private_action"/>
-    
-    
-                </menuitem>
-    
-                
-                <menuitem
-                    id="estate_third_level_setting_second"
-                    name="hello"
-                    action="estate_private34_action" sequence="1" />
-    
-            </menuitem>
-            
-            <menuitem id="estate_menu_second_level_custom" action="estate_custom_action"/>
-        
-        </menuitem> -->
-
-        <menuitem id="estate_menu_first_level_private" name="Advertisements" sequence="3">
-            
-            <menuitem id="estate_menu_second_level_private" action="estate_property_action"/>
-        
+        <menuitem id="estate_menu_root_first_setting" name="Setting" sequence="2">
+            <menuitem id="estate_menu_root_first_second_type" action="estate_property_type_action" name="Property Type" sequence="1"/>
+            <menuitem id="estate_menu_root_first_second_tag" action="estate_property_tag_action" name="Property Tag" sequence="2"/>
         </menuitem>
-
-
-    </menuitem>
-    
+    </menuitem> 
 </odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
index 0a99252b5f9..7b2d97f2f8e 100644
--- a/estate/views/estate_property_offer_views.xml
+++ b/estate/views/estate_property_offer_views.xml
@@ -4,7 +4,7 @@
         <field name="name">Offers</field>
         <field name="res_model">estate.property.offer</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('property_type_id','=',active_id)]</field>
+        <field name="domain">[('property_type_id', '=', active_id)]</field>
     </record>
 
     <record id="estate_property_offer_view_tree" model="ir.ui.view">
@@ -12,12 +12,12 @@
         <field name="model">estate.property.offer</field>
         <field name="arch" type="xml">
             <tree decoration-success="status == 'accepted'" decoration-danger="status == 'refused'">
-                <field name="price"></field>
-                <field name="status"></field>
-                <field name="partner_id"></field>
-                <field name="property_id"></field>
-                <field name="validity"></field>
-                <field name="date_deadline"></field>
+                <field name="property_id"/>
+                <field name="partner_id"/>
+                <field name="price"/>
+                <field name="validity"/>
+                <field name="date_deadline"/>
+                <field name="status"/>
             </tree>
         </field>
     </record>
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
index 46e05181d76..96e868d75cc 100644
--- a/estate/views/estate_property_tag_views.xml
+++ b/estate/views/estate_property_tag_views.xml
@@ -1,31 +1,63 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
     <record id="estate_property_tag_action" model="ir.actions.act_window">
-        <field name="name">Property Tag</field>
+        <field name="name">Tag</field>
         <field name="res_model">estate.property.tag</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree,form,kanban</field>
     </record>
-    <!-- <record id="estate_property_tag_view_tree" model="ir.ui.view">
+    <record id="estate_property_tag_view_tree" model="ir.ui.view">
         <field name="name">estate_property_tag_view_tree</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">
-            <tree editable="true">
+            <tree>
                 <field name="name"/>
+                <field name="active"/>
+                <field name="color"/>
             </tree>
         </field>
-    </record> -->
+    </record>
     <record id="estate_property_tag_view_form" model="ir.ui.view">
         <field name="name">estate_property_tag_view_form</field>
         <field name="model">estate.property.tag</field>
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                    <group>
+                    <h3>
                         <field name="name"/>
+                    </h3>
+                    <group>
                         <field name="active"/>
+                        <field name="color" help="Enter a number between 1 to 11 (inclusive)"/>
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
+    <record id="estate_property_tag_view_search" model="ir.ui.view">
+        <field name="name">estate_property_tag_view_search</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <search string="Search Tag">
+                <field name="color" string="Color"/>
+            </search>
+        </field>
+    </record>
+    <record id="estate_property_tag_view_kanban" model="ir.ui.view">
+        <field name="name">estate_property_tag_view_kanban</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="color">
+                <templates>
+                    <t t-name="kanban-box">
+                        <div class="oe_kanban_global_click">
+                            <h3>
+                                <field name="name"/>
+                            </h3>
+                            <field name="active"/>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
index 529a9617ed3..2c174cabcb8 100644
--- a/estate/views/estate_property_type_views.xml
+++ b/estate/views/estate_property_type_views.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
     <record id="estate_property_type_action" model="ir.actions.act_window">
-        <field name="name">Properties Types</field>
+        <field name="name">Types</field>
         <field name="res_model">estate.property.type</field>
         <field name="view_mode">tree,form</field>
     </record>
@@ -13,7 +13,8 @@
             <tree string="Property Type">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>
-                <field name="number" />
+                <field name="active" />
+                <field name="number"/>
             </tree>
         </field>
     </record>
@@ -29,16 +30,21 @@
                             <field name="offer_count" string="Offers" widget="statinfo"/>
                         </button>
                     </div>
-                    <h1>
+                    <h3>
                         <field name="name"/>
-                    </h1>
-                    <field name="active" string="Active"/>
+                    </h3>
+                    <group>
+                        <field name="active"/>
+                    </group>
                     <notebook>
                         <page string="Properties">
                             <field name="property_ids">
-                                <tree create="False">
-                                    <field name="name" string="Title"/>
+                                <tree create="False" decoration-success="state == 'offer received' or state == 'offer accepted'" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
+                                    <field name="name"/>
+                                    <field name="bedrooms"/>
                                     <field name="expected_price"/>
+                                    <field name="best_offer"/>
+                                    <field name="selling_price"/>
                                     <field name="state"/>
                                 </tree>
                             </field>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 57f48df453e..f82debdabef 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -7,171 +7,137 @@
         <field name="context">{'search_default_state' : True}</field>
     </record>
 
-    <!-- <record id="estate_private_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>
-    
-     <record id="estate_private34_action" model="ir.actions.act_window">
-        <field name="name">ijij</field>
-        <field name="res_model">estate.property</field>
-        <field name="view_mode">list,form</field>
-     </record>
-
-     <record id="estate_custom_action" model="ir.actions.act_window">
-        <field name="name">Custom</field>
-        <field name="res_model">estate.property</field>
-        <field name="view_mode">list,form</field>
-     </record> -->
-
      <record id="estate_property_view_tree" model="ir.ui.view">
         <field name="name">estate_property_view_tree</field>
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
-            <tree string="list_tree" default_order="expected_price desc, name desc" decoration-success="state == 'offer received' or state == 'offer accepted'" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
-                <field name="name"/>
-                <!-- <field name="expected_price" invisible="1"/> -->
-                <!-- <field name="active" invisible="122" /> -->
-                 <field name="expected_price" />
-                 <field name="active" />
-                <field name="selling_price" />
-                <field name="state" />
-                <field name="best_offer" />
-                <field name="data_availability" optional="true" />
+            <tree expand="1" default_order="expected_price desc, name desc" decoration-success="state == 'offer received' or state == 'offer accepted'" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
+               <field name="name"/>
+               <field name="bedrooms"/>
+               <field name="expected_price" />
+               <field name="selling_price" />
+               <field name="best_offer" />
+               <field name="state"/>
             </tree>
         </field>
      </record>
 
      <record id="estate_property_view_form" model="ir.ui.view">
-      <field name="name">estate_property_view_form</field>
-      <field name="model">estate.property</field>
-      <field name="arch" type="xml">
-         <form string="My New House">
-            <header>
-               <button string="Sold" name="action_sold" type="object" class="oe_highlight" invisible="state == 'sold' or state == 'cancelled'" />
-               <button string="Cancel" name="action_cancelled" type="object" invisible="state == 'sold' or state == 'cancelled'" />
-               <field name="state" widget="statusbar" options="{'clickable':'1'}"/>
-            </header>
-            <sheet>
-               <group>
-                   <group>
-                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
-                        <field name="property_type_id" options="{'no_create': true}" />
-                       <field name="name"/>
-                       <field name="expected_price"/>
-                       <field name="buyer_id" />
-                   </group>
-                   <group>
-                      <field name="state"/>
-                      <field name="garden"/>
-                      <field name="selling_price" />
-                      <field name="postcode" />
-                      <field name="number" string="Number" />
-                      <field name="bedrooms" />
-                      <field name="best_offer" />
-                   </group>
-               </group>
-               
-               <notebook>
-                   <page string="Description">
-                       <!-- <field name="selling_price"/> -->
-                       <group>
-                           <group>
-                              <field name="name"/>
-                              <field name="expected_price"/>
-                              <field name="garden_area" invisible="not garden" />
-                              <field name="garden_orientation" invisible="not garden"/>
-                              <field name="living_area" />
-                           </group>
+         <field name="name">estate_property_view_form</field>
+         <field name="model">estate.property</field>
+         <field name="arch" type="xml">
+            <form string="My New House">
+               <header>
+                  <button string="Sold" name="action_sold" type="object" class="oe_highlight" invisible="state == 'sold' or state == 'cancelled'" />
+                  <button string="Cancel" name="action_cancelled" type="object" invisible="state == 'sold' or state == 'cancelled'" />
+                  <field name="state" widget="statusbar" />
+               </header>
+               <sheet>
+                  <h2>
+                     Name:
+                     <field name="name"/>
+                  </h2>
+                  <group>
+                     <group>
+                           <field name="property_type_id" options="{'no_create': true}" />
+                           <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                           <field name="postcode"/>
+                        </group>
+                        <group>
+                           <field name="expected_price"/>
+                           <field name="best_offer" />
+                           <field name="selling_price" />
+                        </group>
+                     </group>
+                     <notebook>
+                        <page string="Description">
                            <group>
-                              <field name="state"/>
-                              <field name="garden"/>
-                              <field name="selling_price" />
-                              <field name="totalArea" />
-                              <!-- <field name="percentage_garden" />
-                              <field name="percentage_living" /> -->
+                              <group>
+                                 <field name="description"/>
+                                 <field name="data_availability"/>
+                                 <field name="bedrooms" string="Number of bedrooms"/>
+                                 <field name="living_area"/>
+                                 <field name="garage"/>
+                                 <field name="garden"/>
+                                 <field name="garden_area" invisible="not garden"/>
+                                 <field name="garden_orientation" invisible="not garden"/>
+                                 <field name="totalArea"/>
+                              </group>
                            </group>
+                     </page>
+                     <page string="Sales Information">
+                        <group>
+                           <field name="seller_id"/>
+                           <field name="buyer_id"/>
                         </group>
-                   </page>
-                   <page string="Vendor">
-                       <!-- <field name="selling_price"/> -->
-                   </page>
-                   <page string="Other Info">
-                     <group>
-                        <field name="seller_id"/>
-                        <field name="buyer_id"/>
-                     </group>
-                   </page>
-                   <page string="Offer">
-                        <field name="offer_ids" readonly="state == 'offer accepted' or state == 'sold' or state == 'cancelled'" >
-                           <tree editable="true" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'" >
-                              <field name="price"/>
-                              <field name="partner_id"/>
-                              <field name="property_id" />
-                              <field name="validity" />
-                              <field name="date_deadline" />
-                              <button name="action_accept" type="object" icon="fa-check" invisible="status == 'accepted' or status == 'refused'" />
-                              <button name="action_refuse" type="object" icon="fa-times" invisible="status == 'accepted' or status == 'refused'" />
-                              <field name="status" />
-                           </tree>
-                        </field>
-                   </page>
-               </notebook>
-           </sheet>
-         </form>
-      </field>
+                     </page>
+                     <page string="Offer">
+                           <field name="offer_ids" readonly="state == 'offer accepted' or state == 'sold' or state == 'cancelled'" >
+                              <tree editable="bottom" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'" >
+                                 <field name="partner_id"/>
+                                 <field name="price"/>
+                                 <field name="validity" />
+                                 <field name="date_deadline"  />
+                                 <button name="action_accept" type="object" icon="fa-check" invisible="status == 'accepted' or status == 'refused'" />
+                                 <button name="action_refuse" type="object" icon="fa-times" invisible="status == 'accepted' or status == 'refused'" />
+                                 <field name="status" />
+                              </tree>
+                           </field>
+                     </page>
+                  </notebook>
+            </sheet>
+            </form>
+         </field>
      </record>
 
      <record id="estate_property_view_kanban" model="ir.ui.view">
-      <field name="name">estate.property.view.kanban</field>
-      <field name="model">estate.property</field>
-      <field name="arch" type="xml">
-         <kanban default_group_by="property_type_id" records_draggable="False">
-            <field name="state"/>
-            <templates>
-               <t t-name="kanban-box">
-                  <div class="oe_kanban_global_click">
-                     <h3>
-                        <field name="name"/>
-                     </h3>
-                     <div>
-                        Expected Price:
-                        <field name="expected_price"/>
+         <field name="name">estate.property.view.kanban</field>
+         <field name="model">estate.property</field>
+         <field name="arch" type="xml">
+            <kanban default_group_by="property_type_id" records_draggable="False">
+               <field name="state"/>
+               <templates>
+                  <t t-name="kanban-box">
+                     <div class="oe_kanban_global_click">
+                        <h3>
+                           <field name="name"/>
+                        </h3>
+                        <div>
+                           Expected Price:
+                           <field name="expected_price"/>
+                        </div>
+                        <div t-if="record.state.raw_value == 'offer received'" >
+                           Best Offer Price:
+                           <field name="best_offer"/>
+                        </div>
+                        <div t-if="record.state.raw_value == 'offer accepted'" >
+                           Selling price:
+                           <field name="selling_price"/>
+                        </div>
+                        <div style="margin-top: 10px;"></div>
+                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
                      </div>
-                     <div t-if="record.state.raw_value == 'offer received'" >
-                        Best Offer Price:
-                        <field name="best_offer"/>
-                     </div>
-                     <div t-if="record.state.raw_value == 'offer accepted'" >
-                        Selling price:
-                        <field name="selling_price"/>
-                     </div>
-                     <div style="margin-top: 10px;"></div>
-                     <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
-                  </div>
-               </t>
-            </templates>
-         </kanban>
-      </field>
+                  </t>
+               </templates>
+            </kanban>
+         </field>
      </record>
      
      <record id="estate_property_view_search" model="ir.ui.view">
-      <field name="name">estate_property_view_search</field>
-      <field name="model">estate.property</field>
-      <field name="arch" type="xml">
-         <search string="Test">
-            <field name="name" string="Name" />
-            <field name="selling_price" />
-            <field name="expected_price" string="Expected Price" />
-            <field string="Living Area" name="living_area" filter_domain="[('living_area','>=',self)]" />
-            <filter string="Available" name="state" domain="['|',('state','=','new'),('state','=','sold')]" />
-            <group expand="true" string="Group By">
-               <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"/>
-               <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms'}"/> 
-            </group>
-         </search>
-      </field>
+         <field name="name">estate_property_view_search</field>
+         <field name="model">estate.property</field>
+         <field name="arch" type="xml">
+            <search>
+               <field name="name" string="Name" />
+               <field name="selling_price" />
+               <field name="expected_price" string="Expected Price" />
+               <field string="Living Area" name="living_area" filter_domain="[('living_area', '>=', self)]" />
+               <filter string="Available" name="state" domain="['|', ('state', '=', 'new'),('state', '=', 'sold')]" />
+               <group string="Group By">
+                  <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"/>
+                  <filter string="Bedroom" name="bedrooms" context="{'group_by':'bedrooms'}"/> 
+               </group>
+            </search>
+         </field>
      </record>
-
 </odoo> 
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml
index 0ffeefd3694..4aa4b5ec5bf 100644
--- a/estate/views/res_users_views.xml
+++ b/estate/views/res_users_views.xml
@@ -5,9 +5,19 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form"/>
         <field name="arch" type="xml">
-            <page name="preferences" position="before">
-                <page name="estate" string="Real Estate Properties">
-                    <field name="property_ids"/>
+            <page name="preferences" position="after">
+                <page name="estate" string="Real Estate Properties" readonly="true" >
+                    <field name="property_ids">
+                        <tree readonly="true">
+                            <field name="name"/>
+                            <field name="property_type_id"/>
+                            <field name="expected_price"/>
+                            <field name="best_offer" />
+                            <field name="selling_price" />
+                            <field name="data_availability"/>
+                            <field name="buyer_id"/>
+                        </tree>
+                    </field>
                 </page>
             </page>
         </field>
diff --git a/estate_account/__init__.py b/estate_account/__init__.py
index 9a7e03eded3..0650744f6bc 100644
--- a/estate_account/__init__.py
+++ b/estate_account/__init__.py
@@ -1 +1 @@
-from . import models
\ No newline at end of file
+from . import models
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
index 6d3b60d89e6..b2c3f1daa36 100644
--- a/estate_account/__manifest__.py
+++ b/estate_account/__manifest__.py
@@ -8,5 +8,5 @@
     'demo': [
     ],
     'installable': True,
-    'application': False, 
-}
\ No newline at end of file
+    'application': False,
+}
diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py
index f4c8fd6db6d..5e1963c9d2f 100644
--- a/estate_account/models/__init__.py
+++ b/estate_account/models/__init__.py
@@ -1 +1 @@
-from . import estate_property
\ No newline at end of file
+from . import estate_property
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
index 17bff665f1e..21baf8d3043 100644
--- a/estate_account/models/estate_property.py
+++ b/estate_account/models/estate_property.py
@@ -1,4 +1,5 @@
-from odoo import fields, models, Command
+from odoo import models, Command
+
 
 class estateProperty(models.Model):
 
@@ -27,6 +28,7 @@ def action_sold(self):
                 Command.create(invoice_price),
                 Command.create(invoice_administrative_fees)
             ]
-        }) 
+        })
 
-        return supper_call
\ No newline at end of file
+        return supper_call
+        
\ No newline at end of file

From 0cd5a6d88f155145e6d984d34911ade70b807423 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Fri, 25 Oct 2024 10:25:00 +0530
Subject: [PATCH 08/16] [IMP] estate: implemented security restrictions for the
 Real Estate module - Added groups for real estate agents and managers. -
 Defined access rights: agents can read types/tags but cannot delete
 properties - Created record rules to restrict agents to only see/manage their
 own properties. - Updated estate_account to bypass security for confirming
 sales without full invoicing access.

---
 estate/__manifest__.py                       |  2 ++
 estate/security/estate_security.xml          | 33 ++++++++++++++++++++
 estate/security/ir.model.access.csv          | 13 +++++---
 estate/views/estate_property_offer_views.xml |  1 -
 estate_account/models/estate_property.py     |  4 +--
 5 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 estate/security/estate_security.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index e2ad0a9348c..2a562aaa26b 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -2,8 +2,10 @@
     'name': "Real State",
     'depends': ['base'],
     'author': "Sahil Mangukiya",
+    'category': 'Real Estate/Brokerage',
     'description': "This is my First tutorial module.",
     'data': [
+        'security/estate_security.xml',
         'security/ir.model.access.csv',
         'data/estate.property.type.csv',
         'views/res_users_views.xml',
diff --git a/estate/security/estate_security.xml b/estate/security/estate_security.xml
new file mode 100644
index 00000000000..6fe06ad387b
--- /dev/null
+++ b/estate/security/estate_security.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+
+    <record id="estate_group_user" model="res.groups">
+        <field name="name">Agent</field>
+        <field name="category_id" ref="base.module_category_real_estate_brokerage"></field>
+    </record>
+    <record id="estate_group_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_real_estate_brokerage"></field>
+        <field name="implied_ids" eval="[ref('estate_group_user')]"/>
+    </record>
+
+    <record id="estate_property_record_rule_agent" model="ir.rule">
+        <field name="name">A description of the rule's role</field>
+        <field name="model_id" ref="estate.model_estate_property"/>
+        <field name="groups" eval="[Command.link(ref('estate.estate_group_user'))]"/>
+        <!-- <field name="perm_create" eval="True"/>
+        <field name="perm_read" eval="True"/> -->
+        <field name="domain_force">
+            ['|', ('seller_id', '=', user.id), ('seller_id', '=', False)]
+        </field>
+    </record>
+
+    <record id="estate_property_record_rule_manager" model="ir.rule">
+        <field name="name">A description of the rule's role</field>
+        <field name="model_id" ref="estate.model_estate_property"/>
+        <field name="groups" eval="[Command.link(ref('estate.estate_group_manager'))]"/>
+        <field name="domain_force">
+            [(1, '=', 1)]
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index c097c4b42cb..f9713b9764a 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -1,6 +1,11 @@
 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
+access_estate_property,access_estate_property,model_estate_property,estate.estate_group_manager,1,1,1,0
+access_estate_property_type,access_estate_property_type,model_estate_property_type,estate.estate_group_manager,1,1,1,1
+access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,estate.estate_group_manager,1,1,1,1
+access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,estate.estate_group_manager,1,1,1,1
+
+access_estate_property,access_estate_property,model_estate_property,estate.estate_group_user,1,1,1,0
+access_estate_property_type,access_estate_property_type,model_estate_property_type,estate.estate_group_user,1,0,0,0
+access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,estate.estate_group_user,1,0,0,0
+access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,estate.estate_group_user,1,1,1,1
 
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
index 7b2d97f2f8e..5eb710b3396 100644
--- a/estate/views/estate_property_offer_views.xml
+++ b/estate/views/estate_property_offer_views.xml
@@ -4,7 +4,6 @@
         <field name="name">Offers</field>
         <field name="res_model">estate.property.offer</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('property_type_id', '=', active_id)]</field>
     </record>
 
     <record id="estate_property_offer_view_tree" model="ir.ui.view">
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
index 21baf8d3043..fb948b82757 100644
--- a/estate_account/models/estate_property.py
+++ b/estate_account/models/estate_property.py
@@ -1,4 +1,4 @@
-from odoo import models, Command
+from odoo import models, Command, fields
 
 
 class estateProperty(models.Model):
@@ -20,7 +20,7 @@ def action_sold(self):
             "price_unit": 100.00
         }
 
-        self.env["account.move"].create({
+        self.env["account.move"].sudo().create({
             "name": self.name + " Invoice",
             "partner_id": self.buyer_id.id,
             "move_type": "out_invoice",

From 8a1e2c2cbef4277531cd7e1c369752b3979d9d75 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Mon, 28 Oct 2024 00:45:52 +0530
Subject: [PATCH 09/16] [IMP] estate: completed build pdf reports

- Added a template to show property offers.
- Enhanced the template to display a message if there are no offers.
- Created a sub-template specifically for the offers table.
- Built a report listing all properties for a user.
- Used an inherited template and added a condition to display about invoice
---
 estate/__manifest__.py                        |  4 +
 estate/models/estate_property.py              |  1 +
 .../estate_property_offer_report_template.xml | 38 +++++++++
 estate/reports/estate_property_reports.xml    | 23 +++++
 ...alesman_property_offer_report_template.xml | 45 ++++++++++
 .../reports/print_offer_table_subtemplate.xml | 42 +++++++++
 estate/security/estate_security.xml           | 10 +--
 estate/security/ir.model.access.csv           |  1 +
 estate/views/estate_menu.xml                  |  2 +-
 estate/views/estate_property_views.xml        | 85 ++++++++++---------
 estate/views/res_users_views.xml              | 12 +--
 estate_account/__manifest__.py                |  2 +
 estate_account/models/estate_property.py      |  4 +
 ...property_offer_report_inherit_template.xml | 14 +++
 ...property_offer_report_inherit_template.xml | 14 +++
 15 files changed, 238 insertions(+), 59 deletions(-)
 create mode 100644 estate/reports/estate_property_offer_report_template.xml
 create mode 100644 estate/reports/estate_property_reports.xml
 create mode 100644 estate/reports/estate_salesman_property_offer_report_template.xml
 create mode 100644 estate/reports/print_offer_table_subtemplate.xml
 create mode 100644 estate_account/reports/estate_property_offer_report_inherit_template.xml
 create mode 100644 estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 2a562aaa26b..19fa6f3ea34 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -8,6 +8,10 @@
         'security/estate_security.xml',
         'security/ir.model.access.csv',
         'data/estate.property.type.csv',
+        'reports/print_offer_table_subtemplate.xml',
+        'reports/estate_property_offer_report_template.xml',
+        'reports/estate_salesman_property_offer_report_template.xml',
+        'reports/estate_property_reports.xml',
         'views/res_users_views.xml',
         'views/estate_property_offer_views.xml',
         'views/estate_property_type_views.xml',
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index e6ca8037003..105b23bd140 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -44,6 +44,7 @@ class estateProperty(models.Model):
         buyer_id = fields.Many2one('res.partner', 'Buyer')
         tag_ids = fields.Many2many(comodel_name='estate.property.tag', string='Tag', relation='property_join_tag', column1='property_id', column2='tag_id')
         offer_ids = fields.One2many('estate.property.offer', 'property_id')
+        company_id = fields.Many2one('res.company', required=True, default=lambda self: self.env.company)
 
         _sql_constraints = [
                 ('check_selling_price', 'CHECK(selling_price >= 0)', 'A property selling price must be positive.'), 
diff --git a/estate/reports/estate_property_offer_report_template.xml b/estate/reports/estate_property_offer_report_template.xml
new file mode 100644
index 00000000000..85ec7625d97
--- /dev/null
+++ b/estate/reports/estate_property_offer_report_template.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="estate_property_offer_report_template">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="property">
+                <t t-call="web.external_layout">
+                    <div class="page">
+                        <h1>
+                            <b>
+                                Property Name:
+                            </b>
+                            <span t-field="property.name"/>
+                        </h1>
+                        <h6>
+                            <b>
+                                Salesman:
+                            </b>
+                            <span t-field="property.seller_id"/>
+                        </h6>
+                        <h6>
+                            <b>
+                                Expected Price:
+                            </b>
+                            <span t-field="property.expected_price"/>
+                        </h6>
+                        <h6>
+                            <b>
+                                State:
+                            </b>
+                            <span t-field="property.state"/>
+                        </h6>
+                        <t t-call="estate.print_offer_table"/>
+                    </div>
+                </t>
+            </t>
+        </t>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate/reports/estate_property_reports.xml b/estate/reports/estate_property_reports.xml
new file mode 100644
index 00000000000..138517b7646
--- /dev/null
+++ b/estate/reports/estate_property_reports.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="estate_property_offer_report" model="ir.actions.report">
+        <field name="name">Property Offer Report</field>
+        <field name="model">estate.property</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">estate.estate_property_offer_report_template</field>
+        <field name="report_file">estate.estate_property_offer_report_template</field>
+        <field name="print_report_name">'%s Offers Report' % object.name</field>
+        <field name="binding_model_id" ref="model_estate_property"/>
+        <field name="binding_type">report</field>
+    </record>
+    <record id="estate_salesman_property_offer_report" model="ir.actions.report">
+        <field name="name">Property Offer Report</field>
+        <field name="model">res.users</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">estate.estate_salesman_property_offer_report_template</field>
+        <field name="report_file">estate.estate_salesman_property_offer_report_template</field>
+        <field name="print_report_name">'%s Properties Offer Report' % object.name</field>
+        <field name="binding_model_id" ref="model_res_users"/>
+        <field name="binding_type">report</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/estate/reports/estate_salesman_property_offer_report_template.xml b/estate/reports/estate_salesman_property_offer_report_template.xml
new file mode 100644
index 00000000000..63abc4c93cd
--- /dev/null
+++ b/estate/reports/estate_salesman_property_offer_report_template.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="estate_salesman_property_offer_report_template">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="res_user">
+                <t t-call="web.external_layout">
+                    <div class="page">
+                        <h1>
+                            <b>
+                                Salesman:
+                            </b>
+                            <span t-field="res_user.name"/>
+                        </h1>
+                        <t t-if="len(res_user.property_ids) > 0">
+                            <t t-foreach="res_user.property_ids" t-as="property">
+                                <h3>
+                                    <b>
+                                        Property Name:
+                                    </b>
+                                    <span t-field="property.name"/>
+                                </h3>
+                                <h6>
+                                    <b>
+                                        Expected Price:
+                                    </b>
+                                    <span t-field="property.expected_price"/>
+                                </h6>
+                                <h6>
+                                    <b>
+                                        State:
+                                    </b>
+                                    <span t-field="property.state"/>
+                                </h6>
+                                <t t-call="estate.print_offer_table"/>
+                            </t>
+                        </t>
+                        <t t-else="">
+                            <p>No property is under this user.</p>
+                        </t>
+                    </div>
+                </t>
+            </t>
+        </t>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate/reports/print_offer_table_subtemplate.xml b/estate/reports/print_offer_table_subtemplate.xml
new file mode 100644
index 00000000000..b6a9746cee4
--- /dev/null
+++ b/estate/reports/print_offer_table_subtemplate.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="print_offer_table">
+        <t t-if="len(property.offer_ids) > 0">
+            <table class="table mt16">
+                <thead>
+                    <tr>
+                        <th>Price</th>
+                        <th>Partner</th>
+                        <th>Validity (days)</th>
+                        <th>Deadline</th>
+                        <th>Status</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr t-foreach="property.offer_ids" t-as="offers">
+                        <td>
+                            <span t-field="offers.price"/>
+                        </td>
+                        <td>
+                            <span t-field="offers.partner_id"/>
+                        </td>
+                        <td>
+                            <span t-field="offers.validity"/>
+                        </td>
+                        <td>
+                            <span t-field="offers.date_deadline"/>
+                        </td>
+                        <td>
+                            <span t-field="offers.status"/>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </t>
+        <t t-else="">
+            <p>
+                No offer exists for property!!!
+            </p>
+        </t>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate/security/estate_security.xml b/estate/security/estate_security.xml
index 6fe06ad387b..f3885957889 100644
--- a/estate/security/estate_security.xml
+++ b/estate/security/estate_security.xml
@@ -5,25 +5,25 @@
         <field name="name">Agent</field>
         <field name="category_id" ref="base.module_category_real_estate_brokerage"></field>
     </record>
+
     <record id="estate_group_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_real_estate_brokerage"></field>
         <field name="implied_ids" eval="[ref('estate_group_user')]"/>
+        <field name="users" eval="[ref('base.user_admin')]"/>
     </record>
 
     <record id="estate_property_record_rule_agent" model="ir.rule">
-        <field name="name">A description of the rule's role</field>
+        <field name="name">A description of the rule's for agent</field>
         <field name="model_id" ref="estate.model_estate_property"/>
         <field name="groups" eval="[Command.link(ref('estate.estate_group_user'))]"/>
-        <!-- <field name="perm_create" eval="True"/>
-        <field name="perm_read" eval="True"/> -->
         <field name="domain_force">
-            ['|', ('seller_id', '=', user.id), ('seller_id', '=', False)]
+            ['|', ('seller_id', '=', user.id), ('seller_id', '=', False), ('company_id', 'in', company_ids)]
         </field>
     </record>
 
     <record id="estate_property_record_rule_manager" model="ir.rule">
-        <field name="name">A description of the rule's role</field>
+        <field name="name">A description of the rule's for manager</field>
         <field name="model_id" ref="estate.model_estate_property"/>
         <field name="groups" eval="[Command.link(ref('estate.estate_group_manager'))]"/>
         <field name="domain_force">
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index f9713b9764a..9a094ae3e06 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -1,4 +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,estate.estate_group_manager,1,1,1,0
 access_estate_property_type,access_estate_property_type,model_estate_property_type,estate.estate_group_manager,1,1,1,1
 access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,estate.estate_group_manager,1,1,1,1
diff --git a/estate/views/estate_menu.xml b/estate/views/estate_menu.xml
index 832a4c0970a..f96117c3ed0 100644
--- a/estate/views/estate_menu.xml
+++ b/estate/views/estate_menu.xml
@@ -4,7 +4,7 @@
         <menuitem id="estate_menu_root_first_advertisements" name="Advertisements" sequence="1">
             <menuitem id="estate_menu_root_first_second_property" action="estate_property_action"/>
         </menuitem>
-        <menuitem id="estate_menu_root_first_setting" name="Setting" sequence="2">
+        <menuitem id="estate_menu_root_first_setting" name="Setting" sequence="2" groups="estate.estate_group_manager">
             <menuitem id="estate_menu_root_first_second_type" action="estate_property_type_action" name="Property Type" sequence="1"/>
             <menuitem id="estate_menu_root_first_second_tag" action="estate_property_tag_action" name="Property Tag" sequence="2"/>
         </menuitem>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index f82debdabef..de03fcc95db 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -39,52 +39,53 @@
                   </h2>
                   <group>
                      <group>
-                           <field name="property_type_id" options="{'no_create': true}" />
-                           <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
-                           <field name="postcode"/>
-                        </group>
-                        <group>
-                           <field name="expected_price"/>
-                           <field name="best_offer" />
-                           <field name="selling_price" />
-                        </group>
+                        <field name="property_type_id" options="{'no_create': true}" />
+                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                        <field name="postcode"/>
+                     </group>
+                     <group>
+                        <field name="expected_price"/>
+                        <field name="best_offer" />
+                        <field name="selling_price" />
+                        <field name="company_id" />
                      </group>
-                     <notebook>
-                        <page string="Description">
+                  </group>
+                  <notebook>
+                     <page string="Description">
+                        <group>
                            <group>
-                              <group>
-                                 <field name="description"/>
-                                 <field name="data_availability"/>
-                                 <field name="bedrooms" string="Number of bedrooms"/>
-                                 <field name="living_area"/>
-                                 <field name="garage"/>
-                                 <field name="garden"/>
-                                 <field name="garden_area" invisible="not garden"/>
-                                 <field name="garden_orientation" invisible="not garden"/>
-                                 <field name="totalArea"/>
-                              </group>
+                              <field name="description"/>
+                              <field name="data_availability"/>
+                              <field name="bedrooms" string="Number of bedrooms"/>
+                              <field name="living_area"/>
+                              <field name="garage"/>
+                              <field name="garden"/>
+                              <field name="garden_area" invisible="not garden"/>
+                              <field name="garden_orientation" invisible="not garden"/>
+                              <field name="totalArea"/>
                            </group>
-                     </page>
-                     <page string="Sales Information">
-                        <group>
-                           <field name="seller_id"/>
-                           <field name="buyer_id"/>
                         </group>
-                     </page>
-                     <page string="Offer">
-                           <field name="offer_ids" readonly="state == 'offer accepted' or state == 'sold' or state == 'cancelled'" >
-                              <tree editable="bottom" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'" >
-                                 <field name="partner_id"/>
-                                 <field name="price"/>
-                                 <field name="validity" />
-                                 <field name="date_deadline"  />
-                                 <button name="action_accept" type="object" icon="fa-check" invisible="status == 'accepted' or status == 'refused'" />
-                                 <button name="action_refuse" type="object" icon="fa-times" invisible="status == 'accepted' or status == 'refused'" />
-                                 <field name="status" />
-                              </tree>
-                           </field>
-                     </page>
-                  </notebook>
+                  </page>
+                  <page string="Sales Information">
+                     <group>
+                        <field name="seller_id"/>
+                        <field name="buyer_id"/>
+                     </group>
+                  </page>
+                  <page string="Offer">
+                        <field name="offer_ids" readonly="state == 'offer accepted' or state == 'sold' or state == 'cancelled'" >
+                           <tree editable="bottom" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'" >
+                              <field name="partner_id"/>
+                              <field name="price"/>
+                              <field name="validity" />
+                              <field name="date_deadline"  />
+                              <button name="action_accept" type="object" icon="fa-check" invisible="status == 'accepted' or status == 'refused'" />
+                              <button name="action_refuse" type="object" icon="fa-times" invisible="status == 'accepted' or status == 'refused'" />
+                              <field name="status" />
+                           </tree>
+                        </field>
+                  </page>
+               </notebook>
             </sheet>
             </form>
          </field>
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml
index 4aa4b5ec5bf..43a6ab1eb38 100644
--- a/estate/views/res_users_views.xml
+++ b/estate/views/res_users_views.xml
@@ -7,17 +7,7 @@
         <field name="arch" type="xml">
             <page name="preferences" position="after">
                 <page name="estate" string="Real Estate Properties" readonly="true" >
-                    <field name="property_ids">
-                        <tree readonly="true">
-                            <field name="name"/>
-                            <field name="property_type_id"/>
-                            <field name="expected_price"/>
-                            <field name="best_offer" />
-                            <field name="selling_price" />
-                            <field name="data_availability"/>
-                            <field name="buyer_id"/>
-                        </tree>
-                    </field>
+                    <field name="property_ids"/>
                 </page>
             </page>
         </field>
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
index b2c3f1daa36..51c64289705 100644
--- a/estate_account/__manifest__.py
+++ b/estate_account/__manifest__.py
@@ -4,6 +4,8 @@
     'author': "Sahil Mangukiya",
     'description': "This is a estate account module.",
     'data': [
+        'reports/estate_property_offer_report_inherit_template.xml',
+        'reports/estate_salesman_property_offer_report_inherit_template.xml',
     ],
     'demo': [
     ],
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
index fb948b82757..bfbcf619ea2 100644
--- a/estate_account/models/estate_property.py
+++ b/estate_account/models/estate_property.py
@@ -20,6 +20,10 @@ def action_sold(self):
             "price_unit": 100.00
         }
 
+        # print(" reached ".center(100, '='))
+        # print(self.env["account.move"].check_access_rights('write'))
+        # print(self.env["account.move"].check_access_rule('write'))
+
         self.env["account.move"].sudo().create({
             "name": self.name + " Invoice",
             "partner_id": self.buyer_id.id,
diff --git a/estate_account/reports/estate_property_offer_report_inherit_template.xml b/estate_account/reports/estate_property_offer_report_inherit_template.xml
new file mode 100644
index 00000000000..b3aa656f32c
--- /dev/null
+++ b/estate_account/reports/estate_property_offer_report_inherit_template.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="estate_property_offer_report_inherit_template" inherit_id="estate.estate_property_offer_report_template">
+        <xpath expr="//div//h6[3]" position="after">
+            <t t-if="property.state == 'sold'">
+                <p>
+                    <b>
+                        !!! Invoice has already been created !!!
+                    </b>
+                </p>
+            </t>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml b/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml
new file mode 100644
index 00000000000..4aef1437941
--- /dev/null
+++ b/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="estate_salesman_property_offer_report_inherit_template" inherit_id="estate.estate_salesman_property_offer_report_template">
+        <xpath expr="//div//h6[2]" position="after">
+            <t t-if="property.state == 'offer received'">
+                <p>
+                    <b>
+                        !!! Offers are received for this Property. !!!
+                    </b>
+                </p>
+            </t>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file

From 031723f4212637ccb6f405716c25e6166b59f188 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Mon, 28 Oct 2024 03:05:41 +0530
Subject: [PATCH 10/16] [IMP] estate: add 'add offer' wizard for bulk offer
 creation on properties

- Implemented 'Add Offer' wizard for adding offers on multiple properties
- Added button in estate property tree view header to open wizard
- Wizard includes fields for price, buyer selection
- Added 'Make an Offer' button to execute offer creation and 'Cancel' button to
exit
---
 estate/__init__.py                     |  1 +
 estate/__manifest__.py                 |  1 +
 estate/security/ir.model.access.csv    |  2 ++
 estate/views/estate_property_views.xml |  3 +++
 estate/wizards/__init__.py             |  1 +
 estate/wizards/add_offer.py            | 24 ++++++++++++++++++++++++
 estate/wizards/add_offer.xml           | 26 ++++++++++++++++++++++++++
 7 files changed, 58 insertions(+)
 create mode 100644 estate/wizards/__init__.py
 create mode 100644 estate/wizards/add_offer.py
 create mode 100644 estate/wizards/add_offer.xml

diff --git a/estate/__init__.py b/estate/__init__.py
index 0650744f6bc..976591c996e 100644
--- a/estate/__init__.py
+++ b/estate/__init__.py
@@ -1 +1,2 @@
+from . import wizards
 from . import models
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 19fa6f3ea34..67a6cecfe3b 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -13,6 +13,7 @@
         'reports/estate_salesman_property_offer_report_template.xml',
         'reports/estate_property_reports.xml',
         'views/res_users_views.xml',
+        'wizards/add_offer.xml',
         'views/estate_property_offer_views.xml',
         'views/estate_property_type_views.xml',
         'views/estate_property_tag_views.xml',
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index 9a094ae3e06..9fa7fe5eab1 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -4,9 +4,11 @@ access_estate_property,access_estate_property,model_estate_property,estate.estat
 access_estate_property_type,access_estate_property_type,model_estate_property_type,estate.estate_group_manager,1,1,1,1
 access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,estate.estate_group_manager,1,1,1,1
 access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,estate.estate_group_manager,1,1,1,1
+access_add_offer,access_add_offer,model_add_offer,estate.estate_group_manager,1,1,1,1
 
 access_estate_property,access_estate_property,model_estate_property,estate.estate_group_user,1,1,1,0
 access_estate_property_type,access_estate_property_type,model_estate_property_type,estate.estate_group_user,1,0,0,0
 access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,estate.estate_group_user,1,0,0,0
 access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,estate.estate_group_user,1,1,1,1
+access_add_offer,access_add_offer,model_add_offer,estate.estate_group_user,1,1,1,1
 
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index de03fcc95db..116e1ece577 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -12,6 +12,9 @@
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <tree expand="1" default_order="expected_price desc, name desc" decoration-success="state == 'offer received' or state == 'offer accepted'" decoration-bf="state == 'offer accepted'" decoration-muted="state == 'sold'">
+               <header>
+                  <button string="Add Offer" name="%(estate.action_add_offer)d" type="action" class="oe_highlight"/>
+               </header>
                <field name="name"/>
                <field name="bedrooms"/>
                <field name="expected_price" />
diff --git a/estate/wizards/__init__.py b/estate/wizards/__init__.py
new file mode 100644
index 00000000000..4186b9b067e
--- /dev/null
+++ b/estate/wizards/__init__.py
@@ -0,0 +1 @@
+from . import add_offer
\ No newline at end of file
diff --git a/estate/wizards/add_offer.py b/estate/wizards/add_offer.py
new file mode 100644
index 00000000000..bfd5be78569
--- /dev/null
+++ b/estate/wizards/add_offer.py
@@ -0,0 +1,24 @@
+from odoo import models, fields
+
+
+class addOffer(models.TransientModel):
+
+    _name = "add.offer"
+    _description = "You can add a offer directly in multiple properties."
+
+    price = fields.Float(required=True)
+    partner_id = fields.Many2one('res.partner', string='Buyer', required=True)
+
+    def action_make_an_offer(self):
+        select_property_id = self.env.context['active_ids']
+        properties = self.env["estate.property"].browse(select_property_id)
+
+        for property in properties:
+            self.env["estate.property.offer"].create({
+                'price': self.price,
+                'partner_id': self.partner_id.id,
+                'property_id': property.id
+            })
+
+        
+
diff --git a/estate/wizards/add_offer.xml b/estate/wizards/add_offer.xml
new file mode 100644
index 00000000000..3aa7aaac28d
--- /dev/null
+++ b/estate/wizards/add_offer.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="action_add_offer" model="ir.actions.act_window">
+        <field name="name">Add Offer</field>
+        <field name="res_model">add.offer</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <record id="add_offer_view_form" model="ir.ui.view">
+        <field name="name">add.offer.view.form</field>
+        <field name="model">add.offer</field>
+        <field name="arch" type="xml">
+            <form string="Add Offer">
+                <group>
+                    <field name="price"/>
+                    <field name="partner_id"/>
+                </group>
+                <footer>
+                    <button string="Make an Offer" name="action_make_an_offer" type="object" class="oe_highlight"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From 2205437505e84973d62c9c91c81d2879e776d6f0 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Mon, 4 Nov 2024 11:26:45 +0530
Subject: [PATCH 11/16] [IMP] estate: controller for estate properties

- Added a Properties menu to display unsold properties in a grid format.
- Integrated image display for each property on the front-end.
- Implemented pagination to display a maximum of 6 properties per page.
- Ensured only properties that are not canceled or archived are listed.
- Implement dedicated property page accessible via View Details link from
property grid
---
 estate/__init__.py                            |  1 +
 estate/__manifest__.py                        |  4 +-
 estate/controllers/__init__.py                |  1 +
 estate/controllers/property_website.py        | 39 +++++++++++
 estate/data/estate.property.type.csv          |  2 +-
 estate/demo/estate_property_demo.xml          |  5 +-
 estate/models/estate_property.py              |  2 +
 estate/models/estate_property_offer.py        |  2 +-
 .../estate_property_detail_template.xml       | 64 +++++++++++++++++++
 .../estate_property_offer_report_template.xml |  2 +-
 estate/reports/estate_property_reports.xml    |  2 +-
 .../estate_property_website_template.xml      | 60 +++++++++++++++++
 ...alesman_property_offer_report_template.xml |  2 +-
 .../reports/print_offer_table_subtemplate.xml |  2 +-
 estate/security/estate_security.xml           |  7 +-
 estate/security/ir.model.access.csv           |  1 -
 estate/views/estate_menu.xml                  |  2 +-
 estate/views/estate_property_offer_views.xml  |  3 +-
 estate/views/estate_property_tag_views.xml    |  2 +-
 estate/views/estate_property_type_views.xml   |  2 +-
 estate/views/estate_property_views.xml        |  1 +
 estate/views/res_users_views.xml              |  2 +-
 estate/wizards/__init__.py                    |  2 +-
 estate/wizards/add_offer.py                   |  3 -
 estate/wizards/add_offer.xml                  |  2 +-
 estate_account/models/estate_property.py      |  1 -
 ...property_offer_report_inherit_template.xml |  2 +-
 ...property_offer_report_inherit_template.xml |  2 +-
 28 files changed, 193 insertions(+), 27 deletions(-)
 create mode 100644 estate/controllers/__init__.py
 create mode 100644 estate/controllers/property_website.py
 create mode 100644 estate/reports/estate_property_detail_template.xml
 create mode 100644 estate/reports/estate_property_website_template.xml

diff --git a/estate/__init__.py b/estate/__init__.py
index 976591c996e..d4c3532319d 100644
--- a/estate/__init__.py
+++ b/estate/__init__.py
@@ -1,2 +1,3 @@
 from . import wizards
+from . import controllers
 from . import models
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 67a6cecfe3b..007b1432dd6 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': "Real State",
-    'depends': ['base'],
+    'depends': ['base', 'website'],
     'author': "Sahil Mangukiya",
     'category': 'Real Estate/Brokerage',
     'description': "This is my First tutorial module.",
@@ -8,6 +8,8 @@
         'security/estate_security.xml',
         'security/ir.model.access.csv',
         'data/estate.property.type.csv',
+        'reports/estate_property_website_template.xml',
+        'reports/estate_property_detail_template.xml',
         'reports/print_offer_table_subtemplate.xml',
         'reports/estate_property_offer_report_template.xml',
         'reports/estate_salesman_property_offer_report_template.xml',
diff --git a/estate/controllers/__init__.py b/estate/controllers/__init__.py
new file mode 100644
index 00000000000..c5ba8c48107
--- /dev/null
+++ b/estate/controllers/__init__.py
@@ -0,0 +1 @@
+from . import property_website
diff --git a/estate/controllers/property_website.py b/estate/controllers/property_website.py
new file mode 100644
index 00000000000..12d35aa865d
--- /dev/null
+++ b/estate/controllers/property_website.py
@@ -0,0 +1,39 @@
+from odoo import http
+from odoo.http import request
+
+from odoo.addons.portal.controllers.portal import pager as portal_pager 
+
+
+class propertyWebsiteController(http.Controller):
+
+    @http.route(['/properties', '/properties/page/<int:page>'], website=True, auth='public', type='http')
+    def property_website(self, page=1, **kwargs):
+        property_limit_per_page = 6
+        property_count = request.env["estate.property"].sudo().search_count(
+            domain=[('state','in',('new', 'offer received', 'offer accepted')), ('active', '=', True)]
+        )
+        pager = portal_pager(
+            url="/properties",
+            total=property_count,
+            page=page,
+            step=property_limit_per_page
+        )
+        property = request.env["estate.property"].sudo().search(
+            domain=[('state','in',('new', 'offer received', 'offer accepted')), ('active', '=', True)],
+            offset=pager['offset'],
+            limit=property_limit_per_page
+        )
+        return request.render('estate.estate_property_website_template', 
+        {
+            'properties': property,
+            'pager': pager
+        })
+    
+
+    @http.route('/property/<int:property_id>', website=True, auth='public', type='http')
+    def property_detail_view(self, property_id):
+        property = request.env['estate.property'].sudo().browse(property_id)
+        return request.render('estate.estate_property_detail_template',
+        {
+            'property' : property,
+        })
diff --git a/estate/data/estate.property.type.csv b/estate/data/estate.property.type.csv
index 74b7279c13e..2dba79266ca 100644
--- a/estate/data/estate.property.type.csv
+++ b/estate/data/estate.property.type.csv
@@ -2,4 +2,4 @@ id,name
 1,"Residential"
 2,"Commercial"
 3,"Industrial"
-4,"Land"
\ No newline at end of file
+4,"Land"
diff --git a/estate/demo/estate_property_demo.xml b/estate/demo/estate_property_demo.xml
index 05146107133..bad0fc8989c 100644
--- a/estate/demo/estate_property_demo.xml
+++ b/estate/demo/estate_property_demo.xml
@@ -1,6 +1,5 @@
 <odoo>
-    <data noupdate="0">
-    
+    <data>
         <record id="id1" model="estate.property">
             <field name="name">Big villa</field>
             <field name="state">new</field>
@@ -119,4 +118,4 @@
 
     </data>
        
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 105b23bd140..541c3b5e08e 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -38,6 +38,7 @@ class estateProperty(models.Model):
         number = fields.Integer(related='property_type_id.number')
         totalArea = fields.Integer(compute='_compute_total_area', store="true")
         best_offer = fields.Float(compute='_compute_best_offer')
+        property_image = fields.Binary()
 
         property_type_id = fields.Many2one(comodel_name='estate.property.type', string='Property Type', domain="[('number', '>=', 0)]", ondelete='cascade')
         seller_id = fields.Many2one('res.users', 'Salesman', default=lambda self: self.env.user)
@@ -46,6 +47,7 @@ class estateProperty(models.Model):
         offer_ids = fields.One2many('estate.property.offer', 'property_id')
         company_id = fields.Many2one('res.company', required=True, default=lambda self: self.env.company)
 
+
         _sql_constraints = [
                 ('check_selling_price', 'CHECK(selling_price >= 0)', 'A property selling price must be positive.'), 
                 ('check_expected_price', 'CHECK(expected_price > 0)', 'A property expected price must be strictly positive.')
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
index 5bc2954aa74..bc4c718767b 100644
--- a/estate/models/estate_property_offer.py
+++ b/estate/models/estate_property_offer.py
@@ -75,4 +75,4 @@ def create(self, offer):
         if offer["price"] < max(property_id.offer_ids.mapped("price") + [0]):
             raise UserError("Offer price must be higher than existing offer.")
         property_id.state = "offer received"
-        return super().create(offer)
\ No newline at end of file
+        return super().create(offer)
diff --git a/estate/reports/estate_property_detail_template.xml b/estate/reports/estate_property_detail_template.xml
new file mode 100644
index 00000000000..fb15c543367
--- /dev/null
+++ b/estate/reports/estate_property_detail_template.xml
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="estate_property_detail_template" name="Property Detail">
+        <title><t t-esc="property.name"/></title>
+        <t t-call="website.layout">
+            <style>
+                .property-container {
+                    max-width: 800px;
+                    margin: auto;
+                }
+                .property-card {
+                    border: 1px solid #ddd;
+                    border-radius: 8px;
+                    overflow: hidden;
+                    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+                }
+                .property-image {
+                    width: 100%;
+                    height: 300px;
+                    object-fit: cover;
+                    border-bottom: 1px solid #ddd;
+                }
+                .property-details {
+                    padding: 20px;
+                }
+                .property-details h5 {
+                    font-size: 1.5rem;
+                    font-weight: 600;
+                    margin-bottom: 15px;
+                    color: #333;
+                }
+                .property-details p {
+                    margin: 5px 0;
+                    font-size: 1rem;
+                    color: #555;
+                }
+                .property-details strong {
+                    color: #000;
+                }
+            </style>
+            <section class="container my-5 property-container">
+                <h2 class="text-center mb-4">
+                    <t t-esc="property.name"/> - Details
+                </h2>
+                <div class="property-card">
+                    <t t-if="property.property_image">
+                        <img t-attf-src="data:image/*;base64,#{property.property_image}" alt="Property Image" class="property-image"/>
+                    </t>
+                    <div class="property-details">
+                        <h5><t t-esc="property.name"/></h5>
+                        <p><strong>Salesman:</strong> <t t-esc="property.seller_id.name"/></p>
+                        <p><strong>State:</strong> <t t-esc="property.state"/></p>
+                        <p><strong>Expected Price:</strong> <t t-esc="property.expected_price"/> </p>
+                        <p><strong>Postcode:</strong> <t t-esc="property.postcode"/> </p>
+                        <p><strong>Date Availability:</strong> <t t-esc="property.data_availability"/> </p>
+                        <p><strong>Number of Bedrooms:</strong> <t t-esc="property.bedrooms"/> </p>
+                        <p><strong>Living Area:</strong> <t t-esc="property.garden_area"/> </p>
+                        <p><strong>Garden Area:</strong> <t t-esc="property.garden_area"/> </p>
+                    </div>
+                </div>
+            </section>
+        </t>
+    </template>
+</odoo>
diff --git a/estate/reports/estate_property_offer_report_template.xml b/estate/reports/estate_property_offer_report_template.xml
index 85ec7625d97..ac0387c659b 100644
--- a/estate/reports/estate_property_offer_report_template.xml
+++ b/estate/reports/estate_property_offer_report_template.xml
@@ -35,4 +35,4 @@
             </t>
         </t>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/reports/estate_property_reports.xml b/estate/reports/estate_property_reports.xml
index 138517b7646..cc759dfcf17 100644
--- a/estate/reports/estate_property_reports.xml
+++ b/estate/reports/estate_property_reports.xml
@@ -20,4 +20,4 @@
         <field name="binding_model_id" ref="model_res_users"/>
         <field name="binding_type">report</field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/reports/estate_property_website_template.xml b/estate/reports/estate_property_website_template.xml
new file mode 100644
index 00000000000..7a8c9c978c8
--- /dev/null
+++ b/estate/reports/estate_property_website_template.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="menu_property" model="website.menu">
+        <field name="name">Properties</field>
+        <field name="url">/properties</field>
+        <field name="parent_id" ref="website.main_menu"/>
+    </record>
+
+    <template id="estate_property_website_template" name="Property">
+        <title>Properties</title>
+        <t t-call="website.layout">
+            <style>
+                .property-image {
+                    width: 100%; 
+                    height: 200px; 
+                    object-fit: cover; 
+                }
+            </style>
+            <section class="container my-5">
+                <h2 class="text-center mb-4">
+                    Available Properties
+                </h2>
+                <div class="row">
+                    <t t-foreach="properties" t-as="property">
+                        <div class="col-lg-4 col-md-6 col-sm-12 mb-4">
+                            <div class="card shadow border-light">
+                                <t t-if="property.property_image"> 
+                                    <img t-attf-src="data:image/*;base64,#{property.property_image}" alt="Property Image"/>
+                                </t>
+                                <div class="card-body">
+                                    <h5 class="card-title">
+                                        <t t-esc="property.name"/>
+                                    </h5>
+                                    <p class="card-text">
+                                        <strong>Salesman:</strong> 
+                                        <t t-esc="property.seller_id.name"/>
+                                    </p>
+                                    <p class="card-text">
+                                        <strong>State:</strong> 
+                                        <t t-esc="property.state"/>
+                                    </p>
+                                    <p class="card-text">
+                                        <strong>Expected Price:</strong>
+                                        <t t-esc="property.expected_price"/> $
+                                    </p>
+                                    <a t-att-href="'/property/' + str(property.id)" class="btn btn-primary">View Details</a>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </div>
+                <div class="pagination d-flex justify-content-between align-items-center">
+                    <a t-att-href="pager['page_previous']['url']" class="btn btn-secondary">Previous</a>
+                    <span>Page <t t-esc="pager['page']['num']"/> of <t t-esc="pager['page_count']"/></span>
+                    <a t-att-href="pager['page_next']['url']" class="btn btn-secondary">Next</a>
+                </div>
+            </section>
+        </t>
+    </template>
+</odoo>
diff --git a/estate/reports/estate_salesman_property_offer_report_template.xml b/estate/reports/estate_salesman_property_offer_report_template.xml
index 63abc4c93cd..3d05c2ed7a1 100644
--- a/estate/reports/estate_salesman_property_offer_report_template.xml
+++ b/estate/reports/estate_salesman_property_offer_report_template.xml
@@ -42,4 +42,4 @@
             </t>
         </t>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/reports/print_offer_table_subtemplate.xml b/estate/reports/print_offer_table_subtemplate.xml
index b6a9746cee4..78cd5ad87e2 100644
--- a/estate/reports/print_offer_table_subtemplate.xml
+++ b/estate/reports/print_offer_table_subtemplate.xml
@@ -39,4 +39,4 @@
             </p>
         </t>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/security/estate_security.xml b/estate/security/estate_security.xml
index f3885957889..836ae6958db 100644
--- a/estate/security/estate_security.xml
+++ b/estate/security/estate_security.xml
@@ -9,8 +9,8 @@
     <record id="estate_group_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_real_estate_brokerage"></field>
-        <field name="implied_ids" eval="[ref('estate_group_user')]"/>
-        <field name="users" eval="[ref('base.user_admin')]"/>
+        <field name="implied_ids" eval="[(4, ref('estate.estate_group_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_admin'))]"/>
     </record>
 
     <record id="estate_property_record_rule_agent" model="ir.rule">
@@ -30,4 +30,5 @@
             [(1, '=', 1)]
         </field>
     </record>
-</odoo>
\ No newline at end of file
+
+</odoo>
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index 9fa7fe5eab1..ef5f36a60b7 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -11,4 +11,3 @@ access_estate_property_type,access_estate_property_type,model_estate_property_ty
 access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,estate.estate_group_user,1,0,0,0
 access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,estate.estate_group_user,1,1,1,1
 access_add_offer,access_add_offer,model_add_offer,estate.estate_group_user,1,1,1,1
-
diff --git a/estate/views/estate_menu.xml b/estate/views/estate_menu.xml
index f96117c3ed0..fef0e406a7a 100644
--- a/estate/views/estate_menu.xml
+++ b/estate/views/estate_menu.xml
@@ -9,4 +9,4 @@
             <menuitem id="estate_menu_root_first_second_tag" action="estate_property_tag_action" name="Property Tag" sequence="2"/>
         </menuitem>
     </menuitem> 
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
index 5eb710b3396..73089209f87 100644
--- a/estate/views/estate_property_offer_views.xml
+++ b/estate/views/estate_property_offer_views.xml
@@ -4,6 +4,7 @@
         <field name="name">Offers</field>
         <field name="res_model">estate.property.offer</field>
         <field name="view_mode">tree,form</field>
+        <field name="domain">[('property_type_id', '=', active_id)]</field>
     </record>
 
     <record id="estate_property_offer_view_tree" model="ir.ui.view">
@@ -20,4 +21,4 @@
             </tree>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
index 96e868d75cc..5a2cd68dcf6 100644
--- a/estate/views/estate_property_tag_views.xml
+++ b/estate/views/estate_property_tag_views.xml
@@ -60,4 +60,4 @@
             </kanban>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
index 2c174cabcb8..5133186d849 100644
--- a/estate/views/estate_property_type_views.xml
+++ b/estate/views/estate_property_type_views.xml
@@ -54,4 +54,4 @@
             </form>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 116e1ece577..2c4b0fc5095 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -36,6 +36,7 @@
                   <field name="state" widget="statusbar" />
                </header>
                <sheet>
+                  <field name="property_image" widget="image" class="oe_avatar"/>
                   <h2>
                      Name:
                      <field name="name"/>
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml
index 43a6ab1eb38..f67d9f1dac1 100644
--- a/estate/views/res_users_views.xml
+++ b/estate/views/res_users_views.xml
@@ -12,4 +12,4 @@
             </page>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate/wizards/__init__.py b/estate/wizards/__init__.py
index 4186b9b067e..7e004753b11 100644
--- a/estate/wizards/__init__.py
+++ b/estate/wizards/__init__.py
@@ -1 +1 @@
-from . import add_offer
\ No newline at end of file
+from . import add_offer
diff --git a/estate/wizards/add_offer.py b/estate/wizards/add_offer.py
index bfd5be78569..565aa65b18e 100644
--- a/estate/wizards/add_offer.py
+++ b/estate/wizards/add_offer.py
@@ -19,6 +19,3 @@ def action_make_an_offer(self):
                 'partner_id': self.partner_id.id,
                 'property_id': property.id
             })
-
-        
-
diff --git a/estate/wizards/add_offer.xml b/estate/wizards/add_offer.xml
index 3aa7aaac28d..e515189f75c 100644
--- a/estate/wizards/add_offer.xml
+++ b/estate/wizards/add_offer.xml
@@ -23,4 +23,4 @@
             </form>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
index bfbcf619ea2..86146043e32 100644
--- a/estate_account/models/estate_property.py
+++ b/estate_account/models/estate_property.py
@@ -35,4 +35,3 @@ def action_sold(self):
         })
 
         return supper_call
-        
\ No newline at end of file
diff --git a/estate_account/reports/estate_property_offer_report_inherit_template.xml b/estate_account/reports/estate_property_offer_report_inherit_template.xml
index b3aa656f32c..fc9c671d14a 100644
--- a/estate_account/reports/estate_property_offer_report_inherit_template.xml
+++ b/estate_account/reports/estate_property_offer_report_inherit_template.xml
@@ -11,4 +11,4 @@
             </t>
         </xpath>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml b/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml
index 4aef1437941..214d0750204 100644
--- a/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml
+++ b/estate_account/reports/estate_salesman_property_offer_report_inherit_template.xml
@@ -11,4 +11,4 @@
             </t>
         </xpath>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>

From 779b0c3ff8160dcc468a0f4af2666e3db02ef45d Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Mon, 4 Nov 2024 20:57:46 +0530
Subject: [PATCH 12/16] [ADD] stock_transport: link fleet management with batch
 transfers in inventory

- Developed the stock_transport module to establish a connection between fleet
management and batch transfers within the inventory system.
- Introduced max_weight and max_volume fields in fleet categories to specify
capacity limits.
- Modified the fleet vehicle model's display_name to include maximum weight and
volume values (max_w, max_v).
- Added computed fields weight and volume in stock batch picking to calculate the
cumulative weight and volume of items within each batch.
- Created the stock_install module to handle the installation of stock_transport
through inventory settings.
---
 stock_install/__init__.py                     |  1 +
 stock_install/__manifest__.py                 | 15 +++++++
 stock_install/models/__init__.py              |  1 +
 stock_install/models/res_config_setting.py    |  7 ++++
 .../views/res_config_settings_views.xml       | 15 +++++++
 stock_transport/__init__.py                   |  1 +
 stock_transport/__manifest__.py               | 18 ++++++++
 stock_transport/models/__init__.py            |  4 ++
 stock_transport/models/dock.py                |  7 ++++
 .../models/fleet_vehicle_model_category.py    | 12 ++++++
 stock_transport/models/stock_picking.py       | 12 ++++++
 stock_transport/models/stock_picking_batch.py | 41 +++++++++++++++++++
 stock_transport/security/ir.model.access.csv  |  3 ++
 .../views/fleet_vehicle_model_views.xml       | 28 +++++++++++++
 .../views/stock_picking_batch_views.xml       | 17 ++++++++
 stock_transport/views/stock_picking_views.xml | 14 +++++++
 16 files changed, 196 insertions(+)
 create mode 100644 stock_install/__init__.py
 create mode 100644 stock_install/__manifest__.py
 create mode 100644 stock_install/models/__init__.py
 create mode 100644 stock_install/models/res_config_setting.py
 create mode 100644 stock_install/views/res_config_settings_views.xml
 create mode 100644 stock_transport/__init__.py
 create mode 100644 stock_transport/__manifest__.py
 create mode 100644 stock_transport/models/__init__.py
 create mode 100644 stock_transport/models/dock.py
 create mode 100644 stock_transport/models/fleet_vehicle_model_category.py
 create mode 100644 stock_transport/models/stock_picking.py
 create mode 100644 stock_transport/models/stock_picking_batch.py
 create mode 100644 stock_transport/security/ir.model.access.csv
 create mode 100644 stock_transport/views/fleet_vehicle_model_views.xml
 create mode 100644 stock_transport/views/stock_picking_batch_views.xml
 create mode 100644 stock_transport/views/stock_picking_views.xml

diff --git a/stock_install/__init__.py b/stock_install/__init__.py
new file mode 100644
index 00000000000..9a7e03eded3
--- /dev/null
+++ b/stock_install/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/stock_install/__manifest__.py b/stock_install/__manifest__.py
new file mode 100644
index 00000000000..0a5f03cf466
--- /dev/null
+++ b/stock_install/__manifest__.py
@@ -0,0 +1,15 @@
+{
+    'name': "stock_install",
+    'depends': ['stock'],
+    'author': "sahm@odoo.com",
+    'description': "This is my stock_install module.",
+    'data': [
+        'views/res_config_settings_views.xml'
+    ],
+    'demo': [
+
+    ],
+    'installable': True,
+    'application': False,
+    'auto_install': True
+}
diff --git a/stock_install/models/__init__.py b/stock_install/models/__init__.py
new file mode 100644
index 00000000000..e1abf59ce87
--- /dev/null
+++ b/stock_install/models/__init__.py
@@ -0,0 +1 @@
+from . import res_config_setting
\ No newline at end of file
diff --git a/stock_install/models/res_config_setting.py b/stock_install/models/res_config_setting.py
new file mode 100644
index 00000000000..014bef2a711
--- /dev/null
+++ b/stock_install/models/res_config_setting.py
@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    module_stock_transport = fields.Boolean("Dispatch Management System")
\ No newline at end of file
diff --git a/stock_install/views/res_config_settings_views.xml b/stock_install/views/res_config_settings_views.xml
new file mode 100644
index 00000000000..5ef00cea9f1
--- /dev/null
+++ b/stock_install/views/res_config_settings_views.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="res_config_setting_inherit_res_config_setting" model="ir.ui.view">
+        <field name="name">res_config_setting_inherit_res_config_setting</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//setting[@id='delivery']" position="after">
+                <setting id="dispatch_management_system" help="Transport Management: organize pack in your fleet, or carriers.">
+                    <field name="module_stock_transport"></field>
+                </setting>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/stock_transport/__init__.py b/stock_transport/__init__.py
new file mode 100644
index 00000000000..0650744f6bc
--- /dev/null
+++ b/stock_transport/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/stock_transport/__manifest__.py b/stock_transport/__manifest__.py
new file mode 100644
index 00000000000..e3b0fa8784f
--- /dev/null
+++ b/stock_transport/__manifest__.py
@@ -0,0 +1,18 @@
+{
+    'name': "stock_transport",
+    'depends': ['stock_picking_batch', 'fleet'],
+    'author': "sahm@odoo.com",
+    'description': "This is my stock_transport module.",
+    'data': [
+        'security/ir.model.access.csv',
+        'views/stock_picking_batch_views.xml',
+        'views/fleet_vehicle_model_views.xml',
+        'views/stock_picking_views.xml',
+    ],
+    'demo': [
+
+    ],
+    'installable': True,
+    'application': False,
+    'auto_install': False
+}
diff --git a/stock_transport/models/__init__.py b/stock_transport/models/__init__.py
new file mode 100644
index 00000000000..0d3615884af
--- /dev/null
+++ b/stock_transport/models/__init__.py
@@ -0,0 +1,4 @@
+from . import fleet_vehicle_model_category
+from . import dock
+from . import stock_picking_batch
+from . import stock_picking
diff --git a/stock_transport/models/dock.py b/stock_transport/models/dock.py
new file mode 100644
index 00000000000..06c4cad47b3
--- /dev/null
+++ b/stock_transport/models/dock.py
@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class dock(models.Model):
+    _name = 'dock'
+
+    name = fields.Char()
diff --git a/stock_transport/models/fleet_vehicle_model_category.py b/stock_transport/models/fleet_vehicle_model_category.py
new file mode 100644
index 00000000000..09df774a749
--- /dev/null
+++ b/stock_transport/models/fleet_vehicle_model_category.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class FleetVehicleModelCategory(models.Model):
+    _inherit = 'fleet.vehicle.model.category'
+
+    max_weight = fields.Float()
+    max_volume = fields.Float()
+
+    def _compute_display_name(self):
+        for record in self:
+            record.display_name = record.name + ' (' + str(record.max_weight) + ' kg, ' + str(record.max_volume) + ' m3)'
diff --git a/stock_transport/models/stock_picking.py b/stock_transport/models/stock_picking.py
new file mode 100644
index 00000000000..69e81932db0
--- /dev/null
+++ b/stock_transport/models/stock_picking.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class Picking(models.Model):
+    _inherit = 'stock.picking'
+
+    volume = fields.Float(compute="_compute_volume")
+
+    def _compute_volume(self):
+        for record in self:
+            for move_line in record.move_ids:
+                record.volume = record.volume + move_line.quantity * move_line.product_id.volume
diff --git a/stock_transport/models/stock_picking_batch.py b/stock_transport/models/stock_picking_batch.py
new file mode 100644
index 00000000000..a280716786d
--- /dev/null
+++ b/stock_transport/models/stock_picking_batch.py
@@ -0,0 +1,41 @@
+from odoo import fields, models, api
+
+
+class stockPickingBatch(models.Model):
+    _inherit = 'stock.picking.batch'
+
+    weight = fields.Float(compute="_compute_weight", string='Weight')
+    volume = fields.Float(compute="_compute_volume", string='Volume')
+
+    dock_id = fields.Many2one(comodel_name='dock', string="Dock")
+    vehicle_id = fields.Many2one(comodel_name='fleet.vehicle', string="Vehicle")
+    category_id = fields.Many2one(comodel_name='fleet.vehicle.model.category', string='Category', compute='_compute_category')
+
+    @api.depends('vehicle_id')
+    def _compute_category(self):
+        for record in self:
+            record.category_id = record.vehicle_id.category_id.id
+
+    def _compute_weight(self):
+        for record in self:
+            max_weight = record.category_id.max_weight
+            for picking_line in record.picking_ids:
+                for move_line in picking_line.move_ids:
+                    record.weight = record.weight + move_line.product_id.weight * move_line.quantity
+            total_weight = record.weight
+            if max_weight == 0:
+                record.weight = 0.0
+            else:
+                record.weight = total_weight / max_weight * 100
+
+    def _compute_volume(self):
+        for record in self:
+            max_volume = record.category_id.max_volume
+            for picking_line in record.picking_ids:
+                for move_line in picking_line.move_ids:
+                    record.volume = record.volume + move_line.product_id.volume * move_line.quantity
+            if max_volume == 0:
+                record.volume = 0.0
+            else:
+                record.volume = record.volume / max_volume * 100
+        
\ No newline at end of file
diff --git a/stock_transport/security/ir.model.access.csv b/stock_transport/security/ir.model.access.csv
new file mode 100644
index 00000000000..3981cd4e157
--- /dev/null
+++ b/stock_transport/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+
+access_dock,access_dock,model_dock,base.group_user,1,1,1,1
diff --git a/stock_transport/views/fleet_vehicle_model_views.xml b/stock_transport/views/fleet_vehicle_model_views.xml
new file mode 100644
index 00000000000..ab774d72ad9
--- /dev/null
+++ b/stock_transport/views/fleet_vehicle_model_views.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="fleet_vehicle_model_category_view_tree_inherit_stock_transport" model="ir.ui.view">
+        <field name="name">fleet.vehicle.model.category.view.tree.inherit</field>
+        <field name="model">fleet.vehicle.model.category</field>
+        <field name="inherit_id" ref="fleet.fleet_vehicle_model_category_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="max_weight"></field>
+                <field name="max_volume"></field>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="fleet_vehicle_model_category_view_form_inherit_stock_transport" model="ir.ui.view">
+        <field name="name">fleet.vehicle.model.category.view.form.inherit</field>
+        <field name="model">fleet.vehicle.model.category</field>
+        <field name="inherit_id" ref="fleet.fleet_vehicle_model_category_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="max_weight"></field>
+            </xpath>
+            <xpath expr="//field[@name='sequence']" position="after">
+                <field name="max_volume"></field>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/stock_transport/views/stock_picking_batch_views.xml b/stock_transport/views/stock_picking_batch_views.xml
new file mode 100644
index 00000000000..41eb980cdb4
--- /dev/null
+++ b/stock_transport/views/stock_picking_batch_views.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="stock_picking_batch_form_inherit_stock_transport" model="ir.ui.view">
+        <field name="name">stock.picking.batch.form.inherit</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="inherit_id" ref="stock_picking_batch.stock_picking_batch_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='scheduled_date']" position="after">
+                <field name="dock_id"/>
+                <field name="vehicle_id" placeholder="Third party provider"/>
+                <field name="category_id"/>
+                <field name="weight" widget="progressbar" invisible="not category_id"/>
+                <field name="volume" widget="progressbar" invisible="not category_id"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/stock_transport/views/stock_picking_views.xml b/stock_transport/views/stock_picking_views.xml
new file mode 100644
index 00000000000..3aea0395500
--- /dev/null
+++ b/stock_transport/views/stock_picking_views.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="vpicktree_inherit_stock_transport" model="ir.ui.view">
+        <field name="name">vpicktree.inherit</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.vpicktree"/>
+        <field name="mode">extension</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='scheduled_date']" position="after">
+                <field name="volume"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From 3d906fb5dd6d527241f15c78074070152b8d8b77 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Tue, 5 Nov 2024 14:16:11 +0530
Subject: [PATCH 13/16] [IMP] stock_transport: integrate graph and gantt views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added a Graph View to visualize key measures, including volume, weight,
transfers, and lines.
- Introduced a customized Gantt View
- Modified the display name to provide better batch identification.
- Set default grouping by Dock and Fleet together.
- Included visual indicators such as decoration-success, decoration-info, and
decoration-warning based on the batch’s status.
---
 stock_transport/models/stock_picking.py       |  7 +-
 stock_transport/models/stock_picking_batch.py | 71 +++++++++++++++----
 .../views/stock_picking_batch_views.xml       | 35 ++++++++-
 3 files changed, 96 insertions(+), 17 deletions(-)

diff --git a/stock_transport/models/stock_picking.py b/stock_transport/models/stock_picking.py
index 69e81932db0..3244053dc08 100644
--- a/stock_transport/models/stock_picking.py
+++ b/stock_transport/models/stock_picking.py
@@ -1,4 +1,4 @@
-from odoo import fields, models
+from odoo import fields, models, api
 
 
 class Picking(models.Model):
@@ -6,7 +6,10 @@ class Picking(models.Model):
 
     volume = fields.Float(compute="_compute_volume")
 
+    @api.depends('move_ids.product_id.volume')
     def _compute_volume(self):
         for record in self:
+            total_volume = 0
             for move_line in record.move_ids:
-                record.volume = record.volume + move_line.quantity * move_line.product_id.volume
+                total_volume = total_volume + move_line.quantity * move_line.product_id.volume
+            record.volume = total_volume
diff --git a/stock_transport/models/stock_picking_batch.py b/stock_transport/models/stock_picking_batch.py
index a280716786d..01606f0d677 100644
--- a/stock_transport/models/stock_picking_batch.py
+++ b/stock_transport/models/stock_picking_batch.py
@@ -4,38 +4,83 @@
 class stockPickingBatch(models.Model):
     _inherit = 'stock.picking.batch'
 
-    weight = fields.Float(compute="_compute_weight", string='Weight')
-    volume = fields.Float(compute="_compute_volume", string='Volume')
+    weight_percentage = fields.Float(compute="_compute_weight_percentage", string='Weight')
+    volume_percentage = fields.Float(compute="_compute_volume_percentage", string='Volume')
+
+    weight = fields.Float(string="Weight", compute="_compute_weight", store=True)
+    volume = fields.Float(string="Volume", compute="_compute_volume", store=True)
+    number_of_transfer = fields.Integer(string="Transfer", compute="_compute_number_of_transfer", store=True)
+    number_of_line = fields.Integer(string="Line", compute="_compute_number_of_line", store=True)
 
     dock_id = fields.Many2one(comodel_name='dock', string="Dock")
     vehicle_id = fields.Many2one(comodel_name='fleet.vehicle', string="Vehicle")
-    category_id = fields.Many2one(comodel_name='fleet.vehicle.model.category', string='Category', compute='_compute_category')
+    category_id = fields.Many2one(comodel_name='fleet.vehicle.model.category', string='Category', compute='_compute_category', store="True")
+
+    def _compute_display_name(self):
+        super()._compute_display_name()
+        for record in self:
+            record.display_name = f"{record.name}: {record.weight} kg, {record.volume} m3"
 
     @api.depends('vehicle_id')
     def _compute_category(self):
         for record in self:
             record.category_id = record.vehicle_id.category_id.id
 
-    def _compute_weight(self):
+    @api.depends('picking_ids', 'picking_ids.move_ids', 'category_id.max_weight', 'picking_ids.move_ids.product_id.weight')
+    def _compute_weight_percentage(self):
         for record in self:
             max_weight = record.category_id.max_weight
+            total_weight = 0
             for picking_line in record.picking_ids:
                 for move_line in picking_line.move_ids:
-                    record.weight = record.weight + move_line.product_id.weight * move_line.quantity
-            total_weight = record.weight
+                    total_weight = total_weight + move_line.product_id.weight * move_line.quantity
             if max_weight == 0:
-                record.weight = 0.0
+                record.weight_percentage = 0.0
             else:
-                record.weight = total_weight / max_weight * 100
+                record.weight_percentage = total_weight / max_weight * 100
 
-    def _compute_volume(self):
+    @api.depends('picking_ids', 'picking_ids.move_ids', 'category_id.max_volume', 'picking_ids.move_ids.product_id.volume')
+    def _compute_volume_percentage(self):
         for record in self:
             max_volume = record.category_id.max_volume
+            total_volume = 0
             for picking_line in record.picking_ids:
                 for move_line in picking_line.move_ids:
-                    record.volume = record.volume + move_line.product_id.volume * move_line.quantity
+                    total_volume = total_volume + move_line.product_id.volume * move_line.quantity
             if max_volume == 0:
-                record.volume = 0.0
+                record.volume_percentage = 0.0
             else:
-                record.volume = record.volume / max_volume * 100
-        
\ No newline at end of file
+                record.volume_percentage = total_volume / max_volume * 100
+    
+    @api.depends('picking_ids', 'picking_ids.move_ids', 'picking_ids.move_ids.product_id.weight')
+    def _compute_weight(self):
+        for record in self:
+            total_weight = 0
+            for picking_line in record.picking_ids:
+                for move_line in picking_line.move_ids:
+                    total_weight = total_weight + move_line.product_id.weight * move_line.quantity
+            record.weight = total_weight
+
+    @api.depends('picking_ids', 'picking_ids.move_ids', 'picking_ids.move_ids.product_id.volume')
+    def _compute_volume(self):
+        for record in self:
+            total_volume = 0
+            for picking_line in record.picking_ids:
+                for move_line in picking_line.move_ids:
+                    total_volume = total_volume + move_line.product_id.volume * move_line.quantity
+            record.volume = total_volume
+
+    @api.depends('picking_ids')
+    def _compute_number_of_transfer(self):
+        for record in self:
+            record.number_of_transfer = len(record.picking_ids)
+    
+    @api.depends('picking_ids', 'picking_ids.move_ids')
+    def _compute_number_of_line(self):
+        for record in self:
+            total_lines = 0
+            for picking_line in record.picking_ids:
+                    total_lines = total_lines + len(picking_line.move_ids)
+            record.number_of_line = total_lines
+
+
diff --git a/stock_transport/views/stock_picking_batch_views.xml b/stock_transport/views/stock_picking_batch_views.xml
index 41eb980cdb4..3b88f7a0b47 100644
--- a/stock_transport/views/stock_picking_batch_views.xml
+++ b/stock_transport/views/stock_picking_batch_views.xml
@@ -9,9 +9,40 @@
                 <field name="dock_id"/>
                 <field name="vehicle_id" placeholder="Third party provider"/>
                 <field name="category_id"/>
-                <field name="weight" widget="progressbar" invisible="not category_id"/>
-                <field name="volume" widget="progressbar" invisible="not category_id"/>
+                <field name="weight_percentage" widget="progressbar" invisible="not category_id"/>
+                <field name="volume_percentage" widget="progressbar" invisible="not category_id"/>
             </xpath>
         </field>
     </record>
+
+    <record id="stock_picking_batch.stock_picking_batch_action" model="ir.actions.act_window">
+        <field name="view_mode">tree,kanban,graph,gantt,form</field>
+    </record>
+
+    <record id="stock_picking_batch_view_graph" model="ir.ui.view">
+        <field name="name">stock.picking.batch.view.graph</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="arch" type="xml">
+            <graph string="Batch Transfer Graph View" type="bar">
+                <field name="scheduled_date" interval="day"></field>
+                <field name="category_id"></field>
+                <field name="number_of_transfer" type="measure"></field>
+            </graph>
+        </field>
+    </record>
+
+    <record id="stock_picking_batch_view_gantt" model="ir.ui.view">
+        <field name="name">stock.picking.batch.view.gantt</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="arch" type="xml">
+            <gantt color="id" string="Gantt View" date_start="scheduled_date" date_stop="scheduled_date" 
+            default_group_by="dock_id,vehicle_id" 
+            default_scale="week"
+            decoration-info="state == 'draft'"
+            >
+                <field name="state"></field>
+            </gantt>
+        </field>
+    </record>
+
 </odoo>

From fc67cf0bdb3af6acf917fee9823d743522d132c3 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Thu, 7 Nov 2024 10:20:32 +0530
Subject: [PATCH 14/16] [ADD] stock_transport: restrict visibility of print
 label button and fields

- Made Print Label button visible only to Michell admin (user_admin).
- Restricted visibility of fields in stock_transport module (category, vehicle,
progress bar, dock, max_volume, max_weight, volume column) to Michell admin
(user_admin).
---
 stock_transport/__manifest__.py                     |  1 +
 stock_transport/models/stock_picking_batch.py       | 12 +++---------
 stock_transport/security/ir.model.access.csv        |  2 +-
 .../security/stock_transport_security.xml           |  7 +++++++
 stock_transport/views/fleet_vehicle_model_views.xml |  8 ++++----
 stock_transport/views/stock_picking_batch_views.xml | 13 ++++++++-----
 stock_transport/views/stock_picking_views.xml       |  2 +-
 7 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 stock_transport/security/stock_transport_security.xml

diff --git a/stock_transport/__manifest__.py b/stock_transport/__manifest__.py
index e3b0fa8784f..aa65ce2821f 100644
--- a/stock_transport/__manifest__.py
+++ b/stock_transport/__manifest__.py
@@ -4,6 +4,7 @@
     'author': "sahm@odoo.com",
     'description': "This is my stock_transport module.",
     'data': [
+        'security/stock_transport_security.xml',
         'security/ir.model.access.csv',
         'views/stock_picking_batch_views.xml',
         'views/fleet_vehicle_model_views.xml',
diff --git a/stock_transport/models/stock_picking_batch.py b/stock_transport/models/stock_picking_batch.py
index 01606f0d677..aae62bd2e8f 100644
--- a/stock_transport/models/stock_picking_batch.py
+++ b/stock_transport/models/stock_picking_batch.py
@@ -3,6 +3,7 @@
 
 class stockPickingBatch(models.Model):
     _inherit = 'stock.picking.batch'
+    _rec_name = 'name'
 
     weight_percentage = fields.Float(compute="_compute_weight_percentage", string='Weight')
     volume_percentage = fields.Float(compute="_compute_volume_percentage", string='Volume')
@@ -14,14 +15,9 @@ class stockPickingBatch(models.Model):
 
     dock_id = fields.Many2one(comodel_name='dock', string="Dock")
     vehicle_id = fields.Many2one(comodel_name='fleet.vehicle', string="Vehicle")
-    category_id = fields.Many2one(comodel_name='fleet.vehicle.model.category', string='Category', compute='_compute_category', store="True")
+    category_id = fields.Many2one(comodel_name='fleet.vehicle.model.category', string='Category', compute='_compute_category', store=True)
 
-    def _compute_display_name(self):
-        super()._compute_display_name()
-        for record in self:
-            record.display_name = f"{record.name}: {record.weight} kg, {record.volume} m3"
-
-    @api.depends('vehicle_id')
+    @api.depends('vehicle_id', 'vehicle_id.category_id')
     def _compute_category(self):
         for record in self:
             record.category_id = record.vehicle_id.category_id.id
@@ -82,5 +78,3 @@ def _compute_number_of_line(self):
             for picking_line in record.picking_ids:
                     total_lines = total_lines + len(picking_line.move_ids)
             record.number_of_line = total_lines
-
-
diff --git a/stock_transport/security/ir.model.access.csv b/stock_transport/security/ir.model.access.csv
index 3981cd4e157..db73dffc716 100644
--- a/stock_transport/security/ir.model.access.csv
+++ b/stock_transport/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 
-access_dock,access_dock,model_dock,base.group_user,1,1,1,1
+access_dock,access_dock,model_dock,stock_transport.group_stock_transport_admin,1,1,1,1
diff --git a/stock_transport/security/stock_transport_security.xml b/stock_transport/security/stock_transport_security.xml
new file mode 100644
index 00000000000..5e1bd10f696
--- /dev/null
+++ b/stock_transport/security/stock_transport_security.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="group_stock_transport_admin" model="res.groups">
+        <field name="name">Admin</field>
+        <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/stock_transport/views/fleet_vehicle_model_views.xml b/stock_transport/views/fleet_vehicle_model_views.xml
index ab774d72ad9..ba2c186891a 100644
--- a/stock_transport/views/fleet_vehicle_model_views.xml
+++ b/stock_transport/views/fleet_vehicle_model_views.xml
@@ -6,8 +6,8 @@
         <field name="inherit_id" ref="fleet.fleet_vehicle_model_category_view_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='name']" position="after">
-                <field name="max_weight"></field>
-                <field name="max_volume"></field>
+                <field name="max_weight" groups="stock_transport.group_stock_transport_admin"></field>
+                <field name="max_volume" groups="stock_transport.group_stock_transport_admin"></field>
             </xpath>
         </field>
     </record>
@@ -18,10 +18,10 @@
         <field name="inherit_id" ref="fleet.fleet_vehicle_model_category_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='name']" position="after">
-                <field name="max_weight"></field>
+                <field name="max_weight" groups="stock_transport.group_stock_transport_admin"></field>
             </xpath>
             <xpath expr="//field[@name='sequence']" position="after">
-                <field name="max_volume"></field>
+                <field name="max_volume" groups="stock_transport.group_stock_transport_admin"></field>
             </xpath>
         </field>
     </record>
diff --git a/stock_transport/views/stock_picking_batch_views.xml b/stock_transport/views/stock_picking_batch_views.xml
index 3b88f7a0b47..7a4cec9cd30 100644
--- a/stock_transport/views/stock_picking_batch_views.xml
+++ b/stock_transport/views/stock_picking_batch_views.xml
@@ -6,11 +6,14 @@
         <field name="inherit_id" ref="stock_picking_batch.stock_picking_batch_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='scheduled_date']" position="after">
-                <field name="dock_id"/>
-                <field name="vehicle_id" placeholder="Third party provider"/>
-                <field name="category_id"/>
-                <field name="weight_percentage" widget="progressbar" invisible="not category_id"/>
-                <field name="volume_percentage" widget="progressbar" invisible="not category_id"/>
+                <field name="dock_id" groups="stock_transport.group_stock_transport_admin"/>
+                <field name="vehicle_id" placeholder="Third party provider" groups="stock_transport.group_stock_transport_admin"/>
+                <field name="category_id" invisible="not vehicle_id" groups="stock_transport.group_stock_transport_admin"/>
+                <field name="weight_percentage" widget="progressbar" invisible="not category_id" groups="stock_transport.group_stock_transport_admin"/>
+                <field name="volume_percentage" widget="progressbar" invisible="not category_id" groups="stock_transport.group_stock_transport_admin"/>
+            </xpath>
+            <xpath expr="//button[@name='action_open_label_layout']" position="attributes">
+                <attribute name="groups">stock_transport.group_stock_transport_admin</attribute>
             </xpath>
         </field>
     </record>
diff --git a/stock_transport/views/stock_picking_views.xml b/stock_transport/views/stock_picking_views.xml
index 3aea0395500..dabb9596806 100644
--- a/stock_transport/views/stock_picking_views.xml
+++ b/stock_transport/views/stock_picking_views.xml
@@ -7,7 +7,7 @@
         <field name="mode">extension</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='scheduled_date']" position="after">
-                <field name="volume"/>
+                <field name="volume" groups="stock_transport.group_stock_transport_admin"/>
             </xpath>
         </field>
     </record>

From 3018eb01a62d43753baf22152c74b6731543d03e Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Thu, 7 Nov 2024 20:00:20 +0530
Subject: [PATCH 15/16] [ADD] sub_product: final task

---
 sub_product/__init__.py                   |  2 ++
 sub_product/__manifest__.py               | 18 +++++++++++
 sub_product/models/__init__.py            |  2 ++
 sub_product/models/product_template.py    |  9 ++++++
 sub_product/models/sale_order_line.py     |  7 +++++
 sub_product/security/ir.model.access.csv  |  4 +++
 sub_product/views/product_views.xml       | 14 +++++++++
 sub_product/views/sale_order_views.xml    | 14 +++++++++
 sub_product/wizard/__init__.py            |  2 ++
 sub_product/wizard/sub_products.py        | 37 +++++++++++++++++++++++
 sub_product/wizard/sub_products_line.py   | 19 ++++++++++++
 sub_product/wizard/sub_products_views.xml | 33 ++++++++++++++++++++
 12 files changed, 161 insertions(+)
 create mode 100644 sub_product/__init__.py
 create mode 100644 sub_product/__manifest__.py
 create mode 100644 sub_product/models/__init__.py
 create mode 100644 sub_product/models/product_template.py
 create mode 100644 sub_product/models/sale_order_line.py
 create mode 100644 sub_product/security/ir.model.access.csv
 create mode 100644 sub_product/views/product_views.xml
 create mode 100644 sub_product/views/sale_order_views.xml
 create mode 100644 sub_product/wizard/__init__.py
 create mode 100644 sub_product/wizard/sub_products.py
 create mode 100644 sub_product/wizard/sub_products_line.py
 create mode 100644 sub_product/wizard/sub_products_views.xml

diff --git a/sub_product/__init__.py b/sub_product/__init__.py
new file mode 100644
index 00000000000..9b4296142f4
--- /dev/null
+++ b/sub_product/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from . import wizard
diff --git a/sub_product/__manifest__.py b/sub_product/__manifest__.py
new file mode 100644
index 00000000000..6dd5c6f845d
--- /dev/null
+++ b/sub_product/__manifest__.py
@@ -0,0 +1,18 @@
+{
+    'name': "sub_product",
+    'depends': ['sale_management'],
+    'author': "sahm@odoo.com",
+    'description': "This module will help to add sub-product in product.",
+    'data': [
+        'security/ir.model.access.csv',
+        'wizard/sub_products_views.xml',
+        'views/product_views.xml',
+        'views/sale_order_views.xml'
+    ],
+    'demo': [
+
+    ],
+    'installable': True,
+    'application': False,
+    'auto_install': False
+}
diff --git a/sub_product/models/__init__.py b/sub_product/models/__init__.py
new file mode 100644
index 00000000000..83527162d00
--- /dev/null
+++ b/sub_product/models/__init__.py
@@ -0,0 +1,2 @@
+from . import product_template
+from . import sale_order_line
diff --git a/sub_product/models/product_template.py b/sub_product/models/product_template.py
new file mode 100644
index 00000000000..61689af56fb
--- /dev/null
+++ b/sub_product/models/product_template.py
@@ -0,0 +1,9 @@
+from odoo import fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    is_kit = fields.Boolean()
+    sub_product_ids = fields.Many2many('product.product')
+
diff --git a/sub_product/models/sale_order_line.py b/sub_product/models/sale_order_line.py
new file mode 100644
index 00000000000..23ecc964aa0
--- /dev/null
+++ b/sub_product/models/sale_order_line.py
@@ -0,0 +1,7 @@
+from odoo import fields, models, api
+
+
+class SaleOrderLine(models.Model):
+    _inherit = 'sale.order.line'
+
+    is_kit = fields.Boolean(related='product_template_id.is_kit')
\ No newline at end of file
diff --git a/sub_product/security/ir.model.access.csv b/sub_product/security/ir.model.access.csv
new file mode 100644
index 00000000000..f037aeecff4
--- /dev/null
+++ b/sub_product/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+
+access_sub_products,access_sub_products,model_sub_products,base.group_user,1,1,1,1
+access_sub_products_line,access_sub_products_line,model_sub_products_line,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/sub_product/views/product_views.xml b/sub_product/views/product_views.xml
new file mode 100644
index 00000000000..65824847f9d
--- /dev/null
+++ b/sub_product/views/product_views.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="product_template_form_view_inherit_sub_product" model="ir.ui.view">
+        <field name="name">product.template.view.form.inherit</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_tooltip']" position="after">
+                <field name="is_kit"/>
+                <field name="sub_product_ids" widget="many2many_tags" invisible="not is_kit"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sub_product/views/sale_order_views.xml b/sub_product/views/sale_order_views.xml
new file mode 100644
index 00000000000..132da1f80ef
--- /dev/null
+++ b/sub_product/views/sale_order_views.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="view_order_form_inherit_sub_product" model="ir.ui.view">
+        <field name="name">sale.order.view.form.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_template_id']" position="after">
+                <field name="is_kit" column_invisible="1"/>
+                <button string="Sub Product" name="%(sub_product.action_sub_products)d" type="action" class="oe_highlight" invisible="state == 'sale' or not is_kit"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sub_product/wizard/__init__.py b/sub_product/wizard/__init__.py
new file mode 100644
index 00000000000..6d701129125
--- /dev/null
+++ b/sub_product/wizard/__init__.py
@@ -0,0 +1,2 @@
+from . import sub_products
+from . import sub_products_line
\ No newline at end of file
diff --git a/sub_product/wizard/sub_products.py b/sub_product/wizard/sub_products.py
new file mode 100644
index 00000000000..7c57e5dcaab
--- /dev/null
+++ b/sub_product/wizard/sub_products.py
@@ -0,0 +1,37 @@
+from odoo import fields, models, api
+
+
+class SubProducts(models.TransientModel):
+    _name = 'sub.products'
+    _description = "Sub Product"
+
+    sub_product_line_ids = fields.One2many('sub.products.line', 'sub_product_id')
+
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        active_id = self.env.context.get('active_id')
+        record = self.env["sale.order.line"].browse(active_id)
+        sub_product_lines = []
+        for sub_product in record.product_template_id.sub_product_ids:
+            sub_product_lines.append((0, 0, {'product_id' : sub_product.id}))
+        res['sub_product_line_ids'] = sub_product_lines
+        return res
+    
+    def action_add_sub_product(self):
+        active_id = self.env.context.get('active_id')
+        product_order_line = self.env["sale.order.line"].browse(active_id)
+        new_price_unit = product_order_line.product_uom_qty * product_order_line.price_unit
+        for sub_product_line in self.sub_product_line_ids:
+            self.env['sale.order.line'].create(
+                {
+                    'order_id': product_order_line.order_id.id,
+                    'product_id': sub_product_line.product_id.id,
+                    'name': sub_product_line.product_id.name,
+                    'product_uom_qty': sub_product_line.quantity,
+                    'price_unit': 0.0,
+                    'customer_lead': 0.0
+                }
+            )
+            new_price_unit = new_price_unit + sub_product_line.quantity * sub_product_line.price
+        product_order_line.price_unit = new_price_unit
diff --git a/sub_product/wizard/sub_products_line.py b/sub_product/wizard/sub_products_line.py
new file mode 100644
index 00000000000..e141d479a40
--- /dev/null
+++ b/sub_product/wizard/sub_products_line.py
@@ -0,0 +1,19 @@
+from odoo import fields, models, api
+
+
+class SubProuctsLine(models.TransientModel):
+    _name = 'sub.products.line'
+    _description = "Sub Product Line"
+
+    sub_product_id = fields.Many2one('sub.products')
+    product_id = fields.Many2one('product.product')
+    product_name = fields.Char(related='product_id.name')
+    quantity = fields.Integer()
+    # price = fields.Float(compute="_compute_price", readonly=False, store=True)
+    price = fields.Float(readonly=False, store=True)
+
+    # @api.depends('product_id.lst_price')
+    # def _compute_price(self):
+    #     for record in self:
+    #         if not record.price:
+    #             record.price = record.product_id.lst_price
diff --git a/sub_product/wizard/sub_products_views.xml b/sub_product/wizard/sub_products_views.xml
new file mode 100644
index 00000000000..037faf2b27d
--- /dev/null
+++ b/sub_product/wizard/sub_products_views.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="action_sub_products" model="ir.actions.act_window">
+        <field name="name">Wizard</field>
+        <field name="res_model">sub.products</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <record id="sub_products_view_form" model="ir.ui.view">
+        <field name="name">sub.products.view.form</field>
+        <field name="model">sub.products</field>
+        <field name="arch" type="xml">
+            <form>
+                <h3>
+                    Sub Products
+                </h3>
+                <field name="sub_product_line_ids">
+                    <tree create='0' editable='1'>
+                        <field name="product_id"/>
+                        <field name="quantity"/>
+                        <field name="price"/>
+                    </tree>
+                </field>
+                <footer>
+                    <button string="Confirm" name="action_add_sub_product" type="object" class="oe_highlight"/>
+                    <button string="Cancel" class="btn btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file

From 9e658b60dfac41349c0c9c8f4b63f8e514c68528 Mon Sep 17 00:00:00 2001
From: sahm-odoo <sahm@odoo.com>
Date: Fri, 8 Nov 2024 19:05:40 +0530
Subject: [PATCH 16/16] [IMP] sub_product: perform final task feature

- Added is_kit boolean field to identify kit products.
- Added button to allow adding sub-products under main
products.
- Created wizard view to display sub-products.
- Enabled addition of sub-products in order line, with automatic recalculation
of unit price for main product.
- Restricted editing of sub-product lines in order.
- Implemented automatic deletion of sub-products when main product is deleted.
- Added print_in_report boolean field to control display of sub-products in sale
order, preview, and invoice reports.
---
 sub_product/__init__.py                       |  1 +
 sub_product/__manifest__.py                   |  3 +-
 sub_product/models/__init__.py                |  1 +
 sub_product/models/sale_order.py              |  8 +++++
 sub_product/models/sale_order_line.py         |  4 ++-
 .../report/ir_actions_report_templates.xml    | 18 ++++++++++
 sub_product/views/sale_order_views.xml        | 35 +++++++++++++++++--
 sub_product/wizard/sub_products.py            | 31 ++++++++++++----
 sub_product/wizard/sub_products_line.py       |  7 ----
 sub_product/wizard/sub_products_views.xml     | 10 +++---
 10 files changed, 97 insertions(+), 21 deletions(-)
 create mode 100644 sub_product/models/sale_order.py
 create mode 100644 sub_product/report/ir_actions_report_templates.xml

diff --git a/sub_product/__init__.py b/sub_product/__init__.py
index 9b4296142f4..50235cbb122 100644
--- a/sub_product/__init__.py
+++ b/sub_product/__init__.py
@@ -1,2 +1,3 @@
 from . import models
 from . import wizard
+from . import report
diff --git a/sub_product/__manifest__.py b/sub_product/__manifest__.py
index 6dd5c6f845d..25bcf62f638 100644
--- a/sub_product/__manifest__.py
+++ b/sub_product/__manifest__.py
@@ -5,9 +5,10 @@
     'description': "This module will help to add sub-product in product.",
     'data': [
         'security/ir.model.access.csv',
+        'report/ir_actions_report_templates.xml',
         'wizard/sub_products_views.xml',
         'views/product_views.xml',
-        'views/sale_order_views.xml'
+        'views/sale_order_views.xml',
     ],
     'demo': [
 
diff --git a/sub_product/models/__init__.py b/sub_product/models/__init__.py
index 83527162d00..8f2f8c0cbc1 100644
--- a/sub_product/models/__init__.py
+++ b/sub_product/models/__init__.py
@@ -1,2 +1,3 @@
 from . import product_template
 from . import sale_order_line
+from . import sale_order
diff --git a/sub_product/models/sale_order.py b/sub_product/models/sale_order.py
new file mode 100644
index 00000000000..9131218859c
--- /dev/null
+++ b/sub_product/models/sale_order.py
@@ -0,0 +1,8 @@
+from odoo import fields, models
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    print_in_report = fields.Boolean()
+    
\ No newline at end of file
diff --git a/sub_product/models/sale_order_line.py b/sub_product/models/sale_order_line.py
index 23ecc964aa0..94caaf465d6 100644
--- a/sub_product/models/sale_order_line.py
+++ b/sub_product/models/sale_order_line.py
@@ -4,4 +4,6 @@
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
 
-    is_kit = fields.Boolean(related='product_template_id.is_kit')
\ No newline at end of file
+    is_kit = fields.Boolean(related='product_template_id.is_kit')
+    sale_order_line_id = fields.Many2one('sale.order.line', ondelete='cascade')
+    previously_set_price = fields.Float()
diff --git a/sub_product/report/ir_actions_report_templates.xml b/sub_product/report/ir_actions_report_templates.xml
new file mode 100644
index 00000000000..14de2733de6
--- /dev/null
+++ b/sub_product/report/ir_actions_report_templates.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <template id="report_saleorder_document_inherit_sub_product" name="Report" inherit_id="sale.report_saleorder_document">
+        <xpath expr="//tbody//tr" position="attributes">
+            <attribute name="t-if">(line.order_id.print_in_report) or (not line.sale_order_line_id)</attribute>
+        </xpath>
+    </template>
+    <template id="sale_order_portal_content_inherit_sub_product" name="Portal Preview" inherit_id="sale.sale_order_portal_content">
+        <xpath expr="//tbody[@class='sale_tbody']//tr" position="attributes">
+            <attribute name="t-if">(line.order_id.print_in_report) or (not line.sale_order_line_id)</attribute>
+        </xpath>
+    </template>
+    <template id="report_invoice_document_inherit_sub_product" name="Invoice" inherit_id="account.report_invoice_document">
+        <xpath expr="//tbody[@class='invoice_tbody']//tr" position="attributes">
+            <attribute name="t-if">(line.sale_line_ids.order_id.print_in_report) or (not line.sale_line_ids.sale_order_line_id)</attribute>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/sub_product/views/sale_order_views.xml b/sub_product/views/sale_order_views.xml
index 132da1f80ef..f971259c7d6 100644
--- a/sub_product/views/sale_order_views.xml
+++ b/sub_product/views/sale_order_views.xml
@@ -5,9 +5,40 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//field[@name='payment_term_id']" position="after">
+                <field name="print_in_report"/>
+            </xpath>
             <xpath expr="//field[@name='product_template_id']" position="after">
-                <field name="is_kit" column_invisible="1"/>
-                <button string="Sub Product" name="%(sub_product.action_sub_products)d" type="action" class="oe_highlight" invisible="state == 'sale' or not is_kit"/>
+                <field name="is_kit" optional='hide'/>
+                <field name="sale_order_line_id" optional='hide' readonly="sale_order_line_id"/>
+                <button string="Sub Product" name="sub_product.action_sub_products" type="action" class="oe_highlight" invisible="state == 'sale' or not is_kit" context="{'product_name': name}" />
+            </xpath>
+            <xpath expr="//tree//field[@name='product_id']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='product_template_id']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='name']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='product_uom_qty']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='customer_lead']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='price_unit']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='tax_id']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='price_subtotal']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
+            </xpath>
+            <xpath expr="//tree//field[@name='price_total']" position="attributes">
+                <attribute name="readonly">sale_order_line_id</attribute>
             </xpath>
         </field>
     </record>
diff --git a/sub_product/wizard/sub_products.py b/sub_product/wizard/sub_products.py
index 7c57e5dcaab..896f390ffe0 100644
--- a/sub_product/wizard/sub_products.py
+++ b/sub_product/wizard/sub_products.py
@@ -5,23 +5,40 @@ class SubProducts(models.TransientModel):
     _name = 'sub.products'
     _description = "Sub Product"
 
+    name = fields.Char()
     sub_product_line_ids = fields.One2many('sub.products.line', 'sub_product_id')
 
     @api.model
     def default_get(self, fields_list):
         res = super().default_get(fields_list)
         active_id = self.env.context.get('active_id')
-        record = self.env["sale.order.line"].browse(active_id)
+        sub_product = self.env['sale.order.line'].search([('sale_order_line_id', '=', active_id)])
+        sale_order_line_current_record = self.env['sale.order.line'].browse(active_id)
         sub_product_lines = []
-        for sub_product in record.product_template_id.sub_product_ids:
-            sub_product_lines.append((0, 0, {'product_id' : sub_product.id}))
+        if len(sub_product) > 0:
+            for product in sub_product:
+                sub_product_lines.append((0, 0, {
+                    'product_id': product.product_id.id,
+                    'quantity': product.product_uom_qty,
+                    'price': product.previously_set_price
+                }))
+        else:
+            for product in sale_order_line_current_record.product_template_id.sub_product_ids:
+                sub_product_lines.append((0, 0, {
+                    'product_id' : product.id,
+                    'quantity': 1.0,
+                    'price': product.lst_price
+                }))
         res['sub_product_line_ids'] = sub_product_lines
         return res
     
     def action_add_sub_product(self):
         active_id = self.env.context.get('active_id')
-        product_order_line = self.env["sale.order.line"].browse(active_id)
-        new_price_unit = product_order_line.product_uom_qty * product_order_line.price_unit
+        sub_product = self.env['sale.order.line'].search([('sale_order_line_id', '=', active_id)])
+        if len(sub_product) > 0:
+            self.env['sale.order.line'].search([('sale_order_line_id', '=', active_id)]).unlink()
+        product_order_line = self.env['sale.order.line'].browse(active_id)
+        new_price_unit = product_order_line.product_id.lst_price
         for sub_product_line in self.sub_product_line_ids:
             self.env['sale.order.line'].create(
                 {
@@ -30,7 +47,9 @@ def action_add_sub_product(self):
                     'name': sub_product_line.product_id.name,
                     'product_uom_qty': sub_product_line.quantity,
                     'price_unit': 0.0,
-                    'customer_lead': 0.0
+                    'customer_lead': 0.0,
+                    'sale_order_line_id': active_id,
+                    'previously_set_price': sub_product_line.price
                 }
             )
             new_price_unit = new_price_unit + sub_product_line.quantity * sub_product_line.price
diff --git a/sub_product/wizard/sub_products_line.py b/sub_product/wizard/sub_products_line.py
index e141d479a40..482b960e945 100644
--- a/sub_product/wizard/sub_products_line.py
+++ b/sub_product/wizard/sub_products_line.py
@@ -9,11 +9,4 @@ class SubProuctsLine(models.TransientModel):
     product_id = fields.Many2one('product.product')
     product_name = fields.Char(related='product_id.name')
     quantity = fields.Integer()
-    # price = fields.Float(compute="_compute_price", readonly=False, store=True)
     price = fields.Float(readonly=False, store=True)
-
-    # @api.depends('product_id.lst_price')
-    # def _compute_price(self):
-    #     for record in self:
-    #         if not record.price:
-    #             record.price = record.product_id.lst_price
diff --git a/sub_product/wizard/sub_products_views.xml b/sub_product/wizard/sub_products_views.xml
index 037faf2b27d..ad377c3e277 100644
--- a/sub_product/wizard/sub_products_views.xml
+++ b/sub_product/wizard/sub_products_views.xml
@@ -1,10 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
 <odoo>
     <record id="action_sub_products" model="ir.actions.act_window">
-        <field name="name">Wizard</field>
+        <field name="name">Add Sub Product</field>
         <field name="res_model">sub.products</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
+        <field name="context">{'default_name': context.get('product_name')}</field>
     </record>
 
     <record id="sub_products_view_form" model="ir.ui.view">
@@ -12,9 +13,10 @@
         <field name="model">sub.products</field>
         <field name="arch" type="xml">
             <form>
-                <h3>
-                    Sub Products
-                </h3>
+                <h4>
+                    <field name="name" readonly='1'/>
+                    Sub Products: 
+                </h4>
                 <field name="sub_product_line_ids">
                     <tree create='0' editable='1'>
                         <field name="product_id"/>