diff --git a/odex25_realstate/property_management/models/rental_contract.py b/odex25_realstate/property_management/models/rental_contract.py
index a6c46db3a..1a5739ab2 100644
--- a/odex25_realstate/property_management/models/rental_contract.py
+++ b/odex25_realstate/property_management/models/rental_contract.py
@@ -125,7 +125,7 @@ class RentalContract(models.Model):
     residential_purpose_id = fields.Many2one('residential.purpose', string="Residential Purpose")
     rent_method = fields.Selection([('property', 'Property'),
                                     ('unit', 'Unit')], string="Rent Method")
-    property_id = fields.Many2one('internal.property', string="Property", tracking=True)
+    property_id = fields.Many2one('internal.property', string="Property", tracking=True,)
     unit_ids = fields.Many2many('re.unit', string="Units", tracking=True)
     partner_id = fields.Many2one('res.partner', string="Renter", domain=[('is_tenant', '=', True)])
     identification_type = fields.Selection(related="partner_id.identification_type", string='Identification Type')
@@ -221,8 +221,11 @@ class RentalContract(models.Model):
     annual_raise_on_type = fields.Selection([('meter', _('Meter')), ('rent_amount', _('Rent amount'))],
                                             _('الزيادة علي'), default='rent_amount')
     # Add Sales Tax Field
-    tax_id = fields.Many2one('account.tax', string="Tax", domain=[('type_tax_use', '=', 'sale')])
+    tax_id = fields.Many2one('account.tax', string="Tax", domain=[('type_tax_use', '=', 'sale')],compute='compute_tax_id')
 
+    @api.onchange('unit_ids')
+    def compute_tax_id(self):
+         self.tax_id = self.unit_ids.tax_id
     @api.onchange('tax_id')
     def _onchange_sales_tax_id(self):
         """
diff --git a/odex25_realstate/property_management/views/rental_contract_views.xml b/odex25_realstate/property_management/views/rental_contract_views.xml
index 1d380096c..8e374881f 100644
--- a/odex25_realstate/property_management/views/rental_contract_views.xml
+++ b/odex25_realstate/property_management/views/rental_contract_views.xml
@@ -79,7 +79,7 @@
                             <group>
                                 <field name="rent_method" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
                                 <field name="property_id" attrs="{'readonly':[('state','!=','draft')]}"
-                                       domain="[('state','=','approve')]" required="1"/>
+                                       domain="[('state','=','approve'),('management_type','!=','include')]" required="1"/>
                                 <field name="management_type" readonly="1"/>
                                 <field name="unit_ids" domain="[('property_id','=',property_id),
                                 ('state','=','available'),
diff --git a/odex25_realstate/real_estate/i18n/ar_001.po b/odex25_realstate/real_estate/i18n/ar_001.po
index 69502f81c..0d1a6c250 100644
--- a/odex25_realstate/real_estate/i18n/ar_001.po
+++ b/odex25_realstate/real_estate/i18n/ar_001.po
@@ -6,17 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-22 12:11+0000\n"
-"PO-Revision-Date: 2024-10-22 15:11+0300\n"
+"POT-Creation-Date: 2024-11-11 10:14+0000\n"
+"PO-Revision-Date: 2024-11-11 10:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? "
-"4 : 5);\n"
-"X-Generator: Poedit 3.5\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
 
 #. module: real_estate
 #: model_terms:ir.ui.view,arch_db:real_estate.unit_kanban_view
@@ -73,7 +70,8 @@ msgstr "نوع الوحدة"
 #: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
 #: model_terms:ir.ui.view,arch_db:real_estate.property_state_form_view
 #: model_terms:ir.ui.view,arch_db:real_estate.property_type_form_view
-#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view model_terms:ir.ui.view,arch_db:real_estate.unit_type_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_type_form_view
 msgid ""
 "<span class=\"o_stat_text\" attrs=\"{'invisible': [('active', '=', False)]}\">Restore</span>\n"
 "                                <span class=\"o_stat_text\" attrs=\"{'invisible': [('active', '=', True)]}\">Archive</span>"
@@ -82,7 +80,8 @@ msgstr ""
 "                                <span class=\"o_stat_text\" attrs=\"{'invisible': [('active', '=', True)]}\">Archive</span>"
 
 #. module: real_estate
-#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
 msgid ""
 "<span class=\"o_stat_text\" attrs=\"{'invisible': [('unlock', '=', False)]}\">Unlock</span>\n"
 "                                <span class=\"o_stat_text\" attrs=\"{'invisible': [('unlock', '=', True)]}\">Lock</span>"
@@ -97,15 +96,9 @@ msgstr "الحسابات"
 
 #. module: real_estate
 #: model:ir.model.fields,field_description:real_estate.field_re_unit__accrued_account_id
-#: model:ir.model.fields,field_description:real_estate.field_re_unit__debit_account_id
 msgid "Accrued Account"
 msgstr "تأمين لدى الغير"
 
-#. module: real_estate
-#: model:ir.model.fields,field_description:real_estate.field_re_unit__debit_account_id
-msgid "Debit Account"
-msgstr "حساب المدين"
-
 #. module: real_estate
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__message_needaction
 #: model:ir.model.fields,field_description:real_estate.field_internal_property_type__message_needaction
@@ -240,7 +233,8 @@ msgstr "مرفقات"
 
 #. module: real_estate
 #: model:ir.model.fields.selection,name:real_estate.selection__re_unit__state__available
-#: model_terms:ir.ui.view,arch_db:real_estate.unit_filter_view model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_filter_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
 msgid "Available"
 msgstr "متاح"
 
@@ -277,7 +271,8 @@ msgstr "عدد المباني"
 
 #. module: real_estate
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__city_id
-#: model:ir.model.fields,field_description:real_estate.field_re_unit__city_id model:ir.ui.menu,name:real_estate.city_menu
+#: model:ir.model.fields,field_description:real_estate.field_re_unit__city_id
+#: model:ir.ui.menu,name:real_estate.city_menu
 #: model_terms:ir.ui.view,arch_db:real_estate.unit_filter_view
 #: model_terms:ir.ui.view,arch_db:real_estate.view_property_filter
 msgid "City"
@@ -335,7 +330,7 @@ msgid "Confirmed Unit"
 msgstr ""
 
 #. module: real_estate
-#: model:ir.model.fields,field_description:real_estate.field_internal_property__content_ids
+#: model:ir.model.fields,field_description:real_estate.field_re_unit__content_ids
 msgid "Content"
 msgstr ""
 
@@ -390,6 +385,11 @@ msgstr "أنشئ في"
 msgid "Current Purchase Price"
 msgstr "سعر الشراء الحالي"
 
+#. module: real_estate
+#: model:ir.model.fields,field_description:real_estate.field_re_unit__debit_account_id
+msgid "Debit Account"
+msgstr ""
+
 #. module: real_estate
 #: model:ir.model.fields,field_description:real_estate.field_floor_unit_details__description
 #: model:ir.model.fields,field_description:real_estate.field_property_content_details__desc
@@ -420,11 +420,6 @@ msgstr "الاسم المعروض"
 msgid "District"
 msgstr "الحي"
 
-#. module: real_estate
-#: model:ir.model.fields,field_description:real_estate.field_property_content_details__attachment
-msgid "Property Docs"
-msgstr "مرفق الوحدة"
-
 #. module: real_estate
 #: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
 #: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
@@ -439,6 +434,11 @@ msgstr "المرفقات"
 msgid "Draft"
 msgstr "مبدئي"
 
+#. module: real_estate
+#: model:ir.actions.server,name:real_estate.action_duplicate_re_unit
+msgid "Duplicate Records"
+msgstr ""
+
 #. module: real_estate
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__east
 msgid "East Length"
@@ -484,7 +484,8 @@ msgstr "لا يمكن أن يكون عداد الكهرباء مساحه بيض
 #: code:addons/real_estate/models/re_unit.py:0
 #, python-format
 msgid "Electric account field accept numbers or special character only"
-msgstr "حقل حساب عداد الكهرباء يقبل قيم رقمية فقط و حروف خاصه مثل (/,$,%,#,%,^,&)"
+msgstr ""
+"حقل حساب عداد الكهرباء يقبل قيم رقمية فقط و حروف خاصه مثل (/,$,%,#,%,^,&)"
 
 #. module: real_estate
 #: code:addons/real_estate/models/re_unit.py:0
@@ -496,7 +497,8 @@ msgstr "حقل متسلسل عداد الكهرباء لا يقبل مساحه 
 #: code:addons/real_estate/models/re_unit.py:0
 #, python-format
 msgid "Electric serial field accept numbers or special character only"
-msgstr "حقل متسلسل عداد الكهرباء يقبل قيم رقمية فقط و حروف خاصه مثل (/,$,%,#,%,^,&)"
+msgstr ""
+"حقل متسلسل عداد الكهرباء يقبل قيم رقمية فقط و حروف خاصه مثل (/,$,%,#,%,^,&)"
 
 #. module: real_estate
 #: code:addons/real_estate/models/re_unit.py:0
@@ -508,7 +510,9 @@ msgstr "حقل رقم إشتراك عداد الكهرباء لا يقبل مس
 #: code:addons/real_estate/models/re_unit.py:0
 #, python-format
 msgid "Electric subscription field accept numbers or special character only"
-msgstr "حقل رقم إشتراك عداد الكهرباء يقبل قيم رقمية فقط و حروف خاصه مثل (/,$,%,#,%,^,&)"
+msgstr ""
+"حقل رقم إشتراك عداد الكهرباء يقبل قيم رقمية فقط و حروف خاصه مثل "
+"(/,$,%,#,%,^,&)"
 
 #. module: real_estate
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__management_type__external_investment
@@ -685,7 +689,7 @@ msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض
 #. module: real_estate
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__management_type__include
 msgid "Include"
-msgstr "مُدرج"
+msgstr "ذات منفعة عائدة"
 
 #. module: real_estate
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__ownership_type__inclusion
@@ -728,6 +732,11 @@ msgstr "هل العقار جديد؟"
 msgid "Is Unit Count Fixed in Floor"
 msgstr "هل عدد الوحدات ثابت في الأدوار؟"
 
+#. module: real_estate
+#: model:ir.model.fields,field_description:real_estate.field_internal_property_type__is_waqf
+msgid "Is Waqf"
+msgstr ""
+
 #. module: real_estate
 #: model:ir.model.fields,field_description:real_estate.field_re_unit__journal_id
 msgid "Journal"
@@ -747,6 +756,8 @@ msgstr "أراضي"
 #: model:ir.model.fields,field_description:real_estate.field_floor_unit_details____last_update
 #: model:ir.model.fields,field_description:real_estate.field_internal_property____last_update
 #: model:ir.model.fields,field_description:real_estate.field_internal_property_type____last_update
+#: model:ir.model.fields,field_description:real_estate.field_property_content_details____last_update
+#: model:ir.model.fields,field_description:real_estate.field_property_contents____last_update
 #: model:ir.model.fields,field_description:real_estate.field_property_faces____last_update
 #: model:ir.model.fields,field_description:real_estate.field_property_role____last_update
 #: model:ir.model.fields,field_description:real_estate.field_re_property_state____last_update
@@ -760,6 +771,8 @@ msgstr "آخر تعديل في"
 #: model:ir.model.fields,field_description:real_estate.field_floor_unit_details__write_uid
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__write_uid
 #: model:ir.model.fields,field_description:real_estate.field_internal_property_type__write_uid
+#: model:ir.model.fields,field_description:real_estate.field_property_content_details__write_uid
+#: model:ir.model.fields,field_description:real_estate.field_property_contents__write_uid
 #: model:ir.model.fields,field_description:real_estate.field_property_faces__write_uid
 #: model:ir.model.fields,field_description:real_estate.field_property_role__write_uid
 #: model:ir.model.fields,field_description:real_estate.field_re_property_state__write_uid
@@ -773,6 +786,8 @@ msgstr "آخر تحديث بواسطة"
 #: model:ir.model.fields,field_description:real_estate.field_floor_unit_details__write_date
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__write_date
 #: model:ir.model.fields,field_description:real_estate.field_internal_property_type__write_date
+#: model:ir.model.fields,field_description:real_estate.field_property_content_details__write_date
+#: model:ir.model.fields,field_description:real_estate.field_property_contents__write_date
 #: model:ir.model.fields,field_description:real_estate.field_property_faces__write_date
 #: model:ir.model.fields,field_description:real_estate.field_property_role__write_date
 #: model:ir.model.fields,field_description:real_estate.field_re_property_state__write_date
@@ -825,7 +840,8 @@ msgid "Main Attachment"
 msgstr "المرفق الرئيسي"
 
 #. module: real_estate
-#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
 msgid "Maintenance"
 msgstr "الصيانة"
 
@@ -886,7 +902,8 @@ msgid "Meter Price"
 msgstr "سعر المتر"
 
 #. module: real_estate
-#: code:addons/real_estate/models/internal_property.py:0 code:addons/real_estate/models/re_unit.py:0
+#: code:addons/real_estate/models/internal_property.py:0
+#: code:addons/real_estate/models/re_unit.py:0
 #, python-format
 msgid "Meter price cannot be less than zero"
 msgstr "حقل سعر المتر لا يمكن أن يكون أقل من صفر"
@@ -939,28 +956,36 @@ msgstr "الاسم"
 
 #. module: real_estate
 #: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
 #, python-format
 msgid "Name field cannot accept numbers or special character"
 msgstr "حقل الإسم لا يقبل أرقام أو حروف خاصه مثل (@,#,$,%,^,&)"
 
 #. module: real_estate
 #: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
 #, python-format
 msgid "Name field is required (cannot accept white space)"
 msgstr "حقل الإسم لا يمكن أن يكون مساحه بيضاء "
 
 #. module: real_estate
 #: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
 #, python-format
 msgid "Name field must be literal"
 msgstr "حقل الإسم يجب أن يكون قيمه حرفيه فقط"
 
 #. module: real_estate
-#: code:addons/real_estate/models/re_unit.py:0 code:addons/real_estate/models/real_estate_configuration.py:0
-#: model:ir.model.constraint,message:real_estate.constraint_property_faces_name
-#: model:ir.model.constraint,message:real_estate.constraint_re_property_state_name
-#: model:ir.model.constraint,message:real_estate.constraint_re_unit_name
-#: model:ir.model.constraint,message:real_estate.constraint_unit_type_name
+#: code:addons/real_estate/models/re_unit.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
+#: code:addons/real_estate/models/real_estate_configuration.py:0
 #, python-format
 msgid "Name must be unique."
 msgstr "الإسم يجب أن لا يتكرر"
@@ -1040,6 +1065,7 @@ msgstr "غير مؤجر"
 #. module: real_estate
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__stamping_state_2__not_updated
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__stamping_state_3__not_updated
+#: model:ir.model.fields.selection,name:real_estate.selection__internal_property__stamping_state__not_updated
 msgid "Not Updated"
 msgstr "لم يتم التحديث"
 
@@ -1198,9 +1224,10 @@ msgid "Proceedings"
 msgstr "رقم المحضر"
 
 #. module: real_estate
-#: model:ir.actions.act_window,name:real_estate.property_action model:ir.model,name:real_estate.model_internal_property
+#: model:ir.actions.act_window,name:real_estate.property_action
+#: model:ir.model,name:real_estate.model_internal_property
 #: model:ir.model.fields,field_description:real_estate.field_floor_unit_details__property_id
-#: model:ir.model.fields,field_description:real_estate.field_property_content_details__property_id
+#: model:ir.model.fields,field_description:real_estate.field_property_content_details__unit_id
 #: model:ir.model.fields,field_description:real_estate.field_re_unit__property_id
 #: model_terms:ir.ui.view,arch_db:real_estate.unit_filter_view
 #: model_terms:ir.ui.view,arch_db:real_estate.view_property_filter
@@ -1230,7 +1257,13 @@ msgid "Property Cost"
 msgstr "تكلفة العقار"
 
 #. module: real_estate
-#: model:ir.actions.act_window,name:real_estate.property_face_action model:ir.model,name:real_estate.model_property_faces
+#: model:ir.model.fields,field_description:real_estate.field_property_content_details__attachment
+msgid "Property Docs"
+msgstr "مرفق الوحدة"
+
+#. module: real_estate
+#: model:ir.actions.act_window,name:real_estate.property_face_action
+#: model:ir.model,name:real_estate.model_property_faces
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__property_face_ids
 #: model:ir.ui.menu,name:real_estate.property_face_menu
 msgid "Property Face"
@@ -1242,7 +1275,8 @@ msgid "Property Face & Location"
 msgstr "أوجهه العقار و الموقع"
 
 #. module: real_estate
-#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
 msgid "Property Info"
 msgstr "معلومات العقار"
 
@@ -1277,7 +1311,8 @@ msgid "Property Space"
 msgstr "مساحة العقار"
 
 #. module: real_estate
-#: model:ir.actions.act_window,name:real_estate.property_state_action model:ir.model,name:real_estate.model_re_property_state
+#: model:ir.actions.act_window,name:real_estate.property_state_action
+#: model:ir.model,name:real_estate.model_re_property_state
 #: model:ir.model.fields,field_description:real_estate.field_internal_property__property_state_id
 #: model:ir.ui.menu,name:real_estate.property_state_menu
 msgid "Property State"
@@ -1290,7 +1325,8 @@ msgstr "صلاحية العقار"
 
 #. module: real_estate
 #: model:ir.actions.act_window,name:real_estate.property_type_action
-#: model:ir.model,name:real_estate.model_internal_property_type model:ir.ui.menu,name:real_estate.property_type_menu
+#: model:ir.model,name:real_estate.model_internal_property_type
+#: model:ir.ui.menu,name:real_estate.property_type_menu
 msgid "Property Type"
 msgstr "صفة العقار"
 
@@ -1329,7 +1365,6 @@ msgstr "مساحة العقار لا يمكن أن تكون أقل من صفر"
 
 #. module: real_estate
 #: code:addons/real_estate/models/real_estate_configuration.py:0
-#: model:ir.model.constraint,message:real_estate.constraint_internal_property_type_type
 #, python-format
 msgid "Property type must be unique."
 msgstr "نوع العقار يجب ان لا يتكرر"
@@ -1538,7 +1573,8 @@ msgid "Serial Number"
 msgstr "الرقم المتسلسل"
 
 #. module: real_estate
-#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
 msgid "Set To Draft"
 msgstr "إعادة إلى مبدئي"
 
@@ -1636,15 +1672,16 @@ msgid "Stamping Number New"
 msgstr "رقم الصك الجديد"
 
 #. module: real_estate
-#: model:ir.model.fields,field_description:real_estate.field_internal_property__stamping_state_2
-#: model:ir.model.fields,field_description:real_estate.field_re_unit__stamping_state_2
-msgid "Stamping State 2"
+#: model:ir.model.fields,field_description:real_estate.field_internal_property__stamping_state
+#: model:ir.model.fields,field_description:real_estate.field_re_unit__stamping_state
+#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
+msgid "Stamping State"
 msgstr "حالة الصك"
 
 #. module: real_estate
-#: model:ir.model.fields,field_description:real_estate.field_internal_property__stamping_state
-#: model:ir.model.fields,field_description:real_estate.field_re_unit__stamping_state
-msgid "Stamping State"
+#: model:ir.model.fields,field_description:real_estate.field_internal_property__stamping_state_2
+#: model:ir.model.fields,field_description:real_estate.field_re_unit__stamping_state_2
+msgid "Stamping State 2"
 msgstr "حالة الصك"
 
 #. module: real_estate
@@ -1704,7 +1741,9 @@ msgstr "الصك الثالث"
 
 #. module: real_estate
 #: model:ir.model.fields,help:real_estate.field_internal_property__logo
-msgid "This field holds the image used as photo for the Property, limited to 1024x1024px."
+msgid ""
+"This field holds the image used as photo for the Property, limited to "
+"1024x1024px."
 msgstr ""
 
 #. module: real_estate
@@ -1755,7 +1794,8 @@ msgid "Type of the exception activity on record."
 msgstr "نوع النشاط الاستثنائي المسجل."
 
 #. module: real_estate
-#: model:ir.actions.act_window,name:real_estate.unit_action model_terms:ir.ui.view,arch_db:real_estate.unit_filter_view
+#: model:ir.actions.act_window,name:real_estate.unit_action
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_filter_view
 msgid "Unit"
 msgstr "الوحدة"
 
@@ -1780,7 +1820,8 @@ msgid "Unit External Space"
 msgstr "مساحة الوحدة الخارجية"
 
 #. module: real_estate
-#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
+#: model_terms:ir.ui.view,arch_db:real_estate.unit_form_view
 msgid "Unit Info"
 msgstr "معلومات الوحدة"
 
@@ -1805,7 +1846,8 @@ msgid "Unit Total Space"
 msgstr "مساحة الوحدة الإجمالية"
 
 #. module: real_estate
-#: model:ir.actions.act_window,name:real_estate.unit_type_action model:ir.model,name:real_estate.model_unit_type
+#: model:ir.actions.act_window,name:real_estate.unit_type_action
+#: model:ir.model,name:real_estate.model_unit_type
 #: model:ir.model.fields,field_description:real_estate.field_re_unit__unit_type_id
 #: model:ir.ui.menu,name:real_estate.unit_type_menu
 msgid "Unit Type"
@@ -1833,7 +1875,8 @@ msgid "Unit's Space"
 msgstr "مساحة الوحدة"
 
 #. module: real_estate
-#: code:addons/real_estate/models/internal_property.py:0 model:ir.ui.menu,name:real_estate.unit_info_menu
+#: code:addons/real_estate/models/internal_property.py:0
+#: model:ir.ui.menu,name:real_estate.unit_info_menu
 #: model_terms:ir.ui.view,arch_db:real_estate.property_form_view
 #, python-format
 msgid "Units"
@@ -1868,6 +1911,7 @@ msgstr "عدد الرسائل الجديدة"
 #. module: real_estate
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__stamping_state_2__updated
 #: model:ir.model.fields.selection,name:real_estate.selection__internal_property__stamping_state_3__updated
+#: model:ir.model.fields.selection,name:real_estate.selection__internal_property__stamping_state__updated
 msgid "Updated"
 msgstr "تم التحديث"
 
@@ -1976,8 +2020,11 @@ msgstr "لا يمكنك حذف عقار مؤكد"
 #. module: real_estate
 #: code:addons/real_estate/models/internal_property.py:0
 #, python-format
-msgid "You cannot delete this property because he have a unit with the following state %s unit code %s"
-msgstr "لا يمكنك حذف العقار و ذللك لأن الوحده/الوحدات بالرمز الإتي %s في الحاله %s"
+msgid ""
+"You cannot delete this property because he have a unit with the following "
+"state %s unit code %s"
+msgstr ""
+"لا يمكنك حذف العقار و ذللك لأن الوحده/الوحدات بالرمز الإتي %s في الحاله %s"
 
 #. module: real_estate
 #: model_terms:ir.ui.view,arch_db:real_estate.role_view_tree
diff --git a/odex25_realstate/real_estate/models/re_unit.py b/odex25_realstate/real_estate/models/re_unit.py
index 26b81a52e..a91e69bf8 100644
--- a/odex25_realstate/real_estate/models/re_unit.py
+++ b/odex25_realstate/real_estate/models/re_unit.py
@@ -28,6 +28,7 @@ class Unit(models.Model):
         ('residential', 'Residential'),
         ('commercial', 'Commercial'),
         ('lands', 'Lands')], string="Unit Category")
+    tax_id = fields.Many2one(comodel_name='account.tax', string='Tax',domain=[('type_tax_use', '=', 'sale')],)
     attach_nbr = fields.Integer(compute='get_attachments')
     content_ids = fields.One2many(comodel_name='property.content.details', inverse_name='unit_id', string='')
     active = fields.Boolean(default=True)
@@ -106,6 +107,9 @@ class Unit(models.Model):
     # Smart button to count related maintenance records
     maintenance_count = fields.Integer(string="Maintenance Count", compute='_compute_maintenance_count')
 
+
+
+
     def get_attachments(self):
         action = self.env['ir.actions.act_window']._for_xml_id('base.action_attachment')
         action['domain'] = str([('res_model', '=', 're.unit'), ('res_id', 'in', self.ids)])
diff --git a/odex25_realstate/real_estate/models/real_estate_configuration.py b/odex25_realstate/real_estate/models/real_estate_configuration.py
index 7343ffd14..557255ca4 100644
--- a/odex25_realstate/real_estate/models/real_estate_configuration.py
+++ b/odex25_realstate/real_estate/models/real_estate_configuration.py
@@ -45,6 +45,7 @@ class PropertyType(models.Model):
     is_land = fields.Boolean(string="Land")
     company_id = fields.Many2one('res.company', string='Company',
                                  default=lambda self: self.env.user.company_id)
+    is_waqf = fields.Boolean('Is Waqf')
 
     _sql_constraints = [
         ('type', 'unique(name)', _('Property type must be unique.')),
diff --git a/odex25_realstate/real_estate/views/re_unit_view.xml b/odex25_realstate/real_estate/views/re_unit_view.xml
index b207dac44..7095b318b 100644
--- a/odex25_realstate/real_estate/views/re_unit_view.xml
+++ b/odex25_realstate/real_estate/views/re_unit_view.xml
@@ -48,6 +48,7 @@
                             <field name="unit_type_id" required="1"
                                    attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
                             <field name="unit_category"/>
+                            <field name="tax_id"/>
                             <field name="action_type" required="1"/>
                             <field name="company_id" groups="base.group_multi_company"
                                    attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
@@ -271,14 +272,13 @@
             <field name="binding_view_types">list</field>
             <field name="state">code</field>
             <field name="code">
-      for record in records:
+                for record in records:
                 record.copy({'name': record.name + ' (Copy)'})
 
             </field>
         </record>
 
 
-
         <record id="unit_filter_view" model="ir.ui.view">
             <field name="name">Unit Filter</field>
             <field name="model">re.unit</field>
diff --git a/odex25_realstate/real_estate/views/real_estate_conf_views.xml b/odex25_realstate/real_estate/views/real_estate_conf_views.xml
index b4e5287c5..0f595766b 100644
--- a/odex25_realstate/real_estate/views/real_estate_conf_views.xml
+++ b/odex25_realstate/real_estate/views/real_estate_conf_views.xml
@@ -63,9 +63,10 @@
                             </button>
 
                         </div>
-                        <group col="4" colspan="2">
+                        <group col="6" colspan="2">
                             <field name="market_type" invisible="1" required="0"/>
                             <field name="name" required="1"/>
+                            <field name="is_waqf" required="1"/>
                             <field name="is_land" invisible="1"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>