[FIX] fix needed after merge with trunk (cost_method field doesn't belong to product module anymore)
bzr revid: qdp-launchpad@openerp.com-20140203180044-auj3u263qiji203t
This commit is contained in:
parent
753f7541db
commit
d676e39094
|
@ -125,10 +125,7 @@
|
|||
<group name="procurement">
|
||||
<group name="general">
|
||||
<field name="active"/>
|
||||
<field name="cost_method" groups="product.group_costing_method"
|
||||
attrs="{'readonly': [('is_only_child', '=', False)]}"/>
|
||||
<field name="standard_price"
|
||||
attrs="{'readonly': ['|', ('cost_method','=','average'), ('is_only_child', '=', False)]}"/>
|
||||
<field name="standard_price" attrs="{'readonly': [('is_only_child', '=', False)]}"/>
|
||||
</group>
|
||||
<group name="procurement_uom" groups="product.group_uom" string="Purchase">
|
||||
<field name="uom_po_id"
|
||||
|
@ -869,8 +866,8 @@
|
|||
<page string="Procurements" groups="base.group_user">
|
||||
<group name="procurement">
|
||||
<group name="general">
|
||||
<field name="cost_method" groups="product.group_costing_method"/>
|
||||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
|
||||
<field name="active"/>
|
||||
<field name="standard_price" attrs="{'readonly': [('is_only_child', '=', False)]}"/>
|
||||
</group>
|
||||
<group name="delay" string="Delays">
|
||||
<label for="produce_delay"/>
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
</xpath>
|
||||
<xpath expr="//field[@name='standard_price']" position='replace'>
|
||||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
|
||||
<field name="cost_method"/>
|
||||
<field name="cost_method" groups="product.group_costing_method"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -54,12 +54,12 @@
|
|||
<field name="inherit_id" ref="product.product_normal_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="standard_price" position="replace" version="7.0">
|
||||
<field name="cost_method" groups="product.group_costing_method"/>
|
||||
<field name="cost_method" groups="product.group_costing_method" attrs="{'readonly': [('is_only_child', '=', False)]}"/>
|
||||
<label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
|
||||
<div groups="base.group_user">
|
||||
<field name="standard_price" attrs="{'readonly':[('valuation','=','real_time'), ('cost_method', 'in', ['standard', 'average'])]}" nolabel="1"/>
|
||||
<field name="standard_price" attrs="{'readonly':['|', ('is_only_child', '=', False), '&', ('valuation','=','real_time'), ('cost_method', 'in', ['standard', 'average'])]}" nolabel="1"/>
|
||||
<button name="%(action_view_change_standard_price)d" string="- update"
|
||||
type="action" attrs="{'invisible':['|', ('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard', 'average'])]}"
|
||||
type="action" attrs="{'invisible':['|', |', ('is_only_child', '=', False), ('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard', 'average'])]}"
|
||||
class="oe_link" groups="product.group_costing_method"/>
|
||||
</div>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue