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 #6242 from expsa/ytt 

[IMP] odex_benefit: IMP benefit
This commit is contained in:
kchyounes19 2026-01-19 14:40:44 +01:00 committed by GitHub
parent f3608de221 9e0935d67b
commit d074ecf06e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_benefit/odex_benefit/views/actions_and_menus.xml
View File

@ -564,7 +564,7 @@
'|', '|',
'&','&', '&','&',
('is_seasonal','=',False), ('is_seasonal','=',False),
('state','=','accounting_approve'), ('state','in',['accounting_approve','return_to_bank','family_received_device','send_request_to_supplier']),
('payment_order_state','=','none'), ('payment_order_state','=','none'),
'&','&','&', '&','&','&',
('is_seasonal','=',True), ('is_seasonal','=',True),

13
odex25_benefit/odex_benefit/views/service_request.xml
View File

@ -105,11 +105,13 @@
states="accounting_approve"/> states="accounting_approve"/>
<button name="action_first_refuse" type="object" <button name="action_first_refuse" type="object"
string="Return the request to the specialist" class="btn btn-warning" string="Return the request to the specialist" class="btn btn-warning"
states="accounting_approve" groups="odex_benefit.group_benefit_payment_accountant_accept"
attrs="{'invisible': ['|','|',('state', '!=', 'accounting_approve'),('payment_order_count','!=',0),('total_moves', '!=', 0)]}"
/> />
<button name="action_refuse" type="object" <button name="action_refuse" type="object"
string="Refuse" class="btn btn-danger" string="Refuse" class="btn btn-danger"
states="accounting_approve" groups="odex_benefit.group_benefit_payment_accountant_accept"
attrs="{'invisible': ['|','|',('state', '!=', 'accounting_approve'),('payment_order_count','!=',0),('total_moves', '!=', 0)]}"
/> />
<button name="action_processed" type="object" <button name="action_processed" type="object"
string="Processed" class="oe_highlight" string="Processed" class="oe_highlight"
@ -177,7 +179,8 @@
<button name="action_open_related_move_records" <button name="action_open_related_move_records"
class="oe_stat_button" class="oe_stat_button"
icon="fa-file-text-o" icon="fa-file-text-o"
type="object" attrs="{'invisible': ['|',('total_moves', '=', 0),('payment_order_count','!=','0')]}"> type="object"
attrs="{'invisible': ['|',('total_moves', '=', 0),('payment_order_count','!=','0')]}">
<field name="total_moves" widget="statinfo" string="Total Moves"/> <field name="total_moves" widget="statinfo" string="Total Moves"/>
</button> </button>
</div> </div>
@ -276,7 +279,7 @@
('exception', '=', False), ('exception', '=', False),
'|', '|',
'&amp;', '&amp;',
('state', 'not in', ['draft', 'researcher', 'waiting_approve', 'first_approve', 'gm_assistant', 'accounting_approve']), ('state', 'not in', ['draft', 'researcher']),
('service_type', 'in', ['marriage', 'eid_gift', 'winter_clothing', 'ramadan_basket']), ('service_type', 'in', ['marriage', 'eid_gift', 'winter_clothing', 'ramadan_basket']),
('service_type', 'in', ['electrical_devices', 'home_furnishing', 'rent']) ('service_type', 'in', ['electrical_devices', 'home_furnishing', 'rent'])
] ]
@ -320,7 +323,7 @@
<page string="Services Attachments Settings" <page string="Services Attachments Settings"
attrs="{'invisible':[('required_attach','=',False)]}"> attrs="{'invisible':[('required_attach','=',False)]}">
<field name="attachment_lines" widget="one2many_list"> <field name="attachment_lines" widget="one2many_list">
<tree editable="bottom" delete="0"> <tree editable="bottom">
<field name="name"/> <field name="name"/>
<field name="service_attach" widget="many2many_attachment_preview"/> <field name="service_attach" widget="many2many_attachment_preview"/>
<field name="write_uid"/> <field name="write_uid"/>