diff --git a/odex25_realstate/real_estate/models/internal_property.py b/odex25_realstate/real_estate/models/internal_property.py
index d95281299..36c0cfc24 100644
--- a/odex25_realstate/real_estate/models/internal_property.py
+++ b/odex25_realstate/real_estate/models/internal_property.py
@@ -176,10 +176,24 @@ class Property(models.Model):
     plot_no = fields.Char(string="Plot Number")
     planned_no = fields.Char(string="Planned Number")
     planned_id = sketch = fields.Many2one('sketchs.sketchs', string='Planned Name')
-    
+    # Stamping information
+    stamping_count = fields.Selection(string="Stamping Count", selection=[('1', '1'),
+                                                                           ('2', '2'),
+                                                                           ('3', '3')], default="1")
     stamping = fields.Char(string="Stamping Number")
     stamping_date = fields.Date(string="Stamping Date")
     stamping_attach = fields.Binary("Stamping Attach", attachment=True)
+
+    stamping_2 = fields.Char(string="Stamping Number")
+    stamping_date_2 = fields.Date(string="Stamping Date")
+    stamping_attach_2 = fields.Binary("Stamping Attach", attachment=True)
+    stamping_state_2 = fields.Selection([('updated', 'Updated'), ('not_updated', 'Not Updated')])
+
+    stamping_3 = fields.Char(string="Stamping Number")
+    stamping_date_3 = fields.Date(string="Stamping Date")
+    stamping_attach_3 = fields.Binary("Stamping Attach", attachment=True)
+    stamping_state_3 = fields.Selection([('updated', 'Updated'), ('not_updated', 'Not Updated')])
+
     # Water Meter information
     water_count = fields.Selection([('1', '1'),
                                     ('2', '2'),
diff --git a/odex25_realstate/real_estate/models/re_unit.py b/odex25_realstate/real_estate/models/re_unit.py
index 227f13805..a2bbec443 100644
--- a/odex25_realstate/real_estate/models/re_unit.py
+++ b/odex25_realstate/real_estate/models/re_unit.py
@@ -71,10 +71,21 @@ class Unit(models.Model):
     bathroom_no = fields.Integer(string="Bathroom Count")
     hall_no = fields.Integer(string="Hall Count")
     kitchen_no = fields.Integer(string="kitchen Count")
+    stamping_count = fields.Selection(string="Stamping Count",related='property_id.stamping_count')
+    stamping = fields.Char(string="Stamping Number",related='property_id.stamping')
+    stamping_date = fields.Date(string="Stamping Date",related='property_id.stamping_date')
+    # stamping_state = fields.Selection(related='property_id.stamping_state')
+    stamping_attach = fields.Binary("Stamping Attach", attachment=True,related='property_id.stamping_attach')
 
-    stamping = fields.Char(string="Stamping Number")
-    stamping_date = fields.Date(string="Stamping Date")
-    stamping_attach = fields.Binary("Stamping Attach", attachment=True)
+    stamping_2 = fields.Char(string="Stamping Number",related='property_id.stamping_2')
+    stamping_date_2 = fields.Date(string="Stamping Date",related='property_id.stamping_date_2')
+    stamping_attach_2 = fields.Binary("Stamping Attach", attachment=True,related='property_id.stamping_attach_2')
+    stamping_state_2 = fields.Selection([('updated', 'Updated'), ('not_updated', 'Not Updated')],related='property_id.stamping_state_2')
+
+    stamping_3 = fields.Char(string="Stamping Number",related='property_id.stamping_3')
+    stamping_date_3 = fields.Date(string="Stamping Date",related='property_id.stamping_date_3')
+    stamping_attach_3 = fields.Binary("Stamping Attach", attachment=True,related='property_id.stamping_attach_3')
+    stamping_state_3 = fields.Selection([('updated', 'Updated'), ('not_updated', 'Not Updated')],related='property_id.stamping_state_3')
 
     stamping_new = fields.Char(string="Stamping Number New")
     stamping_date_new = fields.Date(string="Stamping Date New")
diff --git a/odex25_realstate/real_estate/views/internal_property_views.xml b/odex25_realstate/real_estate/views/internal_property_views.xml
index d936a9a5e..36886f76c 100644
--- a/odex25_realstate/real_estate/views/internal_property_views.xml
+++ b/odex25_realstate/real_estate/views/internal_property_views.xml
@@ -39,11 +39,11 @@
                                     icon="fa-wrench">
                                 <field name="maintenance_count" widget="statinfo" string="Maintenance"/>
                             </button>
-                         <button width="200" class="oe_stat_button" name="get_contract"
-                            type="object"
-                            icon="fa-files" attrs="{'invisible':[('state','=','draft')]}">
-                        <field string="Contracts" name="contract_counts" widget="statinfo"/>
-                    </button>
+                            <button width="200" class="oe_stat_button" name="get_contract"
+                                    type="object"
+                                    icon="fa-files" attrs="{'invisible':[('state','=','draft')]}">
+                                <field string="Contracts" name="contract_counts" widget="statinfo"/>
+                            </button>
 
                         </div>
                         <h4>
@@ -58,36 +58,43 @@
                                        placeholder="Property Name"/>
                             </h1>
                         </div>
-                        <group  attrs="{'readonly':[('state','=','approve')]}" name="p_info" string="Property Info">
+                        <group attrs="{'readonly':[('state','=','approve')]}" name="p_info" string="Property Info">
                             <group attrs="{'readonly':[('state','=','approve')]}">
                                 <field name="property_state_id" required="1"
                                        attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
 
-                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}" name="management_type" required="1"/>
+                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
+                                       name="management_type" required="1"/>
                                 <field name="owner_id"
                                        attrs="{'invisible':[('management_type', '!=', 'include'),], 'required':[('management_type','=','include')],'readonly':[('unlock','=',True)]}"/>
-                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"  name="action_type" required="1"/>
+                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
+                                       name="action_type" required="1"/>
 
                             </group>
                             <group attrs="{'readonly':[('state','=','approve')]}">
-                                <field name="account_analy_id" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                <field name="account_analy_id"
+                                       attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                 <field name="market_type"
                                        attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                 <field name="property_type_id" required="1"
                                        attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}" name="company_profit" required="1"/>
-                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}" name="company_profit_amount" required="1"/>
+                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
+                                       name="company_profit" invisible="1"/>
+                                <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
+                                       name="company_profit_amount" invisible="1"/>
                             </group>
 
                         </group>
                         <group attrs="{'readonly':[('state','=','approve')]}" name="other_info" colspan="2" col="4">
-                            <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}" name="branch_manager_id" required="1"/>
+                            <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
+                                   name="branch_manager_id" required="1"/>
                             <field name="company_id" groups="base.group_multi_company"
                                    attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                         </group>
-                       
+
                         <notebook>
-                            <page attrs="{'readonly':[('state','=','approve')]}" name="location_info" string="Property Face &amp; Location">
+                            <page attrs="{'readonly':[('state','=','approve')]}" name="location_info"
+                                  string="Property Face &amp; Location">
                                 <group attrs="{'readonly':[('state','=','approve')]}">
                                     <group attrs="{'readonly':[('state','=','approve')]}" col="4" colspan="2">
                                         <field name="city_id" required="1"
@@ -115,7 +122,8 @@
                                         <field name="west"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     </group>
-                                    <group attrs="{'readonly':[('state','=','approve')]}" string="Building Street Position">
+                                    <group attrs="{'readonly':[('state','=','approve')]}"
+                                           string="Building Street Position">
                                         <field name="north_street"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                         <field name="south_street"
@@ -128,18 +136,20 @@
                                     </group>
                                 </group>
                                 <group attrs="{'readonly':[('state','=','approve')]}" string="Note">
-                                    <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}" name="note"/>
+                                    <field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
+                                           name="note"/>
                                 </group>
                             </page>
-                            <page attrs="{'readonly':[('state','=','approve')]}"  name="regis_info" string="Registration Info">
+                            <page attrs="{'readonly':[('state','=','approve')]}" name="regis_info"
+                                  string="Registration Info">
                                 <group attrs="{'readonly':[('state','=','approve')]}">
                                     <group attrs="{'readonly':[('state','=','approve')]}" col="4" colspan="2">
                                         <field name="user_id" readonly="1"/>
                                         <field name="marketer_id"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="block_no" required="1"
+                                        <field name="block_no" required="0"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="licence_no" required="1"
+                                        <field name="licence_no" required="0"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                         <field name="plate_no"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -149,12 +159,6 @@
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                         <field name="planned_id"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="stamping" required="1"
-                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="stamping_date" required="1"
-                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="stamping_attach"
-                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
 
                                         <field name="faseh"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -175,7 +179,7 @@
                                         <field name="water_account"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     </group>
-                                    <group  string="Second Water Meter"
+                                    <group string="Second Water Meter"
                                            attrs="{'invisible':['|',('water_count','=','1'),('water_count','=',False)],'readonly':[('state','=','approve')]}">
                                         <field name="water_serial2"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -185,7 +189,7 @@
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
 
                                     </group>
-                                    <group  string="Third Water Meter"
+                                    <group string="Third Water Meter"
                                            attrs="{'invisible':['|','|',('water_count','=','1'),('water_count','=','2'),('water_count','=',False)],'readonly':[('state','=','approve')]}">
                                         <field name="water_serial3"
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -195,13 +199,49 @@
                                                attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
 
                                     </group>
+                                    <group attrs="{'readonly':[('state','=','approve')]}" colspan="2" col="4">
+                                         <field name="stamping_count" required="1"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping" required="1"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_date" required="1"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_attach"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                    </group>
+                                    <group string="Second Stamping"
+                                           attrs="{'invisible':['|',('stamping_count','=','1'),('stamping_count','=',False)],'readonly':[('state','=','approve')]}">
+                                        <field name="stamping_2"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_date_2"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_attach_2"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_state_2"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+
+                                    </group>
+                                    <group string="Third stamping"
+                                           attrs="{'invisible':['|','|',('stamping_count','=','1'),('stamping_count','=','2'),('stamping_count','=',False)],'readonly':[('state','=','approve')]}">
+                                       <field name="stamping_3"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_date_3"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_attach_3"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_state_3"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+
+                                    </group>
                                 </group>
                             </page>
                             <page attrs="{'readonly':[('state','=','approve')]}" name="other" string="Other Info">
                                 <group attrs="{'readonly':[('state','=','approve')]}" col="4" colspan="2">
 
-                                    <field name="suitability_for_residence" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                    <field name="is_new" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                    <field name="suitability_for_residence"
+                                           attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                    <field name="is_new"
+                                           attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
 
                                 </group>
                                 <group attrs="{'readonly':[('state','=','approve')]}" colspan="2" col="4">
@@ -249,8 +289,8 @@
                                                attrs="{'readonly': [('state', '!=', 'draft'), ('unlock', '=', True)],'invisible': [('is_unit_count_fixed', '=', False)]}"/>
                                     </group>
                                     <field attrs="{'readonly':[('state','=','approve')]}" name="floor_ids">
-                                        <tree  editable="bottom">
-                                             <field name="role_id"/>
+                                        <tree editable="bottom">
+                                            <field name="role_id"/>
                                             <field name="no_of_house" sum="Total House"/>
                                             <field name="no_of_shop" sum="Total Shop"/>
                                             <field name="no_of_other_unit" sum="Total Other Units"/>
@@ -263,7 +303,8 @@
                             <page attrs="{'readonly':[('state','=','approve')]}" name="unit_info" string="Unit Info">
                                 <group attrs="{'readonly':[('state','=','approve')]}">
                                     <group attrs="{'readonly':[('state','=','approve')]}">
-                                         <field name="no_units" readonly="1" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="no_units" readonly="1"
+                                               attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                         <field name="no_rented_units"/>
                                         <field name="no_available_units"/>
                                         <field name="no_reserved_units"/>
@@ -296,7 +337,7 @@
                                 </group>
                                 <group attrs="{'readonly':[('state','=','approve')]}" col="4" colspan="2">
                                     <field attrs="{'readonly':[('state','=','approve')]}" name="pur_price"/>
-                                    <field  name="meter_price" required="1"
+                                    <field name="meter_price" required="1"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field attrs="{'readonly':[('state','=','approve')]}" name="rent_price"/>
                                     <field attrs="{'readonly':[('state','=','approve')]}" name="pur_meter_price"/>
diff --git a/odex25_realstate/real_estate/views/re_unit_view.xml b/odex25_realstate/real_estate/views/re_unit_view.xml
index 64df268c8..507aba7ac 100644
--- a/odex25_realstate/real_estate/views/re_unit_view.xml
+++ b/odex25_realstate/real_estate/views/re_unit_view.xml
@@ -25,13 +25,14 @@
                                 <span class="o_stat_text" attrs="{'invisible': [('unlock', '=', False)]}">Unlock</span>
                                 <span class="o_stat_text" attrs="{'invisible': [('unlock', '=', True)]}">Lock</span>
                             </button>
-                             <!-- Add your buttons here -->
-                          <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">
+                            <!-- Add your buttons here -->
+                            <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>
@@ -40,14 +41,18 @@
                             <label for="name" class="oe_edit_only"/>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"
                                    required="1"/>
-                            <field name="seq" required="1" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                        </h4>                        
+                            <field name="seq" required="1"
+                                   attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                        </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_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"/>
+                            <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"/>
                         </group>
                         <notebook>
                             <page name="unit_info" string="Unit Info">
@@ -55,7 +60,7 @@
                                     <field name="space" required="1"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field name="external_space"/>
-                                    <field name="role_id"/> 
+                                    <field name="role_id"/>
 
                                     <field name="mezzanine"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -65,7 +70,7 @@
                                     <field name="mezzan_width"
                                            attrs="{'required':[('mezzanine','=',True)],'invisible':[('mezzanine','=',False)], 'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field name="room_no" required="1"
-                                        attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                           attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field name="bathroom_no" required="1"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field name="hall_no" required="1"
@@ -74,13 +79,14 @@
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                 </group>
                             </page>
-                             <page string="Property Info" name="prop_info">
+                            <page string="Property Info" name="prop_info">
                                 <group col="4" colspan="2">
                                     <field name="property_id" required="1"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                                     <field name="management_type" readonly="1"/>
                                     <field name="market_type" readonly="1"/>
-                                    <field name="other_type" readonly="1" attrs="{'invisible':[('other_type','=',False)]}"/>
+                                    <field name="other_type" readonly="1"
+                                           attrs="{'invisible':[('other_type','=',False)]}"/>
                                     <field name="city_id" readonly="1"/>
                                     <field name="district_id" readonly="1"/>
                                 </group>
@@ -98,7 +104,7 @@
                                 </group>
                             </page>
                             <page name="unit_price" string="Price Info">
-                                 <group col="4" colspan="2">
+                                <group col="4" colspan="2">
                                     <field name="meter_price" readonly="1"/>
                                     <field name="rent_price" required="1"
                                            attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -110,9 +116,37 @@
                             <page name="stamping_info" string="Stamping">
                                 <group>
                                     <group>
-                                        <field name="stamping" required="1" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="stamping_date" required="1" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
-                                        <field name="stamping_attach" attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
+                                        <field name="stamping_count"
+                                               readonly="1"/>
+                                        <field name="stamping"/>
+                                        <field name="stamping_date"/>
+                                        <field name="stamping_attach"/>
+<!--                                        <field name="stamping_state"/>-->
+                                    </group>
+                                    <group string="Second Stamping"
+                                           attrs="{'invisible':['|',('stamping_count','=','1'),('stamping_count','=',False)]}">
+                                        <field name="stamping_2"
+                                               readonly="1"/>
+                                        <field name="stamping_date_2"
+                                              readonly="1"/>
+                                        <field name="stamping_attach_2"
+                                              readonly="1"/>
+                                        <field name="stamping_state_2"
+                                               readonly="1"/>
+
+                                    </group>
+                                    <group string="Third stamping"
+                                           attrs="{'invisible':['|','|',('stamping_count','=','1'),('stamping_count','=','2'),('stamping_count','=',False)]}"
+                                          >
+                                        <field name="stamping_3"
+                                               readonly="1"/>
+                                        <field name="stamping_date_3"
+                                              readonly="1"/>
+                                        <field name="stamping_attach_3"
+                                              readonly="1"/>
+                                        <field name="stamping_state_3"
+                                              readonly="1"/>
+
                                     </group>
                                 </group>
                             </page>