pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_expense: fix the display of state field

Browse Source 
On expense lines the state field was present both in the parent view
and in the child view. This was causing the javascript not to render the
widget as intended.

Closes #23496
This commit is contained in:
RomainLibert
2018-03-06 16:14:26 +01:00
parent 9ccda20764
commit 97bdc14bce
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/views/hr_expense_views.xml
+23 -22
View File
@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<xpath expr="//group[@name='active_group']" position="before">
<group string="Expenses" name="timesheet">
<field name="expense_manager_id"/>
<field name="expense_manager_id"/>
</group>
</xpath>
</field>
@@ -35,14 +35,26 @@
</field>
</record>
<record id="hr_expense_view_form_without_header" model="ir.ui.view">
<record id="hr_expense_view_form" model="ir.ui.view">
<field name="name">hr.expense.view.form</field>
<field name="model">hr.expense</field>
<field eval="35" name="priority"/>
<field name="arch" type="xml">
<form string="Expenses" class="o_expense_form">
<field name="state" invisible="True"/>
<header>
<button name="action_submit_expenses" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="draft,reported,approved,done,refused"/>
<button name="action_view_sheet" type="object" string="View Report" class="oe_highlight" attrs="{'invisible': [('state', '=','draft')]}"/>
</header>
<sheet>
<div class="oe_button_box">
<button name="action_get_attachment_view"
class="oe_stat_button"
icon="fa-book"
type="object"
attrs="{'invisible': [('attachment_number', '=', 0)]}">
<field name="attachment_number" widget="statinfo" string="Documents" options="{'reload_on_button': true}"/>
</button>
</div>
<div class="oe_title">
<label for="name"/>
<h1>
@@ -90,29 +102,18 @@
</field>
</record>
<record id="hr_expense_view_form" model="ir.ui.view">
<record id="hr_expense_view_form_without_header" model="ir.ui.view">
<field name="name">hr.expense.view.form</field>
<field name="model">hr.expense</field>
<field name="inherit_id" ref="hr_expense.hr_expense_view_form_without_header"/>
<field name="inherit_id" ref="hr_expense.hr_expense_view_form"/>
<field eval="35" name="priority"/>
<field name="mode">primary</field>
<field name="arch" type="xml">
<xpath expr="/form/*" position="before">
<header>
<button name="action_submit_expenses" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="draft,reported,approved,done,refused"/>
<button name="action_view_sheet" type="object" string="View Report" class="oe_highlight" attrs="{'invisible': [('state', '=','draft')]}"/>
</header>
<xpath expr="/form/header" position="attributes">
<attribute name="invisible">1</attribute>
</xpath>
<xpath expr="/form/sheet/*" position="before">
<div class="oe_button_box">
<button name="action_get_attachment_view"
class="oe_stat_button"
icon="fa-book"
type="object"
attrs="{'invisible': [('attachment_number', '=', 0)]}">
<field name="attachment_number" widget="statinfo" string="Documents" options="{'reload_on_button': true}"/>
</button>
</div>
<xpath expr="/form/sheet/div[hasclass('oe_button_box')]" position="attributes">
<attribute name="invisible">1</attribute>
</xpath>
</field>
</record>