From a524284e413985c271dd0edfeccde14e4f1110cc Mon Sep 17 00:00:00 2001
From: esraa <e.mostafa@exp-sa.com>
Date: Wed, 23 Oct 2024 14:50:56 +0300
Subject: [PATCH] update chatter area

---
 .../views/property_reservation_view.xml       |  65 +++--
 .../views/engineering_office_view.xml         |  25 +-
 .../project_estimated_quantities_view.xml     |   7 +-
 .../views/end_rent_views.xml                  |  47 ++--
 .../views/rent_payment_view.xml               |  23 +-
 .../views/rental_contract_views.xml           |  67 +++--
 .../views/transfer_contract_view.xml          | 189 ++++++-------
 .../views/client_requirement_view.xml         | 260 +++++++++---------
 .../views/re_sale_view.xml                    |   1 +
 .../views/re_pricing_view.xml                 |   3 +-
 .../views/re_sommes_view.xml                  |   7 +-
 11 files changed, 374 insertions(+), 320 deletions(-)

diff --git a/odex25_realstate/khawald_real_estate_marketing/views/property_reservation_view.xml b/odex25_realstate/khawald_real_estate_marketing/views/property_reservation_view.xml
index 1721deaa5..68b88052a 100644
--- a/odex25_realstate/khawald_real_estate_marketing/views/property_reservation_view.xml
+++ b/odex25_realstate/khawald_real_estate_marketing/views/property_reservation_view.xml
@@ -10,7 +10,8 @@
                         <button name="action_approve" string="Approve" states="draft" type="object"/>
                         <button name="action_cancel" string="Cancel Reservation" states="approve" type="object"
                                 confirm="Are you sure you want to cancel the reservation?!. Please be aware if you cancel the unit will be return Available"/>
-                        <button name="action_create_sale" string="Create Sale Request" attrs="{'invisible':[('sale_creation', '!=',True)]}" type="object"/>
+                        <button name="action_create_sale" string="Create Sale Request"
+                                attrs="{'invisible':[('sale_creation', '!=',True)]}" type="object"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
@@ -24,29 +25,36 @@
                                     class="oe_stat_button"
                                     icon="fa-dollar">
                                 Sales Request
-                        </button>
+                            </button>
                         </div>
                         <group string="Reservation Information" name="reserve">
                             <group>
                                 <field name="name" readonly="1" force_save="1"/>
                                 <field name="search_type" readonly="1" required="1"/>
                                 <field name="property_id" attrs="{'readonly':[('state', '!=', 'draft')]}" required="1"/>
-                                <field name="unit_id" domain="[('property_id', '=', property_id),('state', '=', 'available'),('action_type', '=', 'sale')]" attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('search_type', '!=', 'unit')],'required':[('search_type', '=', 'unit')]}"/>
-                                <field name="marketer_user_id" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="unit_id"
+                                       domain="[('property_id', '=', property_id),('state', '=', 'available'),('action_type', '=', 'sale')]"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('search_type', '!=', 'unit')],'required':[('search_type', '=', 'unit')]}"/>
+                                <field name="marketer_user_id"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                                 <field name="user_id" readonly="1" force_save="1"/>
                             </group>
                             <group>
                                 <field name="request_date" readonly="1" force_save="1"/>
-                                <field name="end_date" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="end_date"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                                 <field name="total_days" readonly="1" force_save="1"/>
-                                <field name="agent_id" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="agent_id"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                                 <field name="sale_creation" invisible="1"/>
                             </group>
                         </group>
                         <group string="Client Information" name="client">
                             <group>
-                                <field name="title" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
-                                <field name="partner_id" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="title"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="partner_id"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                                 <field name="phone" readonly="1" force_save="1"/>
                                 <field name="date_of_birth" readonly="1" force_save="1"/>
                                 <field name="email" readonly="1" force_save="1"/>
@@ -56,30 +64,41 @@
                                 <field name="mobile" readonly="1" force_save="1"/>
                                 <field name="country_id" readonly="1" force_save="1"/>
                                 <field name="street" readonly="1" force_save="1"/>
-                                <field name="identification_number" />
-                                <field name="tax_exemption" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="identification_number"/>
+                                <field name="tax_exemption"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                             </group>
                         </group>
                         <group string="Finance Details" name="finance">
                             <group>
-                                <field name="reserve_type" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
-                                <field name="payment_type" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
-                                <field name="client_check_number" attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
+                                <field name="reserve_type"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="payment_type"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="client_check_number"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
                                 <field name="price" readonly="1" force_save="1"/>
-                                <field name="final_price" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="final_price"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                                 <field name="total_price" readonly="1" force_save="1"/>
                             </group>
                             <group>
-                                <field name="bank_id" attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
-                                <field name="payment_amount" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
-                                <field name="client_check" attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
-                                <field name="receive_check" attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
-                                <field name="discount" attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="bank_id"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
+                                <field name="payment_amount"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
+                                <field name="client_check"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
+                                <field name="receive_check"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'invisible':[('payment_type', '!=', 'bank')],'required':[('payment_type', '=', 'bank')]}"/>
+                                <field name="discount"
+                                       attrs="{'readonly':[('state', '!=', 'draft')],'required':[('state', '=', 'draft')]}"/>
                                 <field name="move_id" readonly="1"/>
                             </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="activity_ids" widget="mail_activity"/>
                         <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
@@ -104,8 +123,8 @@
         </record>
 
         <record id="property_reservation_search_view" model="ir.ui.view">
-           <field name="name">property.reservation.select.list</field>
-           <field name="model">property.reservation</field>
+            <field name="name">property.reservation.select.list</field>
+            <field name="model">property.reservation</field>
             <field name="arch" type="xml">
                 <search string="">
                     <field name="name"/>
@@ -123,7 +142,7 @@
                                 context="{'group_by':'payment_type'}"/>
                     </group>
                 </search>
-           </field>
+            </field>
         </record>
 
         <record id="view_property_reservation_action" model="ir.actions.act_window">
@@ -137,7 +156,7 @@
                     Click to create a New Reservation.
                 </p>
             </field>
-	    </record>
+        </record>
 
         <menuitem id="res_property_reservation_menu" name="Property Reservation"
                   parent="real_estate_marketing.menu_real_estate_marketing"
diff --git a/odex25_realstate/project_management_custom/views/engineering_office_view.xml b/odex25_realstate/project_management_custom/views/engineering_office_view.xml
index 46b407a3c..4b1ef2041 100644
--- a/odex25_realstate/project_management_custom/views/engineering_office_view.xml
+++ b/odex25_realstate/project_management_custom/views/engineering_office_view.xml
@@ -3,22 +3,23 @@
 
     <!-- Engineering Office -->
 
-	<record id="view_engineering_office_partner" model="ir.actions.act_window">
+    <record id="view_engineering_office_partner" model="ir.actions.act_window">
         <field name="name">Engineering Office</field>
         <field name="res_model">res.partner</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('is_engineering_office','=',True)]</field>
         <field name="context">{'search_default_is_engineering_office': True,
-                'default_is_engineering_office': True}</field>
+            'default_is_engineering_office': True}
+        </field>
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
                 Click to create a Engineering Office.
             </p>
         </field>
-	</record>
+    </record>
 
     <menuitem id="engineering_office" name="Engineering Office" parent="project_installment"
-                  action="view_engineering_office_partner" sequence="1"/>
+              action="view_engineering_office_partner" sequence="1"/>
 
 
     <!-- ##### Engineering Office Line #####-->
@@ -31,19 +32,22 @@
                     <group>
                         <group>
                             <field name="project_id" readonly="1"/>
-                            <field name="engineering_office_id" readonly="1" domain="[('is_engineering_office','=',True)]"/>
+                            <field name="engineering_office_id" readonly="1"
+                                   domain="[('is_engineering_office','=',True)]"/>
                         </group>
                         <group>
                             <field name="name"/>
-                            <field name="percent" /><h5>-</h5>
+                            <field name="percent"/>
+                            <h5>-</h5>
                             <field name="due_date" required="1"/>
                             <field name="paid" readonly="1"/>
                             <field name="paid_date" readonly="1"/>
-                            <field name="amount" />
+                            <field name="amount"/>
                         </group>
                     </group>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="activity_ids" widget="mail_activity"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
@@ -74,10 +78,10 @@
         <field name="arch" type="xml">
             <search string="Search Engineer Office/Project">
                 <field name="name"/>
-                <filter name="engineering_office_id" />
-                <filter name="project_id" />
+                <filter name="engineering_office_id"/>
+                <filter name="project_id"/>
                 <group expand="0" string="Group By...">
-                    <filter string="Engineering Office Name" name="engineering_office_id"  domain="[]"
+                    <filter string="Engineering Office Name" name="engineering_office_id" domain="[]"
                             context="{'group_by':'engineering_office_id'}"/>
                     <filter string="Project" name="project_id" domain="[]"
                             context="{'group_by':'project_id'}"/>
@@ -105,7 +109,6 @@
               action="view_engineering_office_line_action" sequence="2"/>
 
 
-
 </odoo>
 
 
diff --git a/odex25_realstate/project_management_custom/views/project_estimated_quantities_view.xml b/odex25_realstate/project_management_custom/views/project_estimated_quantities_view.xml
index 7b728b77f..452e37146 100644
--- a/odex25_realstate/project_management_custom/views/project_estimated_quantities_view.xml
+++ b/odex25_realstate/project_management_custom/views/project_estimated_quantities_view.xml
@@ -13,12 +13,12 @@
                             <group>
                                 <field name="project_id" readonly="1"/>
                                 <field name="work_item_id"/>
-                                <field name="total_estimated_qty" sum="Total Amount" readonly="1" />
+                                <field name="total_estimated_qty" sum="Total Amount" readonly="1"/>
                             </group>
                             <group>
-                                <field name="name" />
+                                <field name="name"/>
                                 <field name="quantity" sum="Qty"/>
-                                <field name="uom_id" />
+                                <field name="uom_id"/>
                                 <field name="unit_price" sum="Unit"/>
                             </group>
                         </group>
@@ -26,6 +26,7 @@
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
                         <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
                     </div>
                 </form>
             </field>
diff --git a/odex25_realstate/property_management/views/end_rent_views.xml b/odex25_realstate/property_management/views/end_rent_views.xml
index f06a08926..57896bd17 100644
--- a/odex25_realstate/property_management/views/end_rent_views.xml
+++ b/odex25_realstate/property_management/views/end_rent_views.xml
@@ -18,7 +18,7 @@
                                 states="draft"
                                 type="object"
                                 groups="property_management.group_property_manager"/>
-                         <button name="action_draft" string="RE-set To Draft"
+                        <button name="action_draft" string="RE-set To Draft"
                                 states="check,cancel"
                                 type="object"
                                 groups="property_management.group_property_manager"/>
@@ -33,7 +33,8 @@
                                 <field name="date" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
                                 <field name="contract_state" attrs="{'readonly':[('state','!=','draft')]}"
                                        required="1"/>
-                                <field name="contract_id" domain="[('state', '=', 'confirm')]" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
+                                <field name="contract_id" domain="[('state', '=', 'confirm')]"
+                                       attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
                                 <field name="property_id" attrs="{'readonly':[('state','!=','draft')]}" readonly="1"/>
                                 <field name="unit_ids" widget="many2many_tags" readonly="1"/>
                                 <field name="evacuation_date" attrs="{'readonly':[('state','!=','draft')]}"
@@ -104,10 +105,11 @@
                             </page>
                         </notebook>
                     </sheet>
-                     <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -147,7 +149,6 @@
         </record>
 
 
-
         <!-- ################################# Maintenance Part #####################################################  -->
         <record id="property_management_maintenance_form" model="ir.ui.view">
             <field name="name">Property Maintenance</field>
@@ -160,19 +161,19 @@
                                 type="object"/>
                         <button name="action_done" string="Done"
                                 states="submit"
-                            groups="property_management.group_property_manager"
+                                groups="property_management.group_property_manager"
                                 type="object"/>
-                        
+
                         <button name="action_cancel" string="Cancel"
-                            groups="property_management.group_property_manager"
+                                groups="property_management.group_property_manager"
                                 states="draft,submit"
                                 type="object"/>
-                        
+
                         <button name="action_rest_draft" string="RE-SET To Draft"
-                            groups="property_management.group_property_manager"
+                                groups="property_management.group_property_manager"
                                 states="submit"
                                 type="object"/>
-                        
+
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
@@ -198,15 +199,18 @@
                                        widget="many2many_tags"/>
                             </group>
                             <group>
-                                <field name="vendor_id"  attrs="{'invisible':[('renter_invoice', '=', True)],
+                                <field name="vendor_id" attrs="{'invisible':[('renter_invoice', '=', True)],
                                 'required':[('renter_invoice', '=', False)], 'readonly':[('state','!=','draft')]}"/>
                                 <field name="maintenance_cost" invisible="0" readonly="1"/>
                                 <field name="hand_cost" invisible="0" readonly="1"/>
                                 <field name="total_amount" readonly="1"/>
                                 <field name="company_id" readonly="1"/>
                                 <field name="user_id" readonly="1"/>
-                                <field name="invoice_id" readonly="1" attrs="{'invisible':[('invoice_id', '=',False)]}"/>
-                                <field name="request_id"  context="{'form_view_ref': 'request_from_warehouse.view_order_form_inhert_request'}" readonly="1" attrs="{'invisible':[('request_id', '=',False)]}"/>
+                                <field name="invoice_id" readonly="1"
+                                       attrs="{'invisible':[('invoice_id', '=',False)]}"/>
+                                <field name="request_id"
+                                       context="{'form_view_ref': 'request_from_warehouse.view_order_form_inhert_request'}"
+                                       readonly="1" attrs="{'invisible':[('request_id', '=',False)]}"/>
                             </group>
                         </group>
                         <group>
@@ -230,9 +234,10 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -247,7 +252,7 @@
                     <field name="date"/>
                     <field name="contract_id"/>
                     <field name="property_id"/>
-                     <field name="unit_ids" widget="many2many_tags"/>
+                    <field name="unit_ids" widget="many2many_tags"/>
                     <field name="total_amount"/>
 
                 </tree>
@@ -275,7 +280,5 @@
         </record>
 
 
-
-
     </data>
 </odoo>
diff --git a/odex25_realstate/property_management/views/rent_payment_view.xml b/odex25_realstate/property_management/views/rent_payment_view.xml
index 380e45269..4f3ab16ba 100644
--- a/odex25_realstate/property_management/views/rent_payment_view.xml
+++ b/odex25_realstate/property_management/views/rent_payment_view.xml
@@ -42,7 +42,7 @@
                                 <field name="tax_id" readonly="1"/>
                                 <field name="tax_amount" readonly="1"/>
                                 <field name="total_amount" readonly="1"/>
-                                 <field name="commission_amount" readonly="1"/>
+                                <field name="commission_amount" readonly="1"/>
                                 <field name="collected_from_company"/>
                                 <field name="amount_in_word" readonly="1"/>
                             </group>
@@ -59,6 +59,7 @@
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
                     </div>
                 </form>
             </field>
@@ -68,13 +69,15 @@
             <field name="name">Rent Payment List</field>
             <field name="model">rent.payment</field>
             <field name="arch" type="xml">
-                <tree create="false" decoration-warning="state == 'due'" decoration-info="state == 'invoice'" decoration-danger="state == 'cancel'"  decoration-muted="state == 'canceled'" decoration-success="state == 'paid'">
+                <tree create="false" decoration-warning="state == 'due'" decoration-info="state == 'invoice'"
+                      decoration-danger="state == 'cancel'" decoration-muted="state == 'canceled'"
+                      decoration-success="state == 'paid'">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="contract_id"/>
                     <field name="renter_id"/>
                     <field name="property_id"/>
-                   <field name="unit_ids" widget="many2many_tags"/>
+                    <field name="unit_ids" widget="many2many_tags"/>
                     <field name="due_date"/>
                     <field name="paid_date"/>
                     <field name="amount" sum="Total Amount"/>
@@ -103,9 +106,12 @@
                     <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')]"/>
-                     <filter string="Collected From Company" name="collected_from_company" domain="[('collected_from_company','=',True)]"/>
-                    <filter string="Invoice Commission" name="invoice_commission_id" domain="[('collected_from_company','=',True),('invoice_commission_id','!=',False)]"/>
-                    <filter string="NOT Invoice Commission " name="no_invoice_commission_id" domain="[('collected_from_company','=',True),('invoice_commission_id','=',False)]"/>
+                    <filter string="Collected From Company" name="collected_from_company"
+                            domain="[('collected_from_company','=',True)]"/>
+                    <filter string="Invoice Commission" name="invoice_commission_id"
+                            domain="[('collected_from_company','=',True),('invoice_commission_id','!=',False)]"/>
+                    <filter string="NOT Invoice Commission " name="no_invoice_commission_id"
+                            domain="[('collected_from_company','=',True),('invoice_commission_id','=',False)]"/>
 
                     <separator/>
                     <filter name="payment_state" string="Not Canceled Payment" domain="[('state','!=','cancel')]"/>
@@ -113,7 +119,8 @@
 
                     <group expand="0" string="Group By">
                         <filter string="Status" name="state" domain="[]" context="{'group_by': 'state'}"/>
-                        <filter string="Collected From Company" name="collected_from_company" domain="[]" context="{'group_by': 'collected_from_company'}"/>
+                        <filter string="Collected From Company" name="collected_from_company" domain="[]"
+                                context="{'group_by': 'collected_from_company'}"/>
                         <filter string="Renter" name="partner_id" domain="[]" context="{'group_by': 'partner_id'}"/>
                         <filter name="group_contract_id" string="Rental Contract" domain="[]"
                                 context="{'group_by':'contract_id'}"/>
@@ -125,7 +132,5 @@
         </record>
 
 
-
-
     </data>
 </odoo>
diff --git a/odex25_realstate/property_management/views/rental_contract_views.xml b/odex25_realstate/property_management/views/rental_contract_views.xml
index 74d273e45..b874dcc3d 100644
--- a/odex25_realstate/property_management/views/rental_contract_views.xml
+++ b/odex25_realstate/property_management/views/rental_contract_views.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <data>
-<!--          Inherit Form View to Modify it -->
-      <record id="contact_extend" model="ir.ui.view">
+        <!--          Inherit Form View to Modify it -->
+        <record id="contact_extend" model="ir.ui.view">
             <field name="name">contact.extend.partner</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='category_id']" position="after">
-                    <field groups='property_management.group_property_user,property_management.group_property_manager' name="is_tenant"/>
-<!--                    <field name="is_property_evaluator"/>-->
+                    <field groups='property_management.group_property_user,property_management.group_property_manager'
+                           name="is_tenant"/>
+                    <!--                    <field name="is_property_evaluator"/>-->
                 </xpath>
             </field>
         </record>
@@ -22,12 +23,13 @@
                     <field name="phone"/>
                     <field name="email"/>
                     <field name="is_tenant"/>
-                     <filter string="Tenants" name="tenant_filter" domain="[('is_tenant', '=', True)]" context="{'group_by': 'is_tenant'}"/>
-                 </search>
-             </field>
-         </record>
+                    <filter string="Tenants" name="tenant_filter" domain="[('is_tenant', '=', True)]"
+                            context="{'group_by': 'is_tenant'}"/>
+                </search>
+            </field>
+        </record>
 
-<!--         ########################################################################################################################## -->
+        <!--         ########################################################################################################################## -->
         <record id="rental_contract_form_view" model="ir.ui.view">
             <field name="name">Rental Contract</field>
             <field name="model">rental.contract</field>
@@ -42,29 +44,30 @@
                                 type="object"/>
                         <button name="action_confirm" string="Confirm"
                                 states="review"
-                            groups="property_management.group_property_manager"
+                                groups="property_management.group_property_manager"
                                 type="object"/>
                         <button name="action_renew" string="Renew Contract" type="object"
                                 confirm="Are you sure to renew the contract? That is mean you will renew this contract and create new draft one"
                                 class="oe_highlight"
                                 states="confirm"
-                            groups="property_management.group_property_manager"
+                                groups="property_management.group_property_manager"
                         />
                         <button name="action_cancel" string="Cancel"
                                 states="draft,submit,review"
                                 type="object" groups="property_management.group_property_manager"/>
-                        
+
                         <button name="action_draft" string="RE-set To Draft"
                                 states="submit,review,cancel"
                                 type="object" groups="property_management.group_property_manager"/>
-                        
+
                         <field name="state" widget="statusbar"
                                statusbar_visible="draft,submit,confirm,review,close,cancel"/>
 
                     </header>
                     <sheet>
-                     <field name="is_today_end_date" invisible="1"/> <!-- Add this line -->
-                      <widget name="web_ribbon" title="Expired" bg_color="bg-danger" attrs="{'invisible': [('is_today_end_date', '!=', True)]}"/>
+                        <field name="is_today_end_date" invisible="1"/> <!-- Add this line -->
+                        <widget name="web_ribbon" title="Expired" bg_color="bg-danger"
+                                attrs="{'invisible': [('is_today_end_date', '!=', True)]}"/>
                         <h1>
                             <field name="seq" readonly="1"/>
                         </h1>
@@ -159,14 +162,16 @@
 
                                    required="1"/>
                             <field name="identification_type" readonly="1"/>
-                    <field name="identification_number" readonly="1"/>
-                    <field name="identification_issue_date" readonly="1"/>
-                    <field name="identification_expiry_date" readonly="1"/>
+                            <field name="identification_number" readonly="1"/>
+                            <field name="identification_issue_date" readonly="1"/>
+                            <field name="identification_expiry_date" readonly="1"/>
                         </group>
-                        <button name="check_line" attrs="{'invisible':[('state', '!=', 'draft')]}" icon="fa-gears" type="object" string="Generate Payment"/>
+                        <button name="check_line" attrs="{'invisible':[('state', '!=', 'draft')]}" icon="fa-gears"
+                                type="object" string="Generate Payment"/>
                         <notebook>
                             <page string="Rent Payment">
-                                <field name="annual_raise_ids" context="{'contract_id': active_id}" attrs="{'readonly':[('state', '!=', 'draft')]}">
+                                <field name="annual_raise_ids" context="{'contract_id': active_id}"
+                                       attrs="{'readonly':[('state', '!=', 'draft')]}">
                                     <tree editable="bottom">
                                         <field name="year" required="1"/>
                                         <field name="raise_type" required="1"/>
@@ -177,9 +182,9 @@
                                         <field name="meter_price_after_raise"
                                                attrs="{'invisible':[('raise_on', '=', 'rent_amount')]}"/>
                                         <field name="raise_amount" required="1"/>
-                                        <field name="due_date_raise"  required="1"/>
-                                        <field name="rent_amount"  sum="Rent Amount"/>
-                                        <field name="rent_amount_after_raise_temp"  sum="Rent Amount After Raise"/>
+                                        <field name="due_date_raise" required="1"/>
+                                        <field name="rent_amount" sum="Rent Amount"/>
+                                        <field name="rent_amount_after_raise_temp" sum="Rent Amount After Raise"/>
                                         <field name="rent_amount_after_raise" sum="Rent Amount After Raise"/>
                                     </tree>
                                 </field>
@@ -249,10 +254,14 @@
                             </page>
                             <page string="Accounting">
                                 <group col="4" colspan="2">
-                                    <field name="journal_id" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
-                                    <field name="debit_account_id" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
-                                    <field name="accrued_account_id" attrs="{'readonly':[('state','!=','draft')]}" required="1" options="{'no_create': True, 'no_open': True}"/>
-                                    <field name="revenue_account_id" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
+                                    <field name="journal_id" attrs="{'readonly':[('state','!=','draft')]}"
+                                           required="1"/>
+                                    <field name="debit_account_id" attrs="{'readonly':[('state','!=','draft')]}"
+                                           required="1"/>
+                                    <field name="accrued_account_id" attrs="{'readonly':[('state','!=','draft')]}"
+                                           required="1" options="{'no_create': True, 'no_open': True}"/>
+                                    <field name="revenue_account_id" attrs="{'readonly':[('state','!=','draft')]}"
+                                           required="1"/>
                                 </group>
                             </page>
                             <page string="Note">
@@ -262,6 +271,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="activity_ids" widget="mail_activity"/>
                         <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
@@ -312,7 +322,8 @@
 
                     <filter string="Draft" name="draft" domain="[('state','=','draft')]"/>
                     <separator/>
-                     <filter name="expired_contracts" string="Expired" domain="[('date_to', '&lt;', context_today().strftime('%Y-%m-%d'))]"/>
+                    <filter name="expired_contracts" string="Expired"
+                            domain="[('date_to', '&lt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <separator/>
                     <filter string="Review" name="review" domain="[('state','in',('submit','review') )]"/>
                     <separator/>
diff --git a/odex25_realstate/property_management/views/transfer_contract_view.xml b/odex25_realstate/property_management/views/transfer_contract_view.xml
index d691d2005..1e5da85bd 100644
--- a/odex25_realstate/property_management/views/transfer_contract_view.xml
+++ b/odex25_realstate/property_management/views/transfer_contract_view.xml
@@ -2,110 +2,113 @@
 <odoo>
 
     <record id="transfer_contract_form_view" model="ir.ui.view">
-           <field name="name">transfer contract form</field>
-            <field name="model">transfer.contract</field>
-            <field name="arch" type="xml">
-                <form>
-                    <header>
-                        <button name="action_submit" string="Submit" type="object" states="draft"
-                        />
+        <field name="name">transfer contract form</field>
+        <field name="model">transfer.contract</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="action_submit" string="Submit" type="object" states="draft"
+                    />
 
-                        <button name="action_review" string="Review" type="object" states="submit"
-                        />
+                    <button name="action_review" string="Review" type="object" states="submit"
+                    />
 
-                        <button name="action_confirm" string="Confirm" type="object" states="review"
-                        />
+                    <button name="action_confirm" string="Confirm" type="object" states="review"
+                    />
 
 
-                        <button name="action_reset" groups="property_management.group_property_manager"  string="Set To Draft" type="object" states="submit,review,cancel"
-                        />
+                    <button name="action_reset" groups="property_management.group_property_manager"
+                            string="Set To Draft" type="object" states="submit,review,cancel"
+                    />
 
-                        <button name="action_cancel" groups="property_management.group_property_manager" string="Cancel" type="object" states="submit,review,draft"
-                        />
+                    <button name="action_cancel" groups="property_management.group_property_manager" string="Cancel"
+                            type="object" states="submit,review,draft"
+                    />
 
-                        <field name="state" widget="statusbar"/>
-                    </header>
-                    <sheet>
-                        <h1>
-                            <field name="name" placeholder="No." readonly="1"/>
-                        </h1>
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <h1>
+                        <field name="name" placeholder="No." readonly="1"/>
+                    </h1>
 
-                        <group>
-                            <group string="Contract Info">
-                                <field name="contract_id" domain="[('state','=', 'confirm')]" required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="date_from" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="date_to" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="date" required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="property_id" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="current_partner_id" readonly="1"
-                                       attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="unit_ids" widget="many2many_tags" readonly="1"
-                                       attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="company_id" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <group>
+                        <group string="Contract Info">
+                            <field name="contract_id" domain="[('state','=', 'confirm')]" required="1"
+                                   attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date_from" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date_to" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date" required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="property_id" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="current_partner_id" readonly="1"
+                                   attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="unit_ids" widget="many2many_tags" readonly="1"
+                                   attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="company_id" readonly="1" attrs="{'readonly':[('state','!=','draft')]}"/>
 
-                            </group>
-                            <group string="New Renter Info &amp; Finical Inof">
-                                <field name="partner_id"  required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            </group>
                         </group>
-
-
-                    </sheet>
-                   <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Transfer Contract list view -->
-        <record id="transfer_contract_list_view" model="ir.ui.view">
-            <field name="name">transfer contract lis</field>
-            <field name="model">transfer.contract</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name"/>
-                    <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="current_partner_id"/>
-                    <field name="contract_id"/>
-                    <field name="property_id"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="transfer_contract_search_view" model="ir.ui.view">
-            <field name="name">Transfer Contract Search</field>
-            <field name="model">transfer.contract</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="current_partner_id"/>
-                    <field name="contract_id"/>
-
-                    <filter string="Confirmed" name="confirm" domain="[('state','=','confirm')]"/>
-                    <filter string="To review" name="review" domain="[('state','=','review')]"/>
-                    <filter string="Submit" name="submit" domain="[('state','=','submit')]"/>
-                    <filter string="Cancelled" name="cancel" domain="[('state','=','cancel')]"/>
-
-                    <separator/>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
-                        <filter name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
-
-                        <filter name="group_contract_id" string="Rental Contract" domain="[]"
-                                context="{'group_by':'contract_id'}"/>
-
-                        <filter name="property_group" string="Property" domain="[]"
-                                context="{'group_by':'property_id'}"/>
-
+                        <group string="New Renter Info &amp; Finical Inof">
+                            <field name="partner_id" required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                        </group>
                     </group>
-                </search>
-            </field>
-        </record>
 
 
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <!-- Transfer Contract list view -->
+    <record id="transfer_contract_list_view" model="ir.ui.view">
+        <field name="name">transfer contract lis</field>
+        <field name="model">transfer.contract</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="date"/>
+                <field name="partner_id"/>
+                <field name="current_partner_id"/>
+                <field name="contract_id"/>
+                <field name="property_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="transfer_contract_search_view" model="ir.ui.view">
+        <field name="name">Transfer Contract Search</field>
+        <field name="model">transfer.contract</field>
+        <field name="arch" type="xml">
+            <search string="Search">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="current_partner_id"/>
+                <field name="contract_id"/>
+
+                <filter string="Confirmed" name="confirm" domain="[('state','=','confirm')]"/>
+                <filter string="To review" name="review" domain="[('state','=','review')]"/>
+                <filter string="Submit" name="submit" domain="[('state','=','submit')]"/>
+                <filter string="Cancelled" name="cancel" domain="[('state','=','cancel')]"/>
+
+                <separator/>
+                <group expand="0" string="Group By..." colspan="12" col="10">
+                    <filter name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
+
+                    <filter name="group_contract_id" string="Rental Contract" domain="[]"
+                            context="{'group_by':'contract_id'}"/>
+
+                    <filter name="property_group" string="Property" domain="[]"
+                            context="{'group_by':'property_id'}"/>
+
+                </group>
+            </search>
+        </field>
+    </record>
+
 
 </odoo>
diff --git a/odex25_realstate/real_estate_marketing/views/client_requirement_view.xml b/odex25_realstate/real_estate_marketing/views/client_requirement_view.xml
index e4a7e519e..2b95d7d6b 100644
--- a/odex25_realstate/real_estate_marketing/views/client_requirement_view.xml
+++ b/odex25_realstate/real_estate_marketing/views/client_requirement_view.xml
@@ -1,145 +1,151 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-        <!-- Clients Request -->
-        <record id="view_clients_request_tree" model="ir.ui.view">
-            <field name="name">clients.request.tree</field>
-            <field name="model">re.clients.requirement</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name"/>
-                    <field name="action_type"/>
-                    <field name="search_type"/>
-                    <field name="partner_id"/>
-                    <field name="request_date"/>
-                    <field name="user_id"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
+    <!-- Clients Request -->
+    <record id="view_clients_request_tree" model="ir.ui.view">
+        <field name="name">clients.request.tree</field>
+        <field name="model">re.clients.requirement</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="action_type"/>
+                <field name="search_type"/>
+                <field name="partner_id"/>
+                <field name="request_date"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
 
-        <record id="view_client_requirements_form" model="ir.ui.view">
-            <field name="name">clients requirement</field>
-            <field name="model">re.clients.requirement</field>
-            <field name="arch" type="xml">
-                <form>
-                    <header>
-                        <button string="Get Satisfied Properties" name="get_satisfied_property" type="object" states="draft"/>
-                        <button name="action_register" string="Register" states="draft" type="object"/>
-                        <button name="action_approve" string="Approve" states="register" type="object"/>
-                        <button name="action_draft" string="Set To Draft" states="register" type="object"/>
-                        <button name="action_cancel" string="Cancel" states="draft,register" type="object"/>
+    <record id="view_client_requirements_form" model="ir.ui.view">
+        <field name="name">clients requirement</field>
+        <field name="model">re.clients.requirement</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button string="Get Satisfied Properties" name="get_satisfied_property" type="object"
+                            states="draft"/>
+                    <button name="action_register" string="Register" states="draft" type="object"/>
+                    <button name="action_approve" string="Approve" states="register" type="object"/>
+                    <button name="action_draft" string="Set To Draft" states="register" type="object"/>
+                    <button name="action_cancel" string="Cancel" states="draft,register" type="object"/>
 
-                        <field name="state" widget="statusbar"/>
-                    </header>
-                    <sheet>
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <field name="name" readonly="1" force_save="1"/>
-                                <field name="action_type" required="1" />
-                                <field name="search_type" required="1"/>
-                                <field name="property_type_ids" widget="many2many_tags" attrs="{'invisible': [('search_type', '!=', 'property')], 'required': [('search_type', '=', 'property')]}"/>
-                                <field name="unit_type_id" attrs="{'invisible': [('search_type', '!=', 'unit')], 'required': [('search_type', '=', 'unit')]}"/>
-                                <field name="city_id"/>
-                                <field name="user_id" readonly="1" force_save="1"/>
-                                <field name="district" widget="many2many_tags" domain="[('city_id','=',city_id)]"/>
-                                <field name="region" invisible="1"/>
-                                <field name="company_id" invisible="1"/>
-                            </group>
-                            <group>
-                                <field name="request_date" readonly="1" force_save="1"/>
-                                <field name="size_from"/>
-                                <field name="size_to"/>
-                                <field name="value_from"/>
-                                <field name="value_to"/>
-                                <label for="room_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                <div>
-                                    <field name="room_from"
-                                           attrs="{'invisible': [('search_type', '!=', 'unit')]}"
-                                           class="oe_inline"/>
-                                    <label for="room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                    <field name="room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                </div>
-
-                                <label for="bath_room_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                <div>
-                                    <field name="bath_room_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"
-                                           class="oe_inline"/>
-                                    <label for="bath_room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                    <field name="bath_room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                </div>
-                                <label for="kitchen_number_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                <div>
-                                    <field name="kitchen_number_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"
-                                           class="oe_inline"/>
-                                    <label for="kitchen_number_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                    <field name="kitchen_number_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
-                                </div>
-                            </group>
+                            <field name="name" readonly="1" force_save="1"/>
+                            <field name="action_type" required="1"/>
+                            <field name="search_type" required="1"/>
+                            <field name="property_type_ids" widget="many2many_tags"
+                                   attrs="{'invisible': [('search_type', '!=', 'property')], 'required': [('search_type', '=', 'property')]}"/>
+                            <field name="unit_type_id"
+                                   attrs="{'invisible': [('search_type', '!=', 'unit')], 'required': [('search_type', '=', 'unit')]}"/>
+                            <field name="city_id"/>
+                            <field name="user_id" readonly="1" force_save="1"/>
+                            <field name="district" widget="many2many_tags" domain="[('city_id','=',city_id)]"/>
+                            <field name="region" invisible="1"/>
+                            <field name="company_id" invisible="1"/>
                         </group>
                         <group>
-                            <group>
-                                <field name="partner_id" required="1"/>
-                                <field name="mobile" readonly="1" force_save="1"/>
-                                <field name="phone" readonly="1" force_save="1"/>
-                            </group>
-                            <group>
-                                <field name="request_from"/>
-                                <field name="request_to"/>
-                            </group>
+                            <field name="request_date" readonly="1" force_save="1"/>
+                            <field name="size_from"/>
+                            <field name="size_to"/>
+                            <field name="value_from"/>
+                            <field name="value_to"/>
+                            <label for="room_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                            <div>
+                                <field name="room_from"
+                                       attrs="{'invisible': [('search_type', '!=', 'unit')]}"
+                                       class="oe_inline"/>
+                                <label for="room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                                <field name="room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                            </div>
+
+                            <label for="bath_room_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                            <div>
+                                <field name="bath_room_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"
+                                       class="oe_inline"/>
+                                <label for="bath_room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                                <field name="bath_room_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                            </div>
+                            <label for="kitchen_number_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                            <div>
+                                <field name="kitchen_number_from" attrs="{'invisible': [('search_type', '!=', 'unit')]}"
+                                       class="oe_inline"/>
+                                <label for="kitchen_number_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                                <field name="kitchen_number_to" attrs="{'invisible': [('search_type', '!=', 'unit')]}"/>
+                            </div>
                         </group>
-                        <notebook>
-                            <page name="search_result" string="Search Result">
-                                <field name="client_line_ids">
-                                        <tree create="false" delete="false" editable="top">
-                                            <field name="property_id" readonly="1" domain="[('name','=',False)]"/>
-                                            <field name="request_id" invisible="1" />
-                                            <field name="unit_id" readonly="1" />
-                                            <field name="property_city" readonly="1"/>
-                                            <field name="property_district" readonly="1"/>
-                                            <field name="price" readonly="1" />
-                                            <field name="size" readonly="1" />
-                                            <field name="room" readonly="1" />
-                                            <button name="create_sale_request" type="object" string="Create Sale Request" class="oe_highlight"
+                    </group>
+                    <group>
+                        <group>
+                            <field name="partner_id" required="1"/>
+                            <field name="mobile" readonly="1" force_save="1"/>
+                            <field name="phone" readonly="1" force_save="1"/>
+                        </group>
+                        <group>
+                            <field name="request_from"/>
+                            <field name="request_to"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="search_result" string="Search Result">
+                            <field name="client_line_ids">
+                                <tree create="false" delete="false" editable="top">
+                                    <field name="property_id" readonly="1" domain="[('name','=',False)]"/>
+                                    <field name="request_id" invisible="1"/>
+                                    <field name="unit_id" readonly="1"/>
+                                    <field name="property_city" readonly="1"/>
+                                    <field name="property_district" readonly="1"/>
+                                    <field name="price" readonly="1"/>
+                                    <field name="size" readonly="1"/>
+                                    <field name="room" readonly="1"/>
+                                    <button name="create_sale_request" type="object" string="Create Sale Request"
+                                            class="oe_highlight"
                                             attrs="{'invisible':['|','|',('flag', '=', True),('state','!=','register'),('parent.action_type','!=','sale')]}"/>
-                                            <field name="flag" readonly="1" force_save="1"/>                                            
-                                            <field name="sale_contract_id" readonly="1"
-                                                   attrs="{'invisible': [('sale_contract_id', '=', False)]}"/>
-                                            <field name="state" invisible="1" />
-                                            <field name="search_type" invisible="1" />
-                                        </tree>
-                                </field>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
-                </form>
-            </field>
-        </record>
+                                    <field name="flag" readonly="1" force_save="1"/>
+                                    <field name="sale_contract_id" readonly="1"
+                                           attrs="{'invisible': [('sale_contract_id', '=', False)]}"/>
+                                    <field name="state" invisible="1"/>
+                                    <field name="search_type" invisible="1"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                </div>
+            </form>
+        </field>
+    </record>
 
-        <record id="open_view_clients_requirement" model="ir.actions.act_window">
-            <field name="name">Clients Requirement</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">re.clients.requirement</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id', '=', uid)]</field>
-        </record>
+    <record id="open_view_clients_requirement" model="ir.actions.act_window">
+        <field name="name">Clients Requirement</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">re.clients.requirement</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('user_id', '=', uid)]</field>
+    </record>
 
 
-        <menuitem id="menu_real_estate_marketing"
-                  name="Real Estate Marketing"
-                  sequence="4"
-                  groups="real_estate_marketing.group_marketer_normal_user" web_icon="real_estate_marketing,static/description/icon.png"/>
+    <menuitem id="menu_real_estate_marketing"
+              name="Real Estate Marketing"
+              sequence="4"
+              groups="real_estate_marketing.group_marketer_normal_user"
+              web_icon="real_estate_marketing,static/description/icon.png"/>
 
 
-        <menuitem id="menu_client_requirement" sequence="1"
-                  parent="menu_real_estate_marketing"
-                  name="Clients Requirement"
-                  action="open_view_clients_requirement"
-                  groups="real_estate_marketing.group_marketer_normal_user" />
+    <menuitem id="menu_client_requirement" sequence="1"
+              parent="menu_real_estate_marketing"
+              name="Clients Requirement"
+              action="open_view_clients_requirement"
+              groups="real_estate_marketing.group_marketer_normal_user"/>
 
 </odoo>
\ No newline at end of file
diff --git a/odex25_realstate/real_estate_marketing/views/re_sale_view.xml b/odex25_realstate/real_estate_marketing/views/re_sale_view.xml
index 3481da387..0b2148cf8 100644
--- a/odex25_realstate/real_estate_marketing/views/re_sale_view.xml
+++ b/odex25_realstate/real_estate_marketing/views/re_sale_view.xml
@@ -108,6 +108,7 @@
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
                         <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
                     </div>
                 </form>
             </field>
diff --git a/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_pricing_view.xml b/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_pricing_view.xml
index f1ed3e7f9..7944fd659 100644
--- a/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_pricing_view.xml
+++ b/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_pricing_view.xml
@@ -70,6 +70,7 @@
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
                         <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
                     </div>
                 </form>
             </field>
@@ -87,6 +88,6 @@
                   parent="real_estate_marketing.menu_real_estate_marketing"
                   name="Property Pricing"
                   action="open_view_re_pricing_action"/>
-        
+
     </data>
 </odoo>
diff --git a/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_sommes_view.xml b/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_sommes_view.xml
index de9fe2c6b..51bab6b96 100644
--- a/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_sommes_view.xml
+++ b/odex25_realstate/real_estate_marketing_sommes_pricing/views/re_sommes_view.xml
@@ -48,6 +48,7 @@
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
                         <field name="message_ids" widget="mail_thread"/>
+                        <field name="activity_ids" widget="mail_activity"/>
                     </div>
                 </form>
             </field>
@@ -77,9 +78,9 @@
         </record>
 
         <menuitem id="property_somme_menu" sequence="3"
-                parent="real_estate_marketing.menu_real_estate_marketing"
-                name="Property Somme"
-                action="property_somme_action"/>
+                  parent="real_estate_marketing.menu_real_estate_marketing"
+                  name="Property Somme"
+                  action="property_somme_action"/>
 
     </data>
 </odoo>
\ No newline at end of file