diff --git a/odex25_hr/exp_ticket_request/models/hr_ticketing.py b/odex25_hr/exp_ticket_request/models/hr_ticketing.py index fcab91928..2644d3742 100644 --- a/odex25_hr/exp_ticket_request/models/hr_ticketing.py +++ b/odex25_hr/exp_ticket_request/models/hr_ticketing.py @@ -15,9 +15,11 @@ class HrTicketing(models.Model): STATE_SELECTION = [ ('draft', _('Draft')), ('submit', _('Direct Manager')), + ('accounting', _('Accounting Manager')), ('review', _('Government Relations')), ('confirm', _('HR Manager')), - ('done', _('Financial Manager')), + ('accounting_final', _('Accounting Manager')), + ('done', _('Done')), ('refuse', _('Refused')), # ('cancelled', _('Cancelled')), ] @@ -93,11 +95,17 @@ class HrTicketing(models.Model): self.write({'state': 'submit'}) def review(self): + self.write({'state': 'accounting'}) + + def accounting(self): self.write({'state': 'review'}) def confirm(self): self.write({'state': 'confirm'}) + def accounting_final(self): + self.write({'state': 'accounting_final'}) + def action_done(self): if self.cost_of_tickets > 0: debit_line_vals = { diff --git a/odex25_hr/exp_ticket_request/security/ir.model.access.csv b/odex25_hr/exp_ticket_request/security/ir.model.access.csv index b1a73c0d9..63bd00089 100644 --- a/odex25_hr/exp_ticket_request/security/ir.model.access.csv +++ b/odex25_hr/exp_ticket_request/security/ir.model.access.csv @@ -7,4 +7,9 @@ access_hr_airline_hr,hr.airline.hr.manager,model_hr_airline,hr.group_hr_manager, access_airline_agent,airline.agent,model_airline_agent,base.group_user,1,0,0,0 access_airline_agent_hr,airline.agent.manager,model_airline_agent,hr.group_hr_manager,1,1,1,1 access_hr_airline_city_user,hr_airline_city_user,model_hr_airline_city,base.group_user,1,0,0,0 -access_hr_airline_city_manager,hr_airline_city_manager,model_hr_airline_city,hr.group_hr_manager,1,1,1,1 \ No newline at end of file +access_hr_airline_city_manager,hr_airline_city_manager,model_hr_airline_city,hr.group_hr_manager,1,1,1,1 +access_hr_ticket_request_accounting,hr.ticket.request.accounting,model_hr_ticket_request,hr_base.group_account_manager,1,1,1,1 +access_hr_ticket_request_type_accounting,hr.ticket.request.type.accounting,model_hr_ticket_request_type,hr_base.group_account_manager,1,1,1,1 +access_hr_airline_accounting,hr.airline.accounting,model_hr_airline,hr_base.group_account_manager,1,1,1,1 +access_hr_airline_city_accounting,hr.airline.city.accounting,model_hr_airline_city,hr_base.group_account_manager,1,1,1,1 +access_airline_agent_accounting,airline.agent.accounting,model_airline_agent,hr_base.group_account_manager,1,1,1,1 \ No newline at end of file diff --git a/odex25_hr/exp_ticket_request/views/hr_ticketing_view.xml b/odex25_hr/exp_ticket_request/views/hr_ticketing_view.xml index 8d5c5760f..c0214df69 100644 --- a/odex25_hr/exp_ticket_request/views/hr_ticketing_view.xml +++ b/odex25_hr/exp_ticket_request/views/hr_ticketing_view.xml @@ -20,20 +20,24 @@