[FIX] fix needed after the previous merge with trunk: produce_delay field doesn't...

bzr revid: qdp-launchpad@openerp.com-20140203184520-5p1j2y3sk1asu8hj

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 97d9c86..865db18 100644 (file)
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -547,7 +547,7 @@
                     <group name="delay" string="Delays" attrs="{'invisible':[('type','=','service')]}">
                         <label for="produce_delay" />
                         <div attrs="{'invisible':[('type','=','service')]}">
-                            <field name="produce_delay" class="oe_inline"/> days
+                            <field name="produce_delay" class="oe_inline" style="vertical-align:baseline"/> days
                         </div>                        
                     </group>                
                 </xpath>

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6fee35d..756fa66 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -868,12 +868,6 @@
                                     <group name="general">
                                         <field name="standard_price" attrs="{'readonly': [('is_only_child', '=', False)]}"/>
                                     </group>
-                                    <group name="delay" string="Delays">
-                                        <label for="produce_delay"/>
-                                        <div>
-                                            <field name="produce_delay" class="oe_inline" style="vertical-align:baseline"/> days
-                                        </div>
-                                    </group>
                                     <group name="procurement_uom" groups="product.group_uom" string="Purchase">
                                         <field name="uom_po_id"/>
                                     </group>