devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change on app icon journal and sequn

This commit is contained in:
Nossibaelhadi 2025-11-03 19:11:28 +03:00
parent 0ac855dbdb
commit d8a17bbbe7
6 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
odex25_ensan/odex_takaful/__manifest__.py
View File

@ -74,6 +74,7 @@
'reports/transfer_deduction_report.xml',
'reports/transfer_deduction_report_templates.xml',
],
'images': ['static/description/icon5.png'],
# 'installable': True,
# 'application': True,
# 'auto_install': False,

9
odex25_ensan/odex_takaful/i18n/ar_001.po
View File

@ -3226,7 +3226,7 @@ msgstr "عمليات الكفالة"
#: model:ir.ui.menu,name:odex_takaful.kafalat_main_menu
#: model_terms:ir.ui.view,arch_db:odex_takaful.view_takaful_sponsor_form
msgid "Kafalat"
msgstr "الكفالات ونقاط البيع"
msgstr "كفالة ونقاط بيع"
#. module: odex_takaful
#: model:ir.model,name:odex_takaful.model_takaful_wizard_report_kafalat_cancel
@ -7055,6 +7055,11 @@ msgstr ""
msgid "report.odex_takaful.benefit_month_payment_report_pdf"
msgstr ""
#. module: odex_takaful
#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__journal_id
msgid "Journal"
msgstr "بنك الجمعية"
#. module: odex_takaful
#: model:ir.model,name:odex_takaful.model_report_odex_takaful_benefit_month_payment_report_xlsx
msgid "report.odex_takaful.benefit_month_payment_report_xlsx"
@ -7243,7 +7248,7 @@ msgstr "اسم الكافل/المتبرع"
#. module: odex_takaful
#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__direct_debit_partner_bank_id
msgid "Direct Debit Partner Bank"
msgstr "البنك المستلم"
msgstr "البنك المتبرع"
#. module: odex_takaful
#: code:addons/odex_takaful/models/takaful_sponorship_model.py:0

9
odex25_ensan/odex_takaful/models/donation_details_lines.py
View File

@ -16,6 +16,11 @@ class DonationsDetailsLines(models.Model):
_inherit = ['mail.thread']
_rec_name = 'sequence_no'
@api.model
def _default_journal_id(self):
journal_id = self.env.company.sponsorship_direct_debit_journal_id.id
return journal_id if journal_id else False
name = fields.Text(string="Note")
display_type = fields.Selection([
('line_section', "Section"),
@ -82,6 +87,7 @@ class DonationsDetailsLines(models.Model):
hide_beneficiary_group = fields.Boolean(compute='_compute_hide_beneficiary_group')
debit_payment_file_attachment = fields.Binary(string='Debit Payment Attachment', attachment=True)
debit_payment_attachment_file_name = fields.Char('Debit Payment File Name', required=False)
journal_id = fields.Many2one('account.journal', string="Journal",domain="[('type','=','bank')]",default=_default_journal_id)
# cheque_number = fields.Integer(string="Cheque Number")
# cheque_due_date = fields.Date(string="Cheque Due Date")
# cheque_file_attachment = fields.Binary(string='Cheque Attachment', attachment=True)
@ -89,6 +95,7 @@ class DonationsDetailsLines(models.Model):
# bank_transfer_file_attachment = fields.Binary(string='Bank Transfer Attachment', attachment=True)
# bank_transfer_attachment_file_name = fields.Char('Bank Transfer File Name', required=False)
@api.depends('extension_history_ids')
def _compute_extension_count(self):
for rec in self:
@ -422,6 +429,8 @@ class DonationsDetailsLines(models.Model):
if rec.sponsorship_duration == 'temporary' and not rec.direct_debit:
rec.start_date = fields.Date.context_today(rec)
@api.model
def default_get(self, fields):
res = super(DonationsDetailsLines, self).default_get(fields)

28
odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
View File

@ -1130,8 +1130,8 @@ class TakafulSponsorship(models.Model):
# Model Operations
@api.model
def create(self, vals):
if vals.get('code', 'New') == 'New':
vals['code'] = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
# if vals.get('code', 'New') == 'New':
# vals['code'] = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
# if vals.get('benefit_type') == 'orphan':
# main_code = self.env['ir.sequence'].sudo(
# ).next_by_code('sponsorship.sequence')
@ -1258,17 +1258,20 @@ class TakafulSponsorship(models.Model):
raise ValidationError(
_("Please add at least one line in donation details!")
)
all_donation_lines = (self.donations_details_lines + self.donations_details_lines_mechanism_ids).filtered(lambda r: r.display_type == False)
all_donation_lines = (self.donations_details_lines + self.donations_details_lines_mechanism_ids).filtered(
lambda r: r.display_type == False)
if not self.code:
self.code = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
for line in all_donation_lines.filtered(lambda r: r.record_type == 'sponsorship'):
for benefit in (line.benefit_id | line.benefit_ids):
if benefit.sponsor_related_id:
raise ValidationError(_("Cannot proceed with payment!\n\n"
"The following sponsorship lines contain beneficiaries that are already sponsored by other sponsors:\n"
"Lines: %s\n\n"
"Please choose different beneficiaries for these lines before proceeding with the payment." % line.sequence_no))
"The following sponsorship lines contain beneficiaries that are already sponsored by other sponsors:\n"
"Lines: %s\n\n"
"Please choose different beneficiaries for these lines before proceeding with the payment." % line.sequence_no))
if not all(all_donation_lines.mapped("sponsorships_computed")):
(self.donations_details_lines + self.donations_details_lines_mechanism_ids).compute_sponsorships_lines()
@ -1281,7 +1284,7 @@ class TakafulSponsorship(models.Model):
start_date = parse(str(self.start_date)).date()
start_by = _('Start Date')
start_text = start_by + ' ' + start_date.strftime('%d, %b %Y')
subject = msg_template.title
message = msg_template.body + '\n' + _('Sponsorship Number') + ' %s' % self.code + '\n' + _(
'Contribution Value') + ' %s' % str(self.contribution_value) + '\n' + start_text
@ -1291,7 +1294,7 @@ class TakafulSponsorship(models.Model):
'title': subject,
'body': message,
})
push.sudo().send_sms_notification()
self.state = "confirmed"
@ -1349,8 +1352,7 @@ class TakafulSponsorship(models.Model):
raise ValidationError(_("No Whatsapp notification of type 'Create Kafala' found."))
else:
pass
#self.action_send_whatsapp()
# self.action_send_whatsapp()
def action_send_whatsapp(self):

2
odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<odoo>
<menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon.png" groups="odex_takaful.group_kufula_user"/>
<menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon5.png" groups="odex_takaful.group_kufula_user"/>
<!-- Main Kafalat-->
<menuitem id="kafalat_main_menu" parent="takaful_kufula_app_top_menu"

6
odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
View File

@ -215,6 +215,9 @@
attrs="{'required': [('display_type', '=', False)]}"/>
<field name="name" widget="section_and_note_text" optional="show"/>
<field name="direct_debit"/>
<field name="journal_id"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
<!-- <field name="cheque_number"
attrs="{'required': [('payment_method', '=', 'check')], 'invisible': [('payment_method', '!=', 'check')]}"/>
<field name="cheque_due_date"
@ -413,6 +416,9 @@
<field name="sponsor_id" invisible="1"/>
<field name="direct_debit_partner_bank_id" context="{'form_view_ref': 'odex_takaful.res_partner_bank_view_form_quick_create', 'default_partner_id': sponsor_id}"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
<field name="journal_id"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
<field name="debit_payment_file_attachment" widget="binary"
filename="debit_payment_attachment_file_name"
attrs="{'required': [('direct_debit', '=', True)], 'invisible': [('direct_debit', '=', False)]}"/>