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

Merge pull request #4938 from expsa/yy_dev_odex25_ensan 

IMP benefit
This commit is contained in:
kchyounes19 2025-10-15 13:31:23 +01:00 committed by GitHub
parent 137a748cbe fbf41f5813
commit 9ea27f1867
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
odex25_ensan/odex_benefit/i18n/ar_001.po
View File

@ -10046,11 +10046,6 @@ msgstr "مقدم الطلب"
msgid "Request Second Approve"
msgstr "اعتماد مدير الفرع للطلب"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__second_approve
msgid "Request Second Approve"
msgstr "بانتظار مدير المستفيدين"
#. module: odex_benefit
#: code:addons/odex_benefit/controllers/benefit_services.py:0
#, python-format

6
odex25_ensan/odex_benefit/models/service_request.py
View File

@ -10,7 +10,7 @@ class ServiceRequest(models.Model):
name = fields.Char(string='Reference', required=True, copy=False, readonly=True, index=True,default=lambda self: _('New'))
benefit_type = fields.Selection(string='Benefit Type',selection=[('family', 'Family'),('member', 'Member')])
date = fields.Datetime(string='Request Date',default=fields.Datetime.now)
family_id = fields.Many2one('grant.benefit',string='Family',domain="['|',('state','=','second_approve'),'&',('state','in',['waiting_approve','first_approve']),('action_type','=','suspended')]")
family_id = fields.Many2one('grant.benefit',string='Family',domain="['|',('state','=','gm_assistant'),'&',('state','in',['waiting_approve','first_approve']),('action_type','=','suspended')]")
researcher_id = fields.Many2one("committees.line", string="Researcher", related="family_id.researcher_id",store=True)
family_category = fields.Many2one('benefit.category',string='Family Category',related='family_id.benefit_category_id')
benefit_member_count = fields.Integer(string="Benefit Member count", related='family_id.benefit_member_count')
@ -146,7 +146,7 @@ class ServiceRequest(models.Model):
('researcher', 'Researcher'),
('waiting_approve', 'Waiting for Operation Manager'),
('first_approve', 'Waiting for Branch Manager'),
('second_approve', 'Request Second Approve'),
('gm_assistant', 'Waiting Assistant General Manager'),
('accounting_approve', 'Accounting Approve'),
('approval_of_beneficiary_services', 'Approval of beneficiary services'),
('send_request_to_supplier', 'Send Request To Supplier'),
@ -441,7 +441,7 @@ class ServiceRequest(models.Model):
def action_branch_manager_approve(self):
for rec in self:
if rec.service_cat.needs_beneficiary_manager_approval:
rec.state = 'second_approve'
rec.state = 'gm_assistant'
else:
rec.state = 'accounting_approve'

12
odex25_ensan/odex_benefit/views/service_request.xml
View File

@ -91,7 +91,7 @@
<button name="action_beneficiary_manager_approve" type="object"
string="Beneficiary Approve" class="oe_highlight"
confirm="Are you sure you want to approve ?"
states="second_approve"
states="gm_assistant"
groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"/>
<field name="state" widget="statusbar"
statusbar_visible="draft,researcher,waiting_approve,first_approve,accounting_approve,send_request_to_supplier,family_received_device,refused"/>
@ -130,7 +130,7 @@
<field name="account_id" invisible="1"/>
<field name="device_account_id" invisible="1"/>
<field name="accountant_id"
attrs="{'invisible':[('state','in',['draft','researcher','waiting_approve','first_approve','second_approve'])]}"/>
attrs="{'invisible':[('state','in',['draft','researcher','waiting_approve','first_approve','gm_assistant'])]}"/>
<field name="payment_order_id" readonly="1"
groups="odex_benefit.group_benefit_accounting_accept" invisible="1"/>
<field name="vendor_bill" readonly="1"
@ -159,7 +159,7 @@
<field name="requested_service_amount" attrs="{'readonly': [
'|',
'&amp;',
('state', 'not in', ['draft', 'researcher', 'waiting_approve', 'first_approve', 'second_approve', 'accounting_approve']),
('state', 'not in', ['draft', 'researcher', 'waiting_approve', 'first_approve', 'gm_assistant', 'accounting_approve']),
('service_type', 'in', ['marriage', 'eid_gift', 'winter_clothing', 'ramadan_basket']),
('service_type', 'in', ['electrical_devices', 'home_furnishing'])
]}" force_save="1" required="1"/>
@ -397,7 +397,7 @@
<field name="requested_service_amount"/>
<field name="payment_order_id" invisible="1" groups="odex_benefit.group_benefit_accounting_accept"/>
<field name="vendor_bill" invisible="1" groups="odex_benefit.group_benefit_accounting_accept"/>
<field name="state" widget="badge" decoration-success="state in ['second_approve']"
<field name="state" widget="badge" decoration-success="state in ['gm_assistant']"
decoration-muted="state == 'draft'"
decoration-danger="state in ['refused']"
decoration-info="state in ['first_approve','waiting_approve']"
@ -429,8 +429,8 @@
domain="[('state', '=', 'first_approve')]"/>
<separator/>
<separator/>
<filter string="Request Second Approve" name="second_approve"
domain="[('state', '=', 'second_approve')]"/>
<filter string="Request Second Approve" name="gm_assistant"
domain="[('state', '=', 'gm_assistant')]"/>
<separator/>
<separator/>
<filter string="Accounting Approve" name="accounting_approve"