diff --git a/odex25_takaful/odex_takaful/i18n/ar_001.po b/odex25_takaful/odex_takaful/i18n/ar_001.po index a6fcb3bdd..a8feb19c9 100644 --- a/odex25_takaful/odex_takaful/i18n/ar_001.po +++ b/odex25_takaful/odex_takaful/i18n/ar_001.po @@ -7586,4 +7586,9 @@ msgstr "طباعة تقرير أم اليتيم/اليتيم" #. module: odex_takaful #: model_terms:ir.ui.view,arch_db:odex_takaful.takaful_account_move_inherit_form msgid "Previous Payments" -msgstr "المدفوعات السابقة" \ No newline at end of file +msgstr "المدفوعات السابقة" + +#. module: odex_takaful +#: model:res.groups,name:odex_takaful.group_refund_change_mobile +msgid "Change Sponsor Mobile in Refund Wizard" +msgstr "تغيير جوال الكافل في معالج الاسترداد" diff --git a/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml b/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml index 78db5836c..3e7a1e585 100644 --- a/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml +++ b/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml @@ -6,6 +6,7 @@ + diff --git a/odex25_takaful/odex_takaful/security/security_data.xml b/odex25_takaful/odex_takaful/security/security_data.xml index 632c44b54..8d0e3563e 100644 --- a/odex25_takaful/odex_takaful/security/security_data.xml +++ b/odex25_takaful/odex_takaful/security/security_data.xml @@ -92,11 +92,16 @@ - + Sponsor - Department Access + + Change Sponsor Mobile in Refund Wizard + + + Donations Officer: Own Donations @@ -163,7 +168,7 @@ [ '|', ('branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), - ('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id) + ('branch_custom_id', '=', user.branch_custom_id.id) ] @@ -174,10 +179,10 @@ [ '|', '|', '|', ('sponsorship_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), - ('sponsorship_id.branch_custom_id.branch', 'child_of', user.employee_id.department_id.id), + ('sponsorship_id.branch_custom_id', '=', user.branch_custom_id.id), ('sponsorship_mechanism_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), - ('sponsorship_mechanism_id.branch_custom_id.branch', 'child_of', user.employee_id.department_id.id) + ('sponsorship_mechanism_id.branch_custom_id', '=', user.branch_custom_id.id) ] @@ -189,11 +194,11 @@ '|', '|', '|', '|', ('create_uid', '=', user.id), - ('create_uid.employee_id.department_id.manager_id.user_id', 'in', [user.id, False]), - ('create_uid.employee_id.department_id', 'child_of', user.employee_id.department_id.id), + ('create_uid.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), + ('create_uid.branch_custom_id', '=', user.branch_custom_id.id), ('sponsorship_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), - ('sponsorship_id.branch_custom_id.branch', 'child_of', user.employee_id.department_id.id) + ('sponsorship_id.branch_custom_id', '=', user.branch_custom_id.id) ] @@ -201,7 +206,7 @@ Sponsor - Department Based Access - [('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)] + [('branch_custom_id', '=', user.branch_custom_id.id)] diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.py b/odex25_takaful/odex_takaful/wizards/esterdad.py index 87fce8937..1627b17be 100644 --- a/odex25_takaful/odex_takaful/wizards/esterdad.py +++ b/odex25_takaful/odex_takaful/wizards/esterdad.py @@ -147,8 +147,13 @@ class EsterdadWizard(models.Model): rec.sponsor_id.write({ 'cancel_record_id': rec.id }) + rec.sponsor_id.sponsor_id.write({ + 'first_name': rec.sponsor_name + }) if rec.sponsor_id.sponsor_or_donor_type == 'unknown' and not rec.sponsor_id.sponsor_phone: rec.sponsor_id.sponsor_phone = rec.mobile + if rec.sponsor_id.sponsor_or_donor_type == 'registered' and rec.id_num: + rec.sponsor_id.sponsor_id.id_number == rec.id_num # context['default_payment_ids'] = [(6, 0, rec.payment_ids.ids)] view = self.env.ref('odex_takaful.view_otp_wizard_form') return { diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.xml b/odex25_takaful/odex_takaful/wizards/esterdad.xml index 917749770..d9f11387d 100644 --- a/odex25_takaful/odex_takaful/wizards/esterdad.xml +++ b/odex25_takaful/odex_takaful/wizards/esterdad.xml @@ -50,7 +50,8 @@ - + +