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

[FIX] stock_account: useless group

Browse Source 
Partial backport of 02a76becf7

opw-727611
This commit is contained in:
Nicolas Martinelli
2017-04-18 13:13:45 +02:00
parent 28db302a10
commit 96956f60ba
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock_account/views/product_views.xml
+7 -11
View File
@@ -18,7 +18,7 @@
<group name="account_property" position="before">
<group>
<group string="Inventory Valuation">
<field name="property_cost_method" groups="stock_account.group_inventory_valuation"/>
<field name="property_cost_method"/>
<field name="property_valuation"/>
</group>
</group>
@@ -35,7 +35,7 @@
<field name="list_price" position="after">
<field name="valuation" invisible="1" readonly="1"/>
<field name="cost_method" invisible="1" readonly="1"/>
<field name="property_cost_method" groups="stock_account.group_inventory_valuation" invisible="1"/>
<field name="property_cost_method" invisible="1"/>
</field>
<field name="standard_price" position="replace">
<field name="standard_price"
@@ -46,18 +46,16 @@
<button string="Set standard cost" type="action"
name="%(action_view_change_standard_price)d"
attrs="{'invisible':['|', '|', ('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard']), ('product_variant_count', '>', 1)]}"
class="oe_link oe_read_only" colspan="2"
groups="stock_account.group_inventory_valuation"/>
class="oe_link oe_read_only" colspan="2"/>
</div>
<div name="standard_price_uom" position="after">
<button string="Set standard cost" type="action"
name="%(action_view_change_standard_price)d"
attrs="{'invisible':['|', '|', ('valuation','!=', 'real_time'), ('cost_method', 'not in', ['average']), ('product_variant_count', '>', 1)]}"
class="oe_link oe_read_only" colspan="2"
groups="stock_account.group_inventory_valuation"/>
class="oe_link oe_read_only" colspan="2"/>
</div>
<group name="accounting" position="inside">
<group name="property_inventory_valuation" groups="stock_account.group_inventory_valuation" attrs="{'invisible': [('type','=','service')]}">
<group name="property_inventory_valuation" attrs="{'invisible': [('type','=','service')]}">
<field name="property_valuation" invisible="1"/>
<field name="property_stock_account_input"
attrs="{'invisible':[ ('valuation', '!=', 'real_time')]}"
@@ -85,15 +83,13 @@
<button string="Set standard cost" type="action"
name="%(action_view_change_standard_price)d"
attrs="{'invisible':['|',('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard'])]}"
class="oe_link oe_read_only" colspan="2"
groups="stock_account.group_inventory_valuation"/>
class="oe_link oe_read_only" colspan="2"/>
</field>
<field name="standard_price" position="after">
<button string="Set standard cost" type="action"
name="%(action_view_change_standard_price)d"
attrs="{'invisible':['|',('valuation','!=', 'real_time'), ('cost_method', 'not in', ['average'])]}"
class="oe_link oe_read_only" colspan="2"
groups="stock_account.group_inventory_valuation"/>
class="oe_link oe_read_only" colspan="2"/>
</field>
</data>
</field>
addons/stock_account/views/stock_config_settings_views.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<xpath expr="//group[@name='traceability']" position="after">
<group string="Stock Accounting">
<field name="module_stock_landed_costs" widget="radio"/>
<field name="group_stock_inventory_valuation" widget="radio"/>
<field name="group_stock_inventory_valuation" widget="radio" invisible="1"/>
</group>
</xpath>
</field>