[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.
This commit is contained in:
Yannick Tivisse
2016-09-15 09:40:32 +02:00
parent 8d93a48ae6
commit 35318e6a8a
3 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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')
+2 -2
View File
@@ -161,7 +161,7 @@
<field name="product_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<separator />
<filter domain="[('state', '=', 'draft')]" string="To Report" name="to_report" help="New Expense"/>
<filter domain="[('state', '=', 'draft')]" string="To Submit" name="to_report" help="New Expense"/>
<filter domain="[('state', '=', 'report')]" string="Reported" name="submitted" help="Confirmed Expenses"/>
<filter domain="[('state', '=', 'refused')]" string="Refused" name="refused" help="Refused Expenses"/>
<filter domain="[('state', '!=', 'cancel')]" string="Not Refused" name="uncancelled" help="Actual expense sheets, not the refused ones"/>
@@ -206,7 +206,7 @@
</record>
<record id="hr_expense_actions_my_unsubmitted" model="ir.actions.act_window">
<field name="name">My Expenses to Report</field>
<field name="name">My Expenses to Submit</field>
<field name="res_model">hr.expense</field>
<field name="view_mode">tree,kanban,form,graph,pivot</field>
<field name="search_view_id" ref="view_hr_expense_filter"/>