Merge pull request #5813 from expsa/fin

Fin

odex25_benefit/odex_benefit/i18n/ar_001.po

@@ -1145,6 +1145,11 @@ msgstr "نموذج الأنشطة"
 msgid "Active"
 msgstr "نشط"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__state__active
+msgid "Active"
+msgstr "ساري"
+
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_benefits_representative__active_lang_count
 #: model:ir.model.fields,field_description:odex_benefit.field_external_benefits__active_lang_count
@@ -3254,6 +3259,7 @@ msgstr "طريقة التواصل الافتراضية"
 
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__contract_num
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__name
 msgid "Contract Number"
 msgstr "رقم عقد الإيجار"
 
@@ -4588,6 +4594,7 @@ msgstr ""
 #: model:ir.model.fields.selection,name:odex_benefit.selection__receive_food_basket__state__draft
 #: model:ir.model.fields.selection,name:odex_benefit.selection__receive_food_surplus__state__draft
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__draft
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__draft
 #: model:ir.model.fields.selection,name:odex_benefit.selection__visit_location__state__draft
 #: model:ir.model.fields.selection,name:odex_benefit.selection__benefit_expense_line__state__draft
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
@@ -5076,6 +5083,7 @@ msgstr "تاريخ انتهاء صلاحية الملف"
 #: model:ir.model.fields.selection,name:odex_benefit.selection__member_disabilities__attach_status__expired
 #: model:ir.model.fields.selection,name:odex_benefit.selection__member_diseases__attach_status__expired
 #: model:ir.model.fields.selection,name:odex_benefit.selection__member_hobbies__attach_status__expired
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__state__expired
 msgid "Expired"
 msgstr "منتهي"
 
@@ -5147,6 +5155,8 @@ msgstr "الاسر المستفيدة"
 #: model:ir.model.fields.selection,name:odex_benefit.selection__visit_location__benefit_type__family
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_confirm_benefit_expense_form
 #: model:ir.model.fields.selection,name:odex_benefit.selection__suspend_reason__entity_type__family
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__family_id
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__landlord_type__family
 msgid "Family"
 msgstr "الأسرة"
 
@@ -5791,6 +5801,7 @@ msgstr ""
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__payment_type__2
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__payment_type__2
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__payment_type__2
 msgid "Half-yearly"
 msgstr "نصف سنوي"
@@ -8157,6 +8168,7 @@ msgstr "رقم الجوال"
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__benefit_club__programs_type__monthly
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__payment_type__5
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__payment_type__5
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__payment_type__5
 #: model:ir.model.fields.selection,name:odex_benefit.selection__sport_line__Subtype__monthly
 msgid "Monthly"
@@ -8411,6 +8423,7 @@ msgstr "نهاية الوقت المعين للنشاط"
 #: model:ir.model.fields,field_description:odex_benefit.field_education_exam_type__name
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_property_type_settings_form
 #: model:ir.model.fields,field_description:odex_benefit.field_education_period__name
+#: model_terms:ir.ui.view,arch_db:odex_benefit.view_rent_contract_form
 msgid "Name"
 msgstr "الاسم"
 
@@ -9132,6 +9145,7 @@ msgstr "رموز السداد السرية"
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_benefit_loans__payment_method_id
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__payment_type
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__payment_type
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__payment_type
 msgid "Payment Type"
 msgstr "نوع السداد"
@@ -9487,6 +9501,7 @@ msgstr "الكمية في اليد"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__payment_type__4
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__payment_type__4
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__payment_type__4
 msgid "Quarterly"
 msgstr "ربع سنوي"
@@ -9724,6 +9739,7 @@ msgstr "سبب الرفض"
 #: model:ir.model.fields.selection,name:odex_benefit.selection__receive_food_surplus__state__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__salary_line__state__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__refused
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__refused
 #: model_terms:ir.ui.view,arch_db:odex_benefit.benefit_food_basket_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.benefit_food_surplus_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
@@ -9820,6 +9836,7 @@ msgstr "إيجار"
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_benefit_housing__rent_amount
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_amount
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__rent_amount
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_amount
 msgid "Rent Amount"
 msgstr "قيمة الإيجار"
@@ -10079,6 +10096,7 @@ msgstr "اخصائي اجتماعي"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__researcher
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__researcher
 msgid "Researcher"
 msgstr "بانتظار الأخصائي"
 
@@ -10787,6 +10805,11 @@ msgstr "المناطق"
 msgid "Status"
 msgstr "الحالة"
 
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__state
+msgid "Status"
+msgstr "حالة العقد"
+
 #. module: odex_benefit
 #: model:ir.model.fields,help:odex_benefit.field_appliances_furniture__activity_state
 #: model:ir.model.fields,help:odex_benefit.field_appliances_furniture_need__activity_state
@@ -12304,6 +12327,7 @@ msgstr "سنة"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__payment_type__1
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__payment_type__1
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__payment_type__1
 msgid "Yearly"
 msgstr "سنوي"
@@ -13643,6 +13667,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:odex_benefit.field_receive_food_basket__state
 #: model:ir.model.fields,field_description:odex_benefit.field_receive_food_surplus__state
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__state
+#: model:ir.model.fields,field_description:odex_benefit.field_service_attachments_settings__state
 msgid "state"
 msgstr "الحالة"
 
@@ -14277,6 +14302,7 @@ msgstr "إعتماد إدارة المالية"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__confirm_benefit_expense__state__accounting_approve
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__accounting_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__accounting_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__seasonal_service__state__accounting_approve
 msgid "Accounting Approve"
@@ -14284,15 +14310,18 @@ msgstr "بانتظار المالية"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__approval_of_beneficiary_services
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__approval_of_beneficiary_services
 msgid "Approval of beneficiary services"
 msgstr "بانتظار التعميد للمورد"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__send_request_to_supplier
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__send_request_to_supplier
 msgid "Send Request To Supplier"
 msgstr "بانتظار استلام"
 
 #. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__family_received_device
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__family_received_device
 msgid "Family Received Device"
 msgstr "تم"
@@ -14771,6 +14800,7 @@ msgstr "بانتظار الاخصائي"
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__waiting_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state__waiting_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state_a__waiting_approve
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__waiting_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__waiting_approve
 #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_search
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
@@ -14782,6 +14812,7 @@ msgstr "بانتظار رئيسة العمليات"
 #: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state_a__exception_first_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__exception_first_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__first_approve
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__first_approve
 #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_search
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
 msgid "Waiting for Branch Manager"
@@ -15906,6 +15937,7 @@ msgstr "بإنتظار مساعد المدير العام"
 #: model:ir.model.fields,field_description:odex_benefit.field_family_bank_report_wizard__start_date
 #: model:ir.model.fields,field_description:odex_benefit.field_ir_attachment__start_date
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__start
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__start_date
 msgid "Start Date"
 msgstr "تاريخ البداية"
 
@@ -15914,6 +15946,7 @@ msgstr "تاريخ البداية"
 #: model:ir.model.fields,field_description:odex_benefit.field_confirm_benefit_expense__end_date
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__end
 #: model:ir.model.fields,field_description:odex_benefit.field_family_bank_report_wizard__end_date
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__end_date
 msgid "End Date"
 msgstr "تاريخ النهاية"
 
@@ -16347,12 +16380,14 @@ msgstr "المبلغ التقديري لدفع الإيجار"
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__gm_assistant
 #: model:ir.model.fields.selection,name:odex_benefit.selection__seasonal_service__state__gm_assistant
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__gm_assistant
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
 msgid "Waiting Assistant General Manager"
 msgstr "بانتظار مساعد المدير العام"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__family_services_manager
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__family_services_manager
 msgid "Waiting Family Services Manager"
 msgstr "بانتظار مديرة الخدمات الأسرية"
 
@@ -16365,10 +16400,12 @@ msgstr "بانتظار مديرة خدمات المستفيدين"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__legal_department
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__legal_department
 msgid "Waiting Legal Department"
 msgstr "بانتظار إدارة القانونية"
 
 #. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__projects_department
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__projects_department
 msgid "Waiting Projects Department"
 msgstr "بانتظار إدارة المشاريع"
@@ -16876,14 +16913,6 @@ msgstr "موافقة المسؤول"
 msgid "Payment Waiting"
 msgstr "في انتظار الدفع"
 
-#. module: odex_benefit
-#: code:addons/odex_benefit/models/service_request.py:0
-#, python-format
-msgid ""
-"Some attachment records are missing files. Please make sure all required "
-"attachments are uploaded before submitting."
-msgstr "بعض سجلات المرفقات تفتقد إلى ملفات. يرجى التأكد من تحميل جميع المرفقات المطلوبة قبل الإرسال."
-
 #. module: odex_benefit
 #: model:ir.actions.server,name:odex_benefit.server_action_accounting_transfer
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_confirm_benefit_expense_form
@@ -17032,6 +17061,7 @@ msgstr "فئة الأسرة بالنظام القديم"
 
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__waiting_family
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__waiting_family
 msgid "Waiting Family"
 msgstr "انتظار الأسرة"
 
@@ -17236,6 +17266,7 @@ msgid "Line Model"
 msgstr "النموذج"
 
 #. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_attachments_settings__state__return_to_bank
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__return_to_bank
 msgid "Return to Bank"
 msgstr "رجيع البنك"
@@ -17994,4 +18025,90 @@ msgstr ""
 "لا يمكن الإرسال إلى الأخصائي!\n"
 "\n"
 "العنصر '%(item)s': التكلفة (%(cost).2f) تتجاوز الحد الأقصى (%(max).2f).\n"
-"→ إرفاق التسعيرة الثانية إلزامي."
+"→ إرفاق التسعيرة الثانية إلزامي."
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_contract_ids
+#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
+msgid "Rent Contracts"
+msgstr "عقود الإيجار"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_contract_count
+msgid "Number of Rent Contracts"
+msgstr "عدد عقود الإيجار"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__current_rent_contract_id
+msgid "Current Active Rent Contract"
+msgstr "عقد الإيجار الحالي"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit.py:0
+#, python-format
+msgid "Rent Contracts - Full Details"
+msgstr "عقود الإيجار"
+
+#. module: odex_benefit
+#: model:ir.model,name:odex_benefit.model_rent_contract
+msgid "Rent Contract"
+msgstr "عقد الإيجار"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__member_id
+msgid "Member (Tenant)"
+msgstr "الفرد (المستأجر)"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__contract_type__fixed
+msgid "Fixed Term"
+msgstr "محدد المدة"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__contract_type__unlimited
+msgid "Indefinite"
+msgstr "غير محدد المدة"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__contract_type
+msgid "Contract Type"
+msgstr "فترة العقد"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__contract_attachment
+msgid "Contract Attachment"
+msgstr "مرفق عقد الإيجار"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__electricity_bill_attachment
+msgid "Electricity Bill Attachment"
+msgstr "مرفق فاتورة الكهرباء"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__rent_contract__landlord_type__member
+msgid "Member / Student"
+msgstr "فرد / طالب"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__landlord_type
+msgid "Landlord Type"
+msgstr "المؤجر"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit_config.py:0
+#, python-format
+msgid "End Date cannot be before Start Date."
+msgstr "لا يمكن أن يكون تاريخ الانتهاء قبل تاريخ البدء."
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid ""
+"Cannot proceed with approval. The following required documents for status "
+"'%(status)s' are missing: %(missing)s"
+msgstr "لا يمكن المتابعة. المستندات المطلوبة التالية للحالة '%(status)s' مفقودة: %(missing)s"
+
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
+msgid "View All Rent Contracts"
+msgstr "عرض جميع عقود الإيجار"

odex25_benefit/odex_benefit/models/benefit.py

@@ -116,7 +116,7 @@ class GrantBenefitProfile(models.Model):
     house_number = fields.Char(string='house number')
     floor = fields.Char(string='floor')
     housing_number = fields.Char(string='housing number')
-    rent_amount = fields.Float(string='Rent Amount')
+    rent_amount = fields.Float(string='Rent Amount',compute='_compute_rent_from_contract',store=True)
     estimated_rent_amount = fields.Float(string="Estimated Rent Amount", compute="_compute_estimated_rent_amount",store=True)
     housing_type = fields.Selection([
         ('apartment', 'apartment'),
@@ -126,7 +126,7 @@ class GrantBenefitProfile(models.Model):
         ('Appendix', 'Appendix'), ], default='apartment',tracking=True)
     property_instrument_number = fields.Char(string='Property Instrument number')
     property_instrument_attach = fields.Many2many('ir.attachment','rel_property_instrument_attach_attachment','benefit_id','attachment_id',string='Property Instrument Attach')
-    electricity_attach = fields.Many2many('ir.attachment','rel_electricity_attach_attachment','benefit_id','attachment_id',string='Electricity Attach')
+    electricity_attach = fields.Many2many('ir.attachment','rel_electricity_attach_attachment','benefit_id','attachment_id',string='Electricity Attach',compute='_compute_rent_from_contract',store=True,)
     property_instrument_date = fields.Date(string='Property Instrument Date')
     location_url = fields.Char(string='Location URL')
     location = fields.Char(string='location')
@@ -452,10 +452,10 @@ class GrantBenefitProfile(models.Model):
     nearby_mosque = fields.Char(string='Nearby mosque')
     housing_note = fields.Char(string='housing note')
     note_neighborhood = fields.Char()
-    contract_num = fields.Char(string="Contract Number")
+    contract_num = fields.Char(string="Contract Number",compute='_compute_rent_from_contract',store=True)
-    rent_start_date = fields.Date(string='Rent Start Date')
+    rent_start_date = fields.Date(string='Rent Start Date',compute='_compute_rent_from_contract',store=True)
-    rent_end_date = fields.Date(string='Rent End Date')
+    rent_end_date = fields.Date(string='Rent End Date',compute='_compute_rent_from_contract',store=True)
-    rent_attachment = fields.Many2many('ir.attachment','rel_rent_attachment_attachment','benefit_id','attachment_id',string='Rent Attachment')
+    rent_attachment = fields.Many2many('ir.attachment','rel_rent_attachment_attachment','benefit_id','attachment_id',string='Rent Attachment',compute='_compute_rent_from_contract',store=True,)
     national_address_attachment = fields.Many2many('ir.attachment','rel_national_address_attachment','benefit_id','attachment_id',string='National Address Attachment')
     payment_type = fields.Selection(
         [
@@ -464,7 +464,8 @@ class GrantBenefitProfile(models.Model):
             ('4', 'Quarterly'),
             ('5', 'Monthly')
         ],
-        string='Payment Type'
+        string='Payment Type',
+        compute='_compute_rent_from_contract',store=True,
     )
     housing_cat = fields.Selection([
         ('excellent', 'Excellent'),
@@ -636,13 +637,74 @@ class GrantBenefitProfile(models.Model):
     resume_reason_id = fields.Many2one('suspend.reason', string='Return Reason')
     resume_date = fields.Date(string="Return Date")
     resume_notes = fields.Text(string="Return Notes")
-
+    rent_contract_ids = fields.One2many('rent.contract', 'family_id',string='Rent Contracts')
-
+    rent_contract_count = fields.Integer(
+        string="Number of Rent Contracts",
+        compute='_compute_rent_contract_count',
+        store=True
+    )
+    current_rent_contract_id = fields.Many2one('rent.contract',string='Current Active Rent Contract',compute='_compute_current_rent_contract',store=True,)
 
     _sql_constraints = [
         ('unique_code', "unique (code) WHERE state NOT IN ('draft', 'new')", 'This code already exists')
     ]
 
+    @api.depends('rent_contract_ids')
+    def _compute_rent_contract_count(self):
+        for record in self:
+            record.rent_contract_count = len(record.rent_contract_ids)
+
+    def action_view_all_rent_contracts(self):
+        self.ensure_one()
+        ctx = self.env.context.copy()
+        ctx.update({
+            'default_family_id': self.id,
+            'default_landlord_type': 'family'
+        })
+        return {
+            'name': _('Rent Contracts - Full Details'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'rent.contract',
+            'view_mode': 'tree,form',
+            'domain': [('family_id', '=', self.id)],
+            'context': ctx,
+            'target': 'current',
+        }
+
+    @api.depends('rent_contract_ids', 'rent_contract_ids.state', 'rent_contract_ids.start_date')
+    def _compute_current_rent_contract(self):
+        for family in self:
+            if not family.rent_contract_ids:
+                family.current_rent_contract_id = False
+                continue
+            active_contracts = family.rent_contract_ids.filtered(
+                lambda c: c.state == 'active' and c.landlord_type == 'family'
+            ).sorted('start_date', reverse=True)
+
+            family.current_rent_contract_id = active_contracts[:1] or False
+
+    @api.depends('current_rent_contract_id')
+    def _compute_rent_from_contract(self):
+        for family in self:
+            contract = family.current_rent_contract_id
+            if contract:
+                family.contract_num = contract.name
+                family.rent_start_date = contract.start_date
+                family.rent_end_date = contract.end_date
+                family.rent_amount = contract.rent_amount
+                family.payment_type = contract.payment_type
+                family.rent_attachment = [(6, 0, contract.contract_attachment.ids)]
+                #family.electricity_attach = [(6, 0, contract.electricity_bill_attachment.ids)]
+            else:
+                family.contract_num = False
+                family.rent_start_date = False
+                family.rent_end_date = False
+                family.rent_amount = 0.0
+                family.payment_type = False
+                family.rent_attachment = [(5, 0, 0)]
+                #family.electricity_attach = [(5, 0, 0)]
+
+
     @api.depends('mother_income', 'is_mother_work','mother_expenses_ids','mother_debits_ids')
     def _compute_mother_net_income(self):
         for rec in self:

odex25_benefit/odex_benefit/models/benefit_config.py

@@ -927,6 +927,23 @@ class ServiceAttachmentsSettings(models.Model):
     service_request_id = fields.Many2one('service.request',string='Service Request')
     previous_service_attachment_settings_id = fields.Many2one('service.attachments.settings', readonly=True)
     notes = fields.Text(string='Notes')
+    state = fields.Selection(selection=[
+        ('draft', 'Draft'),
+        ('waiting_family', 'Waiting Family'),
+        ('researcher', 'Researcher'),
+        ('waiting_approve', 'Waiting for Operation Manager'),
+        ('first_approve', 'Waiting for Branch Manager'),
+        ('family_services_manager', 'Waiting Family Services Manager'),
+        ('legal_department', 'Waiting Legal Department'),
+        ('projects_department', 'Waiting Projects Department'),
+        ('gm_assistant', 'Waiting Assistant General Manager'),
+        ('accounting_approve', 'Accounting Approve'),
+        ('return_to_bank', 'Return to Bank'),
+        ('approval_of_beneficiary_services', 'Approval of beneficiary services'),
+        ('send_request_to_supplier', 'Send Request To Supplier'),
+        ('family_received_device', 'Family Received Device'),
+        ('refused', 'Refused')
+    ], string='State', default='waiting_family')
 
 class HomeMaintenanceItems(models.Model):
     _name = 'home.maintenance.items'
@@ -962,3 +979,67 @@ class PropertyTypeSettings(models.Model):
         string="Unavailable Services",
         help="Services that are not available for families or members with this property type"
     )
+
+class RentContract(models.Model):
+    _name = 'rent.contract'
+    _description = 'Rent Contract'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _order = 'create_date desc, id desc'
+
+    name = fields.Char(string='Contract Number',required=True,copy=False,tracking=True)
+    family_id = fields.Many2one('grant.benefit',string='Family',required=True,ondelete='cascade')
+    member_id = fields.Many2one('family.member',string='Member (Tenant)',
+        domain="""[
+            ('benefit_id', '=', family_id),
+            ('education_status', '=', 'educated'),
+            ('member_education_status_ids', '!=', False),
+            ('member_education_status_ids.case_study', '=', 'continuous')
+        ]"""
+    )
+    contract_type = fields.Selection([
+        ('fixed', 'Fixed Term'),
+        ('unlimited', 'Indefinite'),
+    ], string='Contract Type', required=True, default='fixed', tracking=True)
+    start_date = fields.Date(string='Start Date', required=True)
+    end_date = fields.Date(string='End Date')
+    payment_type = fields.Selection([
+        ('1', 'Yearly'),
+        ('2', 'Half-yearly'),
+        ('4', 'Quarterly'),
+        ('5', 'Monthly'),
+    ], string='Payment Type', required=True)
+    rent_amount = fields.Float(string='Rent Amount', required=True)
+    contract_attachment = fields.Many2many(
+        'ir.attachment', 'rent_contract_attachment_rel',
+        'contract_id', 'attachment_id',
+        string='Contract Attachment'
+    )
+    electricity_bill_attachment = fields.Many2many(
+        'ir.attachment', 'rent_electricity_bill_rel',
+        'contract_id', 'attachment_id',
+        string='Electricity Bill Attachment'
+    )
+    state = fields.Selection([
+        ('active', 'Active'),
+        ('expired', 'Expired'),
+    ], string='Status', default='active', tracking=True)
+    landlord_type = fields.Selection([
+        ('family', 'Family'),
+        ('member', 'Member / Student'),
+    ], string='Landlord Type', default='family', required=True)
+
+    @api.onchange('end_date', 'start_date')
+    def _onchange_contract_dates(self):
+        if self.end_date and self.start_date and self.end_date < self.start_date:
+            raise ValidationError(_("End Date cannot be before Start Date."))
+
+    @api.onchange('landlord_type')
+    def _onchange_landlord_type(self):
+        for rec in self:
+            if rec.landlord_type == 'family':
+                rec.member_id = False
+
+    @api.onchange('contract_type')
+    def _onchange_contract_type(self):
+        if self.contract_type == 'unlimited':
+            self.end_date = False

odex25_benefit/odex_benefit/models/service_request.py

@@ -51,7 +51,7 @@ class ServiceRequest(models.Model):
         ('none', 'None'),
         ('payment_order', 'Payment Order'),
         ('invoice', 'Invoice'),
-    ], string='Payment Method', default="payment_order")
+    ], string='Payment Method', related='service_cat.payment_method', store=True, default="payment_order")
     # is_alternative_housing = fields.Boolean(string='Is Alternative Housing?')
     rent_contract_number = fields.Char(string="Rent Contract Number", compute='_compute_rent_details', store=True)
     rent_start_date = fields.Date(string='Rent Start Date', compute='_compute_rent_details', store=True)
@@ -214,6 +214,19 @@ class ServiceRequest(models.Model):
     def action_create_project(self):
         pass
 
+    def _check_required_attachments(self):
+        self.ensure_one()
+        current_state = self.state
+        required_docs = self.attachment_lines.filtered(lambda l: l.state == current_state)
+        missing_docs = required_docs.filtered(lambda l: not l.service_attach)
+        if missing_docs:
+            missing_names = ", ".join(missing_docs.mapped('name'))
+            raise UserError(
+                _("Cannot proceed with approval. The following required documents for status '%(status)s' are missing: %(missing)s") % {
+                    'status': dict(self._fields['state'].selection).get(current_state, current_state),
+                    'missing': missing_names
+                })
+
     @api.depends('service_cat', 'family_id', 'member_id', 'benefit_type')
     def _compute_related_information_html(self):
         for rec in self:
@@ -457,6 +470,7 @@ class ServiceRequest(models.Model):
                         'name': attachment_line.name,
                         'notes': attachment_line.notes,
                         'previous_service_attachment_settings_id': attachment_line.id,
+                        'state': attachment_line.state,
                     }))
 
             rec.attachment_lines = commands
@@ -474,22 +488,33 @@ class ServiceRequest(models.Model):
                 raise UserError(_('You cannot delete this record'))
         return super(ServiceRequest, self).unlink()
 
-    @api.depends('family_id')
+    @api.depends('family_id','member_id','benefit_type')
     def _compute_rent_details(self):
         for rec in self:
-            if rec.family_id:
+            contract = False
-                if not rec.rent_contract_number:
+
-                    rec.rent_contract_number = rec.family_id.contract_num
+            if rec.benefit_type == 'family' and rec.family_id:
-                if not rec.rent_start_date:
+                contract = rec.family_id.current_rent_contract_id
-                    rec.rent_start_date = rec.family_id.rent_start_date
+            elif rec.benefit_type == 'member' and rec.member_id:
-                if not rec.rent_end_date:
+                member_contracts = rec.family_id.rent_contract_ids.filtered(
-                    rec.rent_end_date = rec.family_id.rent_end_date
+                    lambda c: c.state == 'active' and c.member_id == rec.member_id and c.landlord_type == 'member'
-                if not rec.rent_amount:
+                ).sorted('start_date', reverse=True)
-                    rec.rent_amount = rec.family_id.rent_amount
+                contract = member_contracts[:1] or False
-                if not rec.payment_type:
+
-                    rec.payment_type = rec.family_id.payment_type
+            if contract:
-                if not rec.rent_attachment:
+                rec.rent_contract_number = contract.name
-                    rec.rent_attachment = rec.family_id.rent_attachment
+                rec.rent_start_date = contract.start_date
+                rec.rent_end_date = contract.end_date
+                rec.rent_amount = contract.rent_amount
+                rec.payment_type = contract.payment_type
+                rec.rent_attachment = [(6, 0, contract.contract_attachment.ids)]
+            else:
+                rec.rent_contract_number = False
+                rec.rent_start_date = False
+                rec.rent_end_date = False
+                rec.rent_amount = 0.0
+                rec.payment_type = False
+                rec.rent_attachment = [(5, 0, 0)]
 
     def _get_added_amount_if_mother_dead(self):
         for rec in self:
@@ -555,6 +580,7 @@ class ServiceRequest(models.Model):
 
     def action_send_to_researcher(self):
         for rec in self:
+            rec._check_required_attachments()
             if rec.service_cat and rec.service_cat.service_type == 'home_furnishing':
                 for item in rec.furnishing_items_ids:
                     max_amount = item.home_furnishing_items.max_furnishing_amount or 0.0
@@ -595,21 +621,17 @@ class ServiceRequest(models.Model):
             if not rec.requested_service_amount or rec.requested_service_amount <= 0:
                 raise UserError(_("Please enter a valid service amount."))
 
-            if rec.attachment_lines:
+            rec._check_required_attachments()
-                for attach_line in rec.attachment_lines:
-                    if not attach_line.service_attach:
-                        raise UserError(_(
-                            "Some attachment records are missing files. Please make sure all required attachments are uploaded before submitting."
-                        ))
-
             rec.state = 'waiting_approve'
 
     def action_operations_chief_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             rec.state = 'first_approve'
 
     def action_branch_manager_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             if rec.service_cat.needs_services_head_approval or rec.exception:
                 rec.state = 'family_services_manager'
             else:
@@ -617,6 +639,7 @@ class ServiceRequest(models.Model):
 
     def action_family_services_manager_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             if rec.service_cat.needs_legal_approval:
                 rec.state = 'legal_department'
             elif rec.service_cat.needs_project_management_approval:
@@ -629,6 +652,7 @@ class ServiceRequest(models.Model):
 
     def action_legal_department_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             if rec.service_cat.needs_project_management_approval:
                 rec.action_create_project()
                 rec.state = 'projects_department'
@@ -637,6 +661,7 @@ class ServiceRequest(models.Model):
 
     def action_projects_department_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             if rec.service_cat.needs_beneficiary_manager_approval or rec.exception:
                 rec.state = 'gm_assistant'
             else:
@@ -644,10 +669,12 @@ class ServiceRequest(models.Model):
 
     def action_beneficiary_manager_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             rec.state = 'accounting_approve'
 
     def action_accounting_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             if rec.service_type == 'electrical_devices':
                 rec.state = 'approval_of_beneficiary_services'
             else:
@@ -656,6 +683,7 @@ class ServiceRequest(models.Model):
 
     def action_supplier_approve(self):
         for rec in self:
+            rec._check_required_attachments()
             rec.service_approval_date = fields.Datetime.now()
             rec.state = 'send_request_to_supplier'
 
@@ -725,11 +753,11 @@ class ServiceRequest(models.Model):
             if rec.service_cat:
                 rec.benefit_type = rec.service_cat.benefit_type
                 rec.service_producer_id = rec.service_cat.service_producer_id
-                rec.payment_method = rec.service_cat.payment_method
+                # rec.payment_method = rec.service_cat.payment_method
             else:
                 rec.benefit_type = False
                 rec.service_producer_id = False
-                rec.payment_method = 'payment_order'
+                # rec.payment_method = 'payment_order'
 
             if not rec.family_id:
                 rec.member_id = False
@@ -738,7 +766,7 @@ class ServiceRequest(models.Model):
 
     @api.onchange('service_cat', 'family_id')
     def _onchange_service_cat(self):
-        if self.service_cat.service_type == 'rent' and self.family_id.property_type_code == 'rent' and self.benefit_type == 'family':
+        if self.service_cat.service_type == 'rent' and self.family_id.property_type_code != 'rent' and self.benefit_type == 'family':
             raise UserError(_("You cannot benefit from this service (property type not rent)"))
 
     @api.onchange('start', 'end', 'rent_start_date', 'rent_end_date', 'payment_type')

odex25_benefit/odex_benefit/security/ir.model.access.csv

@@ -172,4 +172,5 @@ access_expense_researcher,access_expense_researcher,model_benefit_expense_line,o
 access_family_bank_report_wizard,access_family_bank_report_wizard,model_family_bank_report_wizard,base.group_user,1,1,1,1
 access_return_reason,access_return_reason,model_return_reason,base.group_user,1,1,1,1
 access_return_reason_wizard,access_return_reason_wizard,model_return_reason_wizard,base.group_user,1,1,1,1
-access_property_type_settings,access_property_type_settings,model_property_type_settings,base.group_user,1,1,1,1
+access_property_type_settings,access_property_type_settings,model_property_type_settings,base.group_user,1,1,1,1
+access_rent_contract,access_rent_contract,model_rent_contract,base.group_user,1,1,1,1

odex25_benefit/odex_benefit/views/benefit_config_view.xml

@@ -1500,5 +1500,55 @@
                 </form>
             </field>
         </record>
+        <record id="view_rent_contract_tree" model="ir.ui.view">
+            <field name="name">rent.contract.tree</field>
+            <field name="model">rent.contract</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="name"/>
+                    <field name="landlord_type"/>
+                    <field name="family_id"/>
+                    <field name="member_id"/>
+                    <field name="contract_type"/>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="payment_type"/>
+                    <field name="rent_amount"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_rent_contract_form" model="ir.ui.view">
+            <field name="name">rent.contract.form</field>
+            <field name="model">rent.contract</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field placeholder="Name" name="name" class="oe_inline"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="landlord_type"/>
+                                <field name="family_id"/>
+                                <field name="member_id" attrs="{'invisible': [('landlord_type', '!=', 'member')]}"/>
+                                <field name="contract_type"/>
+                                <field name="start_date"/>
+                                <field name="end_date" attrs="{'required': [('contract_type', '=', 'fixed')]}"/>
+                            </group>
+                            <group>
+                                <field name="state"/>
+                                <field name="payment_type"/>
+                                <field name="rent_amount"/>
+                                <field name="contract_attachment" widget="many2many_attachment_preview"/>
+                                <field name="electricity_bill_attachment" widget="many2many_attachment_preview"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
     </data>
 </odoo>

odex25_benefit/odex_benefit/views/benefit_view.xml

@@ -1421,20 +1421,21 @@
                                                 <field name="housing_cat"
                                                        attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
                                                 <field name="property_type_code" invisible="1"/>
-                                                <field name="property_type_id" options="{'no_create': True, 'no_create_edit': True,'no_quick_create': True, 'no_open': True}"
+                                                <field name="property_type_id"
-                                                       attrs="{'required':[('state','not in',['draft','new'])],'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
+                                                       options="{'no_create': True, 'no_create_edit': True,'no_quick_create': True, 'no_open': True}"
-                                                <field name="payment_type"
+                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
-                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','rent')]}"/>
+                                                <field name="payment_type" force_save="1"
-                                                <field name="rent_amount"
+                                                       attrs="{'invisible':[('property_type_code','!=','rent')]}"/>
-                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','rent')]}"/>
+                                                <field name="rent_amount" force_save="1"
-                                                <field name="contract_num"
+                                                       attrs="{'invisible':[('property_type_code','!=','rent')]}"/>
-                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','rent')]}"/>
+                                                <field name="contract_num" force_save="1"
-                                                <field name="rent_start_date"
+                                                       attrs="{'invisible':[('property_type_code','!=','rent')]}"/>
-                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','rent')]}"/>
+                                                <field name="rent_start_date" force_save="1"
-                                                <field name="rent_end_date"
+                                                       attrs="{'invisible':[('property_type_code','!=','rent')]}"/>
-                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','rent')]}"/>
+                                                <field name="rent_end_date" force_save="1"
-                                                <field name="rent_attachment"
+                                                       attrs="{'invisible':[('property_type_code','!=','rent')]}"/>
-                                                       attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','rent')]}"
+                                                <field name="rent_attachment" force_save="1"
+                                                       attrs="{'invisible':[('property_type_code','!=','rent')]}"
                                                        widget="many2many_attachment_preview"/>
                                                 <field name="property_instrument_number"
                                                        attrs="{'readonly':[('state','not in',['draft','new','complete_info'])],'invisible':[('property_type_code','!=','ownership')]}"/>
@@ -1498,7 +1499,28 @@
                                             </group>
                                         </group>
                                         <group>
-                                            <group/>
+                                            <group>
+                                                <separator string="Rent Contracts" colspan="2"/>
+                                                <field name="current_rent_contract_id" force_save="1" invisible="1"/>
+                                                <field name="rent_contract_ids" nolabel="1"
+                                                       attrs="{'readonly':['|',('state','not in',['draft','new','complete_info']),('property_type_code','!=','rent')]}"
+                                                       mode="tree,form"
+                                                       context="{'default_family_id': id,'default_landlord_type': 'family'}">
+                                                    <tree string="Rent Contracts">
+                                                        <field name="name"/>
+                                                        <field name="start_date"/>
+                                                        <field name="landlord_type"/>
+                                                        <field name="rent_amount"/>
+                                                    </tree>
+                                                </field>
+                                                <field name="rent_contract_count" invisible="1"/>
+                                                <button name="action_view_all_rent_contracts"
+                                                        type="object"
+                                                        string="View All Rent Contracts"
+                                                        class="btn-link"
+                                                        colspan="2"
+                                                        attrs="{'invisible': [('rent_contract_count', '=', 0)]}"/>
+                                            </group>
                                             <group>
                                                 <separator string="Geolocation" colspan="2"/>
                                                 <button string="Geolocalize" name="geo_localize" type="object"

odex25_benefit/odex_benefit/views/service_request.xml

@@ -316,8 +316,11 @@
                                     <tree editable="bottom" delete="0">
                                         <field name="name"/>
                                         <field name="service_attach" widget="many2many_attachment_preview"/>
+                                        <field name="write_uid"/>
+                                        <field name="write_date"/>
                                         <field name="notes"/>
                                         <field name="service_type" invisible="1"/>
+                                        <field name="state"/>
                                     </tree>
                                 </field>
                             </page>

odex25_benefit/odex_benefit/views/services_settings.xml

@@ -122,6 +122,7 @@
                                     <tree editable="bottom">
                                         <field name="name"/>
                                         <field name="notes"/>
+                                        <field name="state"/>
                                         <field name="service_type" invisible="1"/>
                                     </tree>
                                 </field>