From 35318e6a8ae4bf6c5d2d7431e543c46db4c02e4c Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Thu, 15 Sep 2016 09:40:32 +0200 Subject: [PATCH] [FIX] hr_expense: Add coherence with expenses to submit Sometimes we use 'to report' and 'to submit' for the same state, or either twice the terms in the action title and the menuitem. --- addons/hr_expense/i18n/hr_expense.pot | 4 ++-- addons/hr_expense/models/hr_expense.py | 2 +- addons/hr_expense/views/hr_expense_views.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot index 97a6d232a1c..59042fe750e 100644 --- a/addons/hr_expense/i18n/hr_expense.pot +++ b/addons/hr_expense/i18n/hr_expense.pot @@ -703,7 +703,7 @@ msgstr "" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_unsubmitted -msgid "My Expenses to Report" +msgid "My Expenses to Submit" msgstr "" #. module: hr_expense @@ -1146,7 +1146,7 @@ msgstr "" #. module: hr_expense #: selection:hr.expense,state:0 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter -msgid "To Report" +msgid "To Submit" msgstr "" #. module: hr_expense diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index f0ab25a648d..997d44cb6b0 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -34,7 +34,7 @@ class HrExpense(models.Model): payment_mode = fields.Selection([("own_account", "Employee (to reimburse)"), ("company_account", "Company")], default='own_account', states={'done': [('readonly', True)], 'post': [('readonly', True)]}, string="Payment By") attachment_number = fields.Integer(compute='_compute_attachment_number', string='Number of Attachments') state = fields.Selection([ - ('draft', 'To Report'), + ('draft', 'To Submit'), ('reported', 'Reported'), ('done', 'Posted'), ('refused', 'Refused') diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index 56290e898a4..619ce5b0368 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -161,7 +161,7 @@ - + @@ -206,7 +206,7 @@ - My Expenses to Report + My Expenses to Submit hr.expense tree,kanban,form,graph,pivot