diff --git a/odex25_benefit/odex_benefit/views/actions_and_menus.xml b/odex25_benefit/odex_benefit/views/actions_and_menus.xml index 7ac943335..38246aa24 100644 --- a/odex25_benefit/odex_benefit/views/actions_and_menus.xml +++ b/odex25_benefit/odex_benefit/views/actions_and_menus.xml @@ -564,7 +564,7 @@ '|', '&','&', ('is_seasonal','=',False), - ('state','=','accounting_approve'), + ('state','in',['accounting_approve','return_to_bank','family_received_device','send_request_to_supplier']), ('payment_order_state','=','none'), '&','&','&', ('is_seasonal','=',True), diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml index fe95e442b..6f0f63052 100644 --- a/odex25_benefit/odex_benefit/views/service_request.xml +++ b/odex25_benefit/odex_benefit/views/service_request.xml @@ -105,11 +105,13 @@ states="accounting_approve"/> @@ -276,7 +279,7 @@ ('exception', '=', False), '|', '&', - ('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', ['electrical_devices', 'home_furnishing', 'rent']) ] @@ -320,7 +323,7 @@ - +