From 10b3ec6cc6dcb0141570225fdb83cd280d5eb3ec Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:05:27 +0300
Subject: [PATCH 01/19] Update Internal_property

---
 odex25_realstate/real_estate/models/internal_property.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/odex25_realstate/real_estate/models/internal_property.py b/odex25_realstate/real_estate/models/internal_property.py
index 0b266a89a..be84b0911 100644
--- a/odex25_realstate/real_estate/models/internal_property.py
+++ b/odex25_realstate/real_estate/models/internal_property.py
@@ -20,6 +20,12 @@ class Property(models.Model):
 
     # Smart button to count related maintenance records
     maintenance_count = fields.Integer(string="Maintenance Count", compute='_compute_maintenance_count')
+    is_new = fields.Boolean(string="Is New Property?", default=False)
+    building_age = fields.Integer(string="Building Age (Years)")
+    suitability_for_residence = fields.Selection([
+        ('residential', 'Residential'),
+        ('non_residential', 'Non-Residential'),
+    ], string="Property Suitability for Residence")
 
     def _compute_maintenance_count(self):
         for record in self:

From 71d72f894ff48f48800e98b524de9bcd52a9a7e1 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:10:58 +0300
Subject: [PATCH 02/19] Update internal_property

---
 .../real_estate/views/internal_property_views.xml            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/odex25_realstate/real_estate/views/internal_property_views.xml b/odex25_realstate/real_estate/views/internal_property_views.xml
index afc0e4b7d..b64ca3c69 100644
--- a/odex25_realstate/real_estate/views/internal_property_views.xml
+++ b/odex25_realstate/real_estate/views/internal_property_views.xml
@@ -66,7 +66,7 @@
                             <group>
                                 <field name="market_type"
                                        attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                <field name="property_type_id" domain="[('market_type', '=', market_type)]" required="1"
+                                <field name="property_type_id"  required="1"
                                        attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                 <field name="company_profit" required="1"/>
                                 <field name="company_profit_amount" required="1"/>
@@ -230,6 +230,9 @@
                             <page name="other" string="Other Info">
                                 <group col="4" colspan="2">
                                     <field name="no_rented_units"/>
+                                    <field name="suitability_for_residence"/>
+                                     <field name="is_new"/>
+                                     <field name="building_age"/>
                                     <field name="no_available_units"/>
                                     <field name="no_reserved_units"/>
                                 </group>

From 4e3c1ac588030500a5f435180fd33ce25d347018 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:13:05 +0300
Subject: [PATCH 03/19] Update real_estate_conf_views.xml

---
 .../real_estate/views/real_estate_conf_views.xml            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/odex25_realstate/real_estate/views/real_estate_conf_views.xml b/odex25_realstate/real_estate/views/real_estate_conf_views.xml
index 76b54b195..27072e00f 100644
--- a/odex25_realstate/real_estate/views/real_estate_conf_views.xml
+++ b/odex25_realstate/real_estate/views/real_estate_conf_views.xml
@@ -41,9 +41,9 @@
 
                         </div>
                         <group col="4" colspan="2">
-                             <field name="market_type" required="1"/>
+                             <field name="market_type" invisible="1" required="0"/>
                             <field name="name" required="1"/>
-                            <field name="is_land"/>
+                            <field name="is_land"  invisible="1"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </sheet>
@@ -188,4 +188,4 @@
 
 
     </data>
-</odoo>
\ No newline at end of file
+</odoo>

From 9bf295a60399dd638806ef64a18fe7ee00526b0b Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:17:23 +0300
Subject: [PATCH 04/19] Update internal_property

---
 odex25_realstate/real_estate/views/internal_property_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_realstate/real_estate/views/internal_property_views.xml b/odex25_realstate/real_estate/views/internal_property_views.xml
index b64ca3c69..52fbb325d 100644
--- a/odex25_realstate/real_estate/views/internal_property_views.xml
+++ b/odex25_realstate/real_estate/views/internal_property_views.xml
@@ -34,7 +34,7 @@
                            </button>
 
                             <button class="oe_stat_button" string="Documents" name="get_attachments" type="object" icon="fa-file-text-o"/>
-                            <button name="action_view_maintenance" type="object" class="oe_stat_button">
+                            <button name="action_view_maintenance" type="object" class="oe_stat_button" icon="fa-wrench">
                                     <field name="maintenance_count" widget="statinfo" string="Maintenance"/>
                             </button>
 

From 0161b594dfb69b96f9f1d7bcb514a78827eb5437 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:40:02 +0300
Subject: [PATCH 05/19] Update internal_property

---
 .../real_estate/models/internal_property.py       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/odex25_realstate/real_estate/models/internal_property.py b/odex25_realstate/real_estate/models/internal_property.py
index be84b0911..bc08f523c 100644
--- a/odex25_realstate/real_estate/models/internal_property.py
+++ b/odex25_realstate/real_estate/models/internal_property.py
@@ -7,6 +7,8 @@
 ##############################################################################
 
 import base64
+import json
+from lxml import etree
 import re
 from odoo import models, fields, api, exceptions, _
 from odoo.modules.module import get_module_resource
@@ -27,6 +29,19 @@ class Property(models.Model):
         ('non_residential', 'Non-Residential'),
     ], string="Property Suitability for Residence")
 
+    @api.model
+    def fields_view_get(self, view_id=None, view_type='form', toolbar=False, submenu=False):
+        res = super(PurchaseOrderCustom, self).fields_view_get(view_id=view_id, view_type=view_type, toolbar=toolbar,
+                                                               submenu=submenu)
+        doc = etree.XML(res['arch'])
+        if (view_type == 'form'):
+            for node in doc.xpath("//field"):
+                modifiers['readonly'] = [('state', 'in', ['approve'])]
+                node.set("modifiers", json.dumps(modifiers))
+                res['arch'] = etree.tostring(doc, encoding='unicode')
+        return res
+
+    
     def _compute_maintenance_count(self):
         for record in self:
             record.maintenance_count = self.env['property.management.maintenance'].search_count([

From abda0a2f11193fcbcd6477bdc9c45f527a6395e1 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:49:16 +0300
Subject: [PATCH 06/19] Update re_unit

---
 odex25_realstate/real_estate/views/re_unit_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/odex25_realstate/real_estate/views/re_unit_view.xml b/odex25_realstate/real_estate/views/re_unit_view.xml
index cbef6cada..342a8a92a 100644
--- a/odex25_realstate/real_estate/views/re_unit_view.xml
+++ b/odex25_realstate/real_estate/views/re_unit_view.xml
@@ -26,7 +26,8 @@
                                 <span class="o_stat_text" attrs="{'invisible': [('unlock', '=', True)]}">Lock</span>
                             </button>
                              <!-- Add your buttons here -->
-                            <button name="action_view_maintenance" type="object" class="oe_stat_button">
+                           <button class="oe_stat_button" string="Documents" name="get_attachments" type="object" icon="fa-file-text-o"/>
+                            <button name="action_view_maintenance" type="object" icon="fa-wrench" class="oe_stat_button">
                                 <field name="maintenance_count" widget="statinfo" string="Maintenance"/>
                             </button>
                         </div>

From a5e8266d92fefb432f1eec6a0db07c64077ea3ad Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:57:55 +0300
Subject: [PATCH 07/19] Update re_unit

---
 odex25_realstate/real_estate/models/re_unit.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/odex25_realstate/real_estate/models/re_unit.py b/odex25_realstate/real_estate/models/re_unit.py
index 33d58ad8f..e7de9410e 100644
--- a/odex25_realstate/real_estate/models/re_unit.py
+++ b/odex25_realstate/real_estate/models/re_unit.py
@@ -16,6 +16,8 @@ class Unit(models.Model):
     _inherit = ['mail.thread', 'mail.activity.mixin']
     _order = "id desc"
 
+    
+    attach_nbr = fields.Integer(compute='get_attachments')
     active = fields.Boolean(default=True)
     unlock = fields.Boolean(default=True, string="Unlock")
     name = fields.Char(string="Unit Name")
@@ -74,6 +76,16 @@ class Unit(models.Model):
     ]
         # Smart button to count related maintenance records
     maintenance_count = fields.Integer(string="Maintenance Count", compute='_compute_maintenance_count')
+    def get_attachments(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('base.action_attachment')
+        action['domain'] = str([('res_model', '=', 're.unit'),('res_id', 'in', self.ids)])
+        action['context'] = "{'default_res_model': '%s','default_res_id': %d}" % (self._name, self.id)
+        return action
+    def get_attachments(self):
+        res = super(Unit, self).get_attachments()
+        domain = [('res_model', '=', 're.unit'), ('res_id', '=', self.id)]
+        self.attach_nbr = self.env['ir.attachment'].search_count(domain)
+        return res
 
     def _compute_maintenance_count(self):
         for record in self:

From a101fed6fdbf887243d0dec2e9881abedfeda0ba Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:59:25 +0300
Subject: [PATCH 08/19] Update re_unit

---
 odex25_realstate/real_estate/views/re_unit_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/odex25_realstate/real_estate/views/re_unit_view.xml b/odex25_realstate/real_estate/views/re_unit_view.xml
index 342a8a92a..f96727865 100644
--- a/odex25_realstate/real_estate/views/re_unit_view.xml
+++ b/odex25_realstate/real_estate/views/re_unit_view.xml
@@ -26,8 +26,12 @@
                                 <span class="o_stat_text" attrs="{'invisible': [('unlock', '=', True)]}">Lock</span>
                             </button>
                              <!-- Add your buttons here -->
-                           <button class="oe_stat_button" string="Documents" name="get_attachments" type="object" icon="fa-file-text-o"/>
-                            <button name="action_view_maintenance" type="object" icon="fa-wrench" class="oe_stat_button">
+                          <button name="get_attachments" type="object"
+                            class="oe_stat_button"
+                            icon="fa-file-text-o">
+                            <field name="attach_nbr" widget="statinfo" string="Documents"/>
+                        </button>              
+                    <button name="action_view_maintenance" type="object" icon="fa-wrench" class="oe_stat_button">
                                 <field name="maintenance_count" widget="statinfo" string="Maintenance"/>
                             </button>
                         </div>

From 271ba5124f11095a3a549b65f842d237b2a652aa Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:04:10 +0300
Subject: [PATCH 09/19] Update re_unit.py

---
 odex25_realstate/real_estate/models/re_unit.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/odex25_realstate/real_estate/models/re_unit.py b/odex25_realstate/real_estate/models/re_unit.py
index e7de9410e..6f65fbf06 100644
--- a/odex25_realstate/real_estate/models/re_unit.py
+++ b/odex25_realstate/real_estate/models/re_unit.py
@@ -15,8 +15,12 @@ class Unit(models.Model):
     _description = 'Property Unit'
     _inherit = ['mail.thread', 'mail.activity.mixin']
     _order = "id desc"
-
     
+    
+    unit_category = fields.Selection([
+        ('residential', 'Residential'),
+        ('commercial', 'Commercial'),
+        ('lands', 'Lands') ], string="Unit Category")
     attach_nbr = fields.Integer(compute='get_attachments')
     active = fields.Boolean(default=True)
     unlock = fields.Boolean(default=True, string="Unlock")

From b5bc10127817ed95d2cc27f4a03ba228c14154e7 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:06:13 +0300
Subject: [PATCH 10/19] Update re_unit_view.xml

---
 odex25_realstate/real_estate/views/re_unit_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_realstate/real_estate/views/re_unit_view.xml b/odex25_realstate/real_estate/views/re_unit_view.xml
index f96727865..a60f8d85e 100644
--- a/odex25_realstate/real_estate/views/re_unit_view.xml
+++ b/odex25_realstate/real_estate/views/re_unit_view.xml
@@ -44,6 +44,7 @@
                         </h4>                        
                         <group name="general_info" colspan="2" col="4">
                             <field name="unit_type_id" required="1" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                            <field name="unit_category"/>
                             <field name="action_type" required="1" />
                             <field name="company_id" groups="base.group_multi_company"  attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                             <field name="user_id" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}" required="1"/>

From cba16a6dc33003cf441945addd12d335c57c2b81 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:11:19 +0300
Subject: [PATCH 11/19] Update rent_payment

---
 .../property_management/views/rent_payment_view.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_realstate/property_management/views/rent_payment_view.xml b/odex25_realstate/property_management/views/rent_payment_view.xml
index 68b469e8c..bcdb8050e 100644
--- a/odex25_realstate/property_management/views/rent_payment_view.xml
+++ b/odex25_realstate/property_management/views/rent_payment_view.xml
@@ -95,7 +95,7 @@
                     <field name="due_date"/>
                     <field name="state"/>
                     <filter string="Due" name="due_payment" domain="[('state','=','due')]"/>
-                    <filter string="Not due" name="not_due_payment" domain="[('state','=','not')]"/>
+                    <filter string="Not due" name="not_due_payment" domain="[('state','=','draft')]"/>
                     <filter string="Paid" name="paid_payment" domain="[('state','=','paid')]"/>
                     <filter string="Cancelled" name="cancel_payment" domain="[('state','=','cancel')]"/>
                     <separator/>

From 308bc92ed0f5274223e335d19017526949a370b0 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:14:53 +0300
Subject: [PATCH 12/19] Update rent_payment

---
 odex25_realstate/property_management/views/rent_payment_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_realstate/property_management/views/rent_payment_view.xml b/odex25_realstate/property_management/views/rent_payment_view.xml
index bcdb8050e..a97cd6298 100644
--- a/odex25_realstate/property_management/views/rent_payment_view.xml
+++ b/odex25_realstate/property_management/views/rent_payment_view.xml
@@ -72,6 +72,7 @@
                     <field name="contract_id"/>
                     <field name="renter_id"/>
                     <field name="property_id"/>
+                   <field name="unit_ids" widget="many2many_tags"/>
                     <field name="due_date"/>
                     <field name="paid_date"/>
                     <field name="amount"/>

From b48d4365b822fab32ad9b57d5aeefef1bb3e477f Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:16:25 +0300
Subject: [PATCH 13/19] Update end_rent

---
 odex25_realstate/property_management/views/end_rent_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_realstate/property_management/views/end_rent_views.xml b/odex25_realstate/property_management/views/end_rent_views.xml
index 841675ab0..083694e1c 100644
--- a/odex25_realstate/property_management/views/end_rent_views.xml
+++ b/odex25_realstate/property_management/views/end_rent_views.xml
@@ -232,6 +232,7 @@
                     <field name="date"/>
                     <field name="contract_id"/>
                     <field name="property_id"/>
+                     <field name="unit_ids" widget="many2many_tags"/>
                     <field name="total_amount"/>
 
                 </tree>

From 7ba6937c96e2e1e40ac2a68d6374b66f4c3402df Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:26:47 +0300
Subject: [PATCH 14/19] Update internal_property

---
 odex25_realstate/real_estate/models/internal_property.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/odex25_realstate/real_estate/models/internal_property.py b/odex25_realstate/real_estate/models/internal_property.py
index bc08f523c..251d006c4 100644
--- a/odex25_realstate/real_estate/models/internal_property.py
+++ b/odex25_realstate/real_estate/models/internal_property.py
@@ -23,7 +23,6 @@ class Property(models.Model):
     # Smart button to count related maintenance records
     maintenance_count = fields.Integer(string="Maintenance Count", compute='_compute_maintenance_count')
     is_new = fields.Boolean(string="Is New Property?", default=False)
-    building_age = fields.Integer(string="Building Age (Years)")
     suitability_for_residence = fields.Selection([
         ('residential', 'Residential'),
         ('non_residential', 'Non-Residential'),

From 233052c8fad046a1fe032dcebd1236797d5301b3 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:28:42 +0300
Subject: [PATCH 15/19] Update re_unit

---
 odex25_realstate/real_estate/models/re_unit.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/odex25_realstate/real_estate/models/re_unit.py b/odex25_realstate/real_estate/models/re_unit.py
index 6f65fbf06..498cfc62c 100644
--- a/odex25_realstate/real_estate/models/re_unit.py
+++ b/odex25_realstate/real_estate/models/re_unit.py
@@ -9,6 +9,11 @@
 import base64
 import re
 from odoo import models, fields, api, exceptions, _
+class PropertyRole(models.Model):
+    _name = 'property.role'
+    _description = 'Property Role'
+
+    name = fields.Char('Name')
 
 class Unit(models.Model):
     _name = 're.unit'
@@ -23,6 +28,7 @@ class Unit(models.Model):
         ('lands', 'Lands') ], string="Unit Category")
     attach_nbr = fields.Integer(compute='get_attachments')
     active = fields.Boolean(default=True)
+    role_id = fields.Many2one('property.role', string='Role')
     unlock = fields.Boolean(default=True, string="Unlock")
     name = fields.Char(string="Unit Name")
     color = fields.Integer(string='Color Index', compute="set_color")

From be786c03ed1121b4c6f11136a003689b94807567 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:29:43 +0300
Subject: [PATCH 16/19] Update internal_property

---
 odex25_realstate/real_estate/views/internal_property_views.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/odex25_realstate/real_estate/views/internal_property_views.xml b/odex25_realstate/real_estate/views/internal_property_views.xml
index 52fbb325d..cbd1bb427 100644
--- a/odex25_realstate/real_estate/views/internal_property_views.xml
+++ b/odex25_realstate/real_estate/views/internal_property_views.xml
@@ -232,7 +232,6 @@
                                     <field name="no_rented_units"/>
                                     <field name="suitability_for_residence"/>
                                      <field name="is_new"/>
-                                     <field name="building_age"/>
                                     <field name="no_available_units"/>
                                     <field name="no_reserved_units"/>
                                 </group>

From d0916343abd9a34975143472cd5ad2ad3856c9d1 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:32:07 +0300
Subject: [PATCH 17/19] Update re_unit

---
 odex25_realstate/real_estate/views/re_unit_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_realstate/real_estate/views/re_unit_view.xml b/odex25_realstate/real_estate/views/re_unit_view.xml
index a60f8d85e..64df268c8 100644
--- a/odex25_realstate/real_estate/views/re_unit_view.xml
+++ b/odex25_realstate/real_estate/views/re_unit_view.xml
@@ -55,6 +55,7 @@
                                     <field name="space" required="1"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field name="external_space"/>
+                                    <field name="role_id"/> 
 
                                     <field name="mezzanine"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>

From 72e90ae1526e7be797c88d93bbdbc14c94654b47 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:33:29 +0300
Subject: [PATCH 18/19] Update ir.model.access.csv

---
 odex25_realstate/real_estate/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_realstate/real_estate/security/ir.model.access.csv b/odex25_realstate/real_estate/security/ir.model.access.csv
index f3db183f1..57ec9ac09 100644
--- a/odex25_realstate/real_estate/security/ir.model.access.csv
+++ b/odex25_realstate/real_estate/security/ir.model.access.csv
@@ -6,4 +6,5 @@ access_realestate_configuration_property_state,re.property.state,model_re_proper
 access_realestate_internal_property,internal.property,model_internal_property,real_estate.group_real_estate_user,1,1,1,1
 access_realestate_re_unit,re.unit,model_re_unit,real_estate.group_real_estate_user,1,1,1,1
 access_realestate_configuration_property_sketchs,sketchs.sketchs,model_sketchs_sketchs,real_estate.group_real_estate_user,1,1,1,1
+access_realestate_role_property,role.property,model_property_role,,1,1,1,1
 

From 7b4afe3649755675b70b3e9ef059f8dac13d86a5 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:36:19 +0300
Subject: [PATCH 19/19] Update internal_property

---
 odex25_realstate/real_estate/models/internal_property.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_realstate/real_estate/models/internal_property.py b/odex25_realstate/real_estate/models/internal_property.py
index 251d006c4..0a081a59f 100644
--- a/odex25_realstate/real_estate/models/internal_property.py
+++ b/odex25_realstate/real_estate/models/internal_property.py
@@ -90,7 +90,7 @@ class Property(models.Model):
                                        ('external_investment', 'External Investment'),
                                        ('include', 'Include')], string="Management Type", default="internal_investment")
     market_type = fields.Selection([('residential', 'Residential'),
-                                    ('commercial', 'Commercial'),
+                                    ('commercial', 'Commercial'),('residential_commercial', 'Residential and Commercial'),
                                     ('industrial', 'Industrial'),
                                     ('other', 'Other')], string="Market Type", default="commercial")
     other_type = fields.Char(string="Other Type")