summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorNidhi Patel <nia@odoo.com>2020-05-20 13:33:21 +0000
committerYannick Tivisse <yti@odoo.com>2020-06-02 10:21:14 +0000
commit6330d31dbef00447647002e55fa33c207a8529ad (patch)
tree6d46d2115984575f67b8617eaf1fefc79e94d727 /addons
parent549801c9c37c287f5d2e1f478965e8f387aa0cf3 (diff)
[FIX] hr_expense: Fix the 'To Pay' filter and remove unused actions
Currently, In expense reports 'to pay' filter return data of state 'approved' and 'posted'. But the 'to pay' filter should only return expense reports whose state is 'post'. After this commit, the 'to pay' filter return only data of 'posted' state and also removed some unused actions. closes odoo/odoo#51638 Taskid: 2261481 Closes: #51638 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/hr_expense/views/hr_expense_views.xml46
1 files changed, 1 insertions, 45 deletions
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 4bdd5059ecc..c7512bec26c 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -412,24 +412,6 @@
<field name="act_window_id" ref="hr_expense_product"/>
</record>
-
-
- <record id="action_approved_expense" model="ir.actions.act_window">
- <field name="name">Employee Expenses</field>
- <field name="res_model">hr.expense</field>
- <field name="view_mode">tree,kanban,form,pivot,graph</field>
- <field name="view_id" ref="view_expenses_tree"/>
- <field name="domain">[]</field>
- <field name="context">{"search_default_approved": 1}</field>
- <field name="help" type="html">
- <p class="o_view_nocontent_empty_folder">
- No approved employee expenses
- </p><p>
- From here the accountant will be able to approve as well as refuse the expenses which are verified by the HR Manager.
- </p>
- </field>
- </record>
-
<record id="action_unsubmitted_expense" model="ir.actions.act_window">
<field name="name">Unreported Expenses</field>
<field name="res_model">hr.expense</field>
@@ -446,16 +428,6 @@
</field>
</record>
- <record id="hr_expense_action" model="ir.actions.act_window">
- <field name="name">Expenses Analysis</field>
- <field name="res_model">hr.expense</field>
- <field name="view_mode">graph,pivot</field>
- <field name="context">{
- 'search_default_approved': 1,
- }
- </field>
- </record>
-
<record id="view_hr_expense_sheet_tree" model="ir.ui.view">
<field name="name">hr.expense.sheet.tree</field>
<field name="model">hr.expense.sheet</field>
@@ -665,7 +637,7 @@
<separator />
<filter domain="[('state', '=', 'submit')]" string="To Approve" name="submitted" help="Confirmed Expenses"/>
<filter domain="[('state', '=', 'approve')]" string="To Post" name="to_post" help="Approved Expenses"/>
- <filter domain="['|', ('state', '=', 'approve'), ('state', '=', 'post')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
+ <filter domain="[('state', '=', 'post')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
<filter domain="[('state', '=', 'cancel')]" string="Refused" name="canceled"/>
<separator/>
<filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
@@ -841,22 +813,6 @@
</field>
</record>
- <record id="action_request_to_pay_expense_sheet" model="ir.actions.act_window">
- <field name="name">Reports to Pay</field>
- <field name="res_model">hr.expense.sheet</field>
- <field name="view_mode">tree,kanban,form,pivot,graph</field>
- <field name="context">{'search_default_approved': 1}</field>
- <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
- <field name="view_id" ref="view_hr_expense_sheet_tree"/>
- <field name="help" type="html">
- <p class="o_view_nocontent_smiling_face">
- Create a new expense
- </p><p>
- Once you have created your expense, submit it to your manager who will validate it.
- </p>
- </field>
- </record>
-
<record id="action_hr_expense_sheet_department_to_approve" model="ir.actions.act_window">
<field name="name">Expense Reports to Approve</field>
<field name="res_model">hr.expense.sheet</field>