diff --git a/odex25_takaful/odex_takaful/models/donation_details_lines.py b/odex25_takaful/odex_takaful/models/donation_details_lines.py index cb3c95be8..5557da1eb 100644 --- a/odex25_takaful/odex_takaful/models/donation_details_lines.py +++ b/odex25_takaful/odex_takaful/models/donation_details_lines.py @@ -692,7 +692,10 @@ class DonationsDetailsLines(models.Model): rec.benefit_id = False rec.benefit_ids = [(5, 0, 0)] if rec.record_type == "sponsorship" and rec.sponsorship_duration: - product_templ_id = self.env["product.template"].sudo().search([("sponsorship_duration", "=", rec.sponsorship_duration)], limit=1) + product_templ_id = self.env["product.template"].sudo().search([ + ("sponsorship_duration", "=", rec.sponsorship_duration), + ("donation_category", "=", "sponsorship") + ], limit=1) if product_templ_id: rec.product_template_id = product_templ_id.id if rec.sponsorship_duration == 'temporary' and not rec.direct_debit: @@ -835,7 +838,8 @@ class DonationsDetailsLines(models.Model): domain = expression.AND([domain, [ ('member_status', '=', 'benefit'), ('sponsor_related_id', '=', False), - ('general_restriction', '=', False) + ('general_restriction', '=', False), + ('allowed_sponsorship', '=', True) ]]) if rec.benefit_family_code: diff --git a/odex25_takaful/odex_takaful/views/donations_details_lines.xml b/odex25_takaful/odex_takaful/views/donations_details_lines.xml index f8cde7c3e..d4f03c261 100644 --- a/odex25_takaful/odex_takaful/views/donations_details_lines.xml +++ b/odex25_takaful/odex_takaful/views/donations_details_lines.xml @@ -401,6 +401,41 @@ + + donations.details.lines.view.form.inherit + donations.details.lines + primary + + + + + + 1 + + + + + + + Sponsorship Items + donations.details.lines + tree,form + [('record_type', '=', 'sponsorship')] + + + {'create': False, 'delete': False, 'default_record_type': 'sponsorship'} + +

+ No sponsorship items found +

+

+ Sponsorship items appear here After confirming sponsorships from the sponsorships screen main +

+
+
+ donations.details.lines.view.tree.waiting donations.details.lines diff --git a/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml b/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml index 90512e27c..b9b31e0a1 100644 --- a/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml +++ b/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml @@ -20,6 +20,9 @@ + - +