From c7ff595ea7b9c5a8545792a309517c202d9f0653 Mon Sep 17 00:00:00 2001
From: Xavier Zambrano <chzam@odoo.com>
Date: Tue, 5 May 2026 11:02:56 -0600
Subject: [PATCH 1/6] [ADD] complete chapter 1,2 and 3

---
 estate/__init__.py               |  1 +
 estate/__manifest__.py           |  8 ++++++++
 estate/models/__init__.py        |  1 +
 estate/models/estate_property.py | 23 +++++++++++++++++++++++
 4 files changed, 33 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

diff --git a/estate/__init__.py b/estate/__init__.py
new file mode 100644
index 00000000000..9a7e03eded3
--- /dev/null
+++ b/estate/__init__.py
@@ -0,0 +1 @@
+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..a922fdaa764
--- /dev/null
+++ b/estate/__manifest__.py
@@ -0,0 +1,8 @@
+{
+    'name': 'Estate',
+    'depends': ['base'],
+    'installable': True,
+    'application': True,
+    'author': 'Xavier Zambrano',
+    'license': 'LGPL-3',
+}
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
new file mode 100644
index 00000000000..f4c8fd6db6d
--- /dev/null
+++ b/estate/models/__init__.py
@@ -0,0 +1 @@
+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..ddfa8b8d84d
--- /dev/null
+++ b/estate/models/estate_property.py
@@ -0,0 +1,23 @@
+from odoo import fields, models
+
+class EstateProperty(models.Model):
+    _name = 'estate.property'
+    _description = 'Estate Property'
+
+    name = fields.Char('Property Name', required=True)
+    description = fields.Text('Description')
+    postcode = fields.Char('Postcode')
+    date_availability = fields.Date('Date Availability')
+    expected_price = fields.Float('Expected Price', required=True)
+    selling_price = fields.Float('Selling Price')
+    bedrooms = fields.Integer('Bedrooms')
+    living_area = fields.Integer('Living Area')
+    facades = fields.Integer('Facades')
+    garage = fields.Boolean('Garage')
+    garden = fields.Boolean('Garden')
+    garden_area = fields.Integer('Garden Area')
+    garden_orientation = fields.Selection(
+        string='Garden Orientation',
+        selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
+        help='The orientation of the garden'
+    )
\ No newline at end of file

From 00eeecbba2dbe9728dc1c31d544f4387f9310d2c Mon Sep 17 00:00:00 2001
From: Xavier Zambrano <chzam@odoo.com>
Date: Tue, 5 May 2026 11:17:23 -0600
Subject: [PATCH 2/6] [IMP] complete chapter 4

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

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index a922fdaa764..938e87e481c 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -5,4 +5,7 @@
     'application': True,
     'author': 'Xavier Zambrano',
     'license': 'LGPL-3',
+    'data': [
+        'security/ir.model.access.csv'
+    ]
 }
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
new file mode 100644
index 00000000000..d01557a3fb7
--- /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_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1
\ No newline at end of file

From 32f8f4c0e481f61172fbb4e922ed3c601f012830 Mon Sep 17 00:00:00 2001
From: Xavier Zambrano <chzam@odoo.com>
Date: Tue, 5 May 2026 15:57:23 -0600
Subject: [PATCH 3/6] [IMP] complete chapter 5

---
 estate/__manifest__.py                 |  5 ++++-
 estate/models/estate_property.py       | 20 ++++++++++++++------
 estate/views/estate_property_views.xml | 16 ++++++++++++++++
 estate/views/real_estate_menus.xml     |  8 ++++++++
 4 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 estate/views/estate_property_views.xml
 create mode 100644 estate/views/real_estate_menus.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 938e87e481c..bfe7799be66 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -6,6 +6,9 @@
     'author': 'Xavier Zambrano',
     'license': 'LGPL-3',
     'data': [
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',
+        
+        'views/estate_property_views.xml',
+        'views/real_estate_menus.xml',
     ]
 }
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index ddfa8b8d84d..a7867565a3d 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -7,17 +7,25 @@ class EstateProperty(models.Model):
     name = fields.Char('Property Name', required=True)
     description = fields.Text('Description')
     postcode = fields.Char('Postcode')
-    date_availability = fields.Date('Date Availability')
+    date_availability = fields.Date('Available From', copy=False, default=fields.Date.add(fields.Date.today(), months=3))
     expected_price = fields.Float('Expected Price', required=True)
-    selling_price = fields.Float('Selling Price')
-    bedrooms = fields.Integer('Bedrooms')
-    living_area = fields.Integer('Living Area')
+    selling_price = fields.Float('Selling Price', readonly=True, copy=False)
+    bedrooms = fields.Integer('Bedrooms', default=2)
+    living_area = fields.Integer('Living Area (sqm)')
     facades = fields.Integer('Facades')
     garage = fields.Boolean('Garage')
     garden = fields.Boolean('Garden')
-    garden_area = fields.Integer('Garden Area')
+    garden_area = fields.Integer('Garden Area (sqm)')
     garden_orientation = fields.Selection(
         string='Garden Orientation',
         selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
         help='The orientation of the garden'
-    )
\ No newline at end of file
+    )
+    state = fields.Selection(
+        string='Status',
+        selection=[('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
+        required=True,
+        copy=False,
+        default='new'
+    )
+    active = fields.Boolean('Active', default=True)
\ 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..09fe07daf8f
--- /dev/null
+++ b/estate/views/estate_property_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<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>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new property
+            </p>
+            <p>
+                Let your customers know about your great Real Estate options!
+            </p>
+        </field>
+    </record>    
+</odoo>
diff --git a/estate/views/real_estate_menus.xml b/estate/views/real_estate_menus.xml
new file mode 100644
index 00000000000..df603656afc
--- /dev/null
+++ b/estate/views/real_estate_menus.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<odoo>
+<menuitem id="estate_menu_root" name="Real Estate">
+    <menuitem id="estate_first_level_menu" name="Advertisements">
+        <menuitem id="estate_property_menu_action" action="estate_property_action"></menuitem>
+    </menuitem>
+</menuitem>
+</odoo>
\ No newline at end of file

From d07669ba27acf9010a7723076a7773b2edd4069e Mon Sep 17 00:00:00 2001
From: Xavier Zambrano <chzam@odoo.com>
Date: Wed, 6 May 2026 12:51:05 -0600
Subject: [PATCH 4/6] [IMP] complete chapter 6

---
 estate/views/estate_property_views.xml | 87 +++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 2 deletions(-)

diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 09fe07daf8f..b492f1768fa 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -1,5 +1,88 @@
 <?xml version="1.0"?>
 <odoo>
+
+
+    <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="Search Properties">
+                <field name="name" string="Title" /> <!--  TODO: rename default model string to Title and rm strings attributes -->
+                <field name="postcode" />
+                <field name="expected_price" />
+                <field name="bedrooms" />
+                <field name="living_area" />
+                <field name="facades" />
+                <filter string="Available Properties" name="available_properties" domain="['|', ('state', '=', 'new'), ('state', '=', 'offer_received')]" />
+                <group>
+                    <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"></filter>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="estate_property_view_form" model="ir.ui.view">
+        <field name="name">estate.property.form</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <form string="Property">
+                <sheet> 
+                    <field name="active" invisible="1" />
+                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" invisible="active"/>
+                    <div class="oe_title">
+                        <h1 class="mb32">
+                            <field name="name" class="mb16" />
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="postcode" />
+                            <field name="date_availability" />
+                        </group>
+                        <group>
+                            <field name="expected_price" />
+                            <field name="selling_price" />
+                        </group>
+                    </group>
+
+                    <notebook>
+                        <page string="Description" name="description">
+                            <group>
+                                <group>
+                                    <field name="description" />
+                                    <field name="bedrooms" />
+                                    <field name="living_area" />
+                                    <field name="facades" />
+                                    <field name="garage" />
+                                    <field name="garden" />
+                                    <field name="garden_area" />
+                                    <field name="garden_orientation" />
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="estate_property_view_tree" model="ir.ui.view">
+        <field name="name">estate.property.list</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <list string="Properties">
+                <field name="name" string="Title" />
+                <field name="postcode" />
+                <field name="bedrooms" />
+                <field name="living_area" />
+                <field name="expected_price" />
+                <field name="selling_price" />
+                <field name="date_availability" />
+            </list>
+        </field>
+    </record>
+
     <record id="estate_property_action" model="ir.actions.act_window">
         <field name="name">Properties</field>
         <field name="res_model">estate.property</field>
@@ -12,5 +95,5 @@
                 Let your customers know about your great Real Estate options!
             </p>
         </field>
-    </record>    
-</odoo>
+    </record>
+</odoo>
\ No newline at end of file

From f50ac04f2fe57d44943aee241b2c416343da4881 Mon Sep 17 00:00:00 2001
From: Xavier Zambrano <chzam@odoo.com>
Date: Wed, 6 May 2026 14:25:27 -0600
Subject: [PATCH 5/6] [REF] models: set name string to "Title"

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

diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index a7867565a3d..26cef3926b7 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -4,7 +4,7 @@ class EstateProperty(models.Model):
     _name = 'estate.property'
     _description = 'Estate Property'
 
-    name = fields.Char('Property Name', required=True)
+    name = fields.Char('Title', required=True)
     description = fields.Text('Description')
     postcode = fields.Char('Postcode')
     date_availability = fields.Date('Available From', copy=False, default=fields.Date.add(fields.Date.today(), months=3))
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index b492f1768fa..e115e568359 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -7,7 +7,7 @@
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <search string="Search Properties">
-                <field name="name" string="Title" /> <!--  TODO: rename default model string to Title and rm strings attributes -->
+                <field name="name"/>
                 <field name="postcode" />
                 <field name="expected_price" />
                 <field name="bedrooms" />
@@ -72,7 +72,7 @@
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <list string="Properties">
-                <field name="name" string="Title" />
+                <field name="name" />
                 <field name="postcode" />
                 <field name="bedrooms" />
                 <field name="living_area" />

From 31d022892c3dc2eb01d303d5e0e3db7cdd22d048 Mon Sep 17 00:00:00 2001
From: Xavier Zambrano <chzam@odoo.com>
Date: Wed, 6 May 2026 15:01:11 -0600
Subject: [PATCH 6/6] [IMP] complete chapter 7

---
 estate/__manifest__.py                       |  4 +-
 estate/models/__init__.py                    |  5 ++-
 estate/models/estate_property.py             | 24 ++++++-----
 estate/models/estate_property_offer.py       | 11 +++++
 estate/models/estate_property_tag.py         |  8 ++++
 estate/models/estate_property_type.py        |  8 ++++
 estate/security/ir.model.access.csv          |  5 ++-
 estate/views/estate_property_offer_views.xml | 32 ++++++++++++++
 estate/views/estate_property_tag_views.xml   | 42 +++++++++++++++++++
 estate/views/estate_property_type_views.xml  | 44 ++++++++++++++++++++
 estate/views/estate_property_views.xml       | 24 +++++++++--
 estate/views/real_estate_menus.xml           |  4 ++
 12 files changed, 195 insertions(+), 16 deletions(-)
 create mode 100644 estate/models/estate_property_offer.py
 create mode 100644 estate/models/estate_property_tag.py
 create mode 100644 estate/models/estate_property_type.py
 create mode 100644 estate/views/estate_property_offer_views.xml
 create mode 100644 estate/views/estate_property_tag_views.xml
 create mode 100644 estate/views/estate_property_type_views.xml

diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index bfe7799be66..c01354ae362 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -1,13 +1,15 @@
 {
     'name': 'Estate',
     'depends': ['base'],
-    'installable': True,
     'application': True,
     'author': 'Xavier Zambrano',
     'license': 'LGPL-3',
     'data': [
         'security/ir.model.access.csv',
         
+        'views/estate_property_offer_views.xml',
+        'views/estate_property_tag_views.xml',
+        'views/estate_property_type_views.xml',
         'views/estate_property_views.xml',
         'views/real_estate_menus.xml',
     ]
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
index f4c8fd6db6d..09b2099fe84 100644
--- a/estate/models/__init__.py
+++ b/estate/models/__init__.py
@@ -1 +1,4 @@
-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
\ No newline at end of file
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index 26cef3926b7..e1e600d4008 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -5,19 +5,18 @@ class EstateProperty(models.Model):
     _description = 'Estate Property'
 
     name = fields.Char('Title', required=True)
-    description = fields.Text('Description')
-    postcode = fields.Char('Postcode')
+    description = fields.Text()
+    postcode = fields.Char()
     date_availability = fields.Date('Available From', copy=False, default=fields.Date.add(fields.Date.today(), months=3))
-    expected_price = fields.Float('Expected Price', required=True)
-    selling_price = fields.Float('Selling Price', readonly=True, copy=False)
-    bedrooms = fields.Integer('Bedrooms', default=2)
+    expected_price = fields.Float(required=True)
+    selling_price = fields.Float(readonly=True, copy=False)
+    bedrooms = fields.Integer(default=2)
     living_area = fields.Integer('Living Area (sqm)')
-    facades = fields.Integer('Facades')
-    garage = fields.Boolean('Garage')
-    garden = fields.Boolean('Garden')
+    facades = fields.Integer()
+    garage = fields.Boolean()
+    garden = fields.Boolean()
     garden_area = fields.Integer('Garden Area (sqm)')
     garden_orientation = fields.Selection(
-        string='Garden Orientation',
         selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')],
         help='The orientation of the garden'
     )
@@ -28,4 +27,9 @@ class EstateProperty(models.Model):
         copy=False,
         default='new'
     )
-    active = fields.Boolean('Active', default=True)
\ No newline at end of file
+    active = fields.Boolean(default=True)
+    property_type_id = fields.Many2one('estate.property.type')
+    buyer_id = fields.Many2one('res.partner', copy=False)
+    salesperson_id = fields.Many2one('res.users', string='Salesman', default=lambda self: self.env.user)
+    property_tag_ids = fields.Many2many('estate.property.tag')
+    property_offer_ids = fields.One2many('estate.property.offer', 'property_id')
\ No newline at end of file
diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py
new file mode 100644
index 00000000000..04b6e0830b8
--- /dev/null
+++ b/estate/models/estate_property_offer.py
@@ -0,0 +1,11 @@
+from odoo import fields, models
+
+
+class EstatePropertyOffer(models.Model):
+    _name = 'estate.property.offer'
+    _description = 'Estate Property Offer'
+
+    price = fields.Float()
+    status = fields.Selection(selection=[('accepted', 'Accepted'), ('refused', 'Refused')], copy=False)
+    partner_id = fields.Many2one('res.partner', required=True)
+    property_id = fields.Many2one('estate.property', required=True)
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
new file mode 100644
index 00000000000..9bd29b43813
--- /dev/null
+++ b/estate/models/estate_property_tag.py
@@ -0,0 +1,8 @@
+from odoo import fields, models
+
+
+class EstatePropertyTag(models.Model):
+    _name = 'estate.property.tag'
+    _description = 'Estate Property Tag'
+
+    name = fields.Char(required=True)
\ 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..649283a8602
--- /dev/null
+++ b/estate/models/estate_property_type.py
@@ -0,0 +1,8 @@
+from odoo import fields, models
+
+class EstatePropertyType(models.Model):
+    _name = 'estate.property.type'
+    _description = 'Estate Property Type'
+
+    name = fields.Char(required=True)
+    
\ No newline at end of file
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
index d01557a3fb7..99c7fd33ec3 100644
--- a/estate/security/ir.model.access.csv
+++ b/estate/security/ir.model.access.csv
@@ -1,2 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_estate_property_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1
\ No newline at end of file
+access_estate_property_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1
+access_estate_property_type_model,access_estate_property_type_model,model_estate_property_type,base.group_user,1,1,1,1
+access_estate_property_tag_model,access_estate_property_tag_model,model_estate_property_tag,base.group_user,1,1,1,1
+access_estate_property_offer,access_estate_property_offer_model,model_estate_property_offer,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
new file mode 100644
index 00000000000..77e86ec2bac
--- /dev/null
+++ b/estate/views/estate_property_offer_views.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="estate_property_offer_view_form" model="ir.ui.view">
+        <field name="name">estate.property.offer.form</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <form string="Property Offer">
+                <sheet>
+                    <group>
+                        <field name="price" />
+                        <field name="partner_id" />
+                        <field name="status" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="estate_property_offer_view_list" model="ir.ui.view">
+        <field name="name">estate.property.offer.list</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <list string="Property Offers">
+                <field name="price" />
+                <field name="partner_id" />
+                <field name="status" />
+            </list>
+        </field>
+    </record>
+
+</odoo>
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
new file mode 100644
index 00000000000..bc27e0644da
--- /dev/null
+++ b/estate/views/estate_property_tag_views.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="estate_property_tag_view_form" model="ir.ui.view">
+        <field name="name">estate.property.tag.form</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <form string="Property Tag">
+                <sheet>
+                    <group>
+                        <field name="name" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="estate_property_tag_view_list" model="ir.ui.view">
+        <field name="name">estate.property.tag.list</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <list string="Property Tags">
+                <field name="name" />
+            </list>
+        </field>
+    </record>
+
+    <record id="estate_property_tag_action" model="ir.actions.act_window">
+        <field name="name">Property Tags</field>
+        <field name="res_model">estate.property.tag</field>
+        <field name="view_mode">list,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new property tag
+            </p>
+            <p>
+                Let your customers know about your great Real Estate property tag options!
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
new file mode 100644
index 00000000000..638720e8063
--- /dev/null
+++ b/estate/views/estate_property_type_views.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="estate_property_type_view_form" model="ir.ui.view">
+        <field name="name">estate.property.type.form</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <form string="Property Type">
+                <sheet>
+                    <div class="oe_title">
+                        <h1 class="mb32">
+                            <field name="name" class="mb16" />
+                        </h1>
+                    </div>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="estate_property_type_view_list" model="ir.ui.view">
+        <field name="name">estate.property.type.list</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <list string="Property Types">
+                <field name="name" />
+            </list>
+        </field>
+    </record>
+
+    <record id="estate_property_type_action" model="ir.actions.act_window">
+        <field name="name">Property Types</field>
+        <field name="res_model">estate.property.type</field>
+        <field name="view_mode">list,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new property type
+            </p>
+            <p>
+                Let your customers know about your great Real Estate property types options!
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index e115e568359..587e08dacee 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -8,6 +8,7 @@
         <field name="arch" type="xml">
             <search string="Search Properties">
                 <field name="name"/>
+                <field name="property_type_id" />
                 <field name="postcode" />
                 <field name="expected_price" />
                 <field name="bedrooms" />
@@ -30,13 +31,16 @@
                     <field name="active" invisible="1" />
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" invisible="active"/>
                     <div class="oe_title">
-                        <h1 class="mb32">
+                        <h1>
                             <field name="name" class="mb16" />
                         </h1>
                     </div>
 
+                    <field name="property_tag_ids" widget="many2many_tags" class="mb32" />
+
                     <group>
                         <group>
+                            <field name="property_type_id" />
                             <field name="postcode" />
                             <field name="date_availability" />
                         </group>
@@ -61,18 +65,31 @@
                                 </group>
                             </group>
                         </page>
+                        <page string="Offers" name="offers">
+                            <field name="property_offer_ids" />
+                        </page>
+                        <page string="Other Info" name="other_info">
+                            <group>
+                                <group>
+                                    <field name="salesperson_id" />
+                                    <field name="buyer_id" />
+                                </group>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
         </field>
     </record>
 
-    <record id="estate_property_view_tree" model="ir.ui.view">
+    <record id="estate_property_view_list" model="ir.ui.view">
         <field name="name">estate.property.list</field>
         <field name="model">estate.property</field>
         <field name="arch" type="xml">
             <list string="Properties">
                 <field name="name" />
+                <field name="property_type_id" />
+                <field name="property_tag_ids" widget="many2many_tags" />
                 <field name="postcode" />
                 <field name="bedrooms" />
                 <field name="living_area" />
@@ -96,4 +113,5 @@
             </p>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+
+</odoo>
diff --git a/estate/views/real_estate_menus.xml b/estate/views/real_estate_menus.xml
index df603656afc..424607fa2fe 100644
--- a/estate/views/real_estate_menus.xml
+++ b/estate/views/real_estate_menus.xml
@@ -4,5 +4,9 @@
     <menuitem id="estate_first_level_menu" name="Advertisements">
         <menuitem id="estate_property_menu_action" action="estate_property_action"></menuitem>
     </menuitem>
+    <menuitem id="settings_first_level_menu" name="Settings">
+        <menuitem id="estate_property_type_menu_action" action="estate_property_type_action"></menuitem>
+        <menuitem id="estate_property_tag_menu_action" action="estate_property_tag_action"></menuitem>
+    </menuitem>
 </menuitem>
 </odoo>
\ No newline at end of file