Merge pull request #5915 from expsa/fix_bugs

Fix bugs

odex25_takaful/odex_takaful/i18n/ar_001.po

@@ -4376,8 +4376,7 @@ msgstr "متأخر في سداد الكفالة بنسبة إجمالية %s"
 #: model:ir.model.fields.selection,name:odex_takaful.selection__donations_details_lines__state__paid
 #, fuzzy
 msgid "Paid"
-msgstr ""
-"منتهي"
+msgstr "منتهي"
 
 #. module: odex_takaful
 #: model:ir.model.fields,field_description:odex_takaful.field_grant_benefit_invoice__paid_amount
@@ -5655,8 +5654,6 @@ msgstr "سجل الكفلاء"
 #: model:ir.model.fields,field_description:odex_takaful.field_account_payment__sponsorship_id
 #: model:ir.model.fields,field_description:odex_takaful.field_donate_for_another_person__sponsorship_id
 #: model:ir.model.fields,field_description:odex_takaful.field_donation_extension_history__sponsorship_id
-#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__sponsorship_id
-#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__sponsorship_mechanism_id
 #: model:ir.model.fields,field_description:odex_takaful.field_month_payment_line__sponsorship_id
 #: model:ir.model.fields,field_description:odex_takaful.field_payment_details_lines__sponsorship_id
 #: model:ir.model.fields,field_description:odex_takaful.field_refund_details_lines__sponsorship_id
@@ -7524,3 +7521,18 @@ msgstr "المستفيد الحالي"
 #: model:ir.model,name:odex_takaful.model_replace_benefit_wizard
 msgid "Replace Benefit"
 msgstr "إستبدال مستفيد"
+
+
+#. module: odex_takaful
+#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__sponsorship_id
+#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__sponsorship_mechanism_id
+msgid "Sponsorship"
+msgstr "السجل"
+
+
+#. module: odex_takaful
+#: code:addons/odex_takaful/wizards/donation_extension_wizard.py:0
+#, python-format
+msgid ""
+"Only active donations with end date in the future can be extended. Line: %s"
+msgstr "التمدد للكفالات النشطة فقط"

odex25_takaful/odex_takaful/models/takaful_sponorship_model.py

@@ -539,7 +539,7 @@ class TakafulSponsorship(models.Model):
         pass
 
     def _default_branch_custom_id(self):
-        return self.env['branch.settings'].sudo().search([('branch', '=', self.env.user.department_id.id)], limit=1)
+        return self.env.user.branch_custom_id
 
     # @api.constrains('payment_details_lines')
     # def check_payment_amount(self):
@@ -609,6 +609,12 @@ class TakafulSponsorship(models.Model):
                     rec.donations_details_lines.mapped('benefit_ids').ids +
                     rec.donations_details_lines_mechanism_ids.mapped('benefit_ids').ids
             )
+
+    @api.onchange('benefit_ids')
+    def onchange_benefit_ids(self):
+        if not self.benefit_ids:
+            self.benefit_id = False
+
     @api.depends('gender','education_status','education_level','sponsorship_type','benefit_type','age_category_id')
     def _compute_domain_ids(self):
         # Create a domain
@@ -975,6 +981,9 @@ class TakafulSponsorship(models.Model):
         res.update({
                 'record_url': url,
             })
+        res.update({
+            'branch_custom_id': self.env.user.branch_custom_id.id ,
+        })
         return res
 
     # payment_ids = fields.One2many('account.payment','sponsorship_id',string='Payments', copy=False)