[MERGE]

[odoo/odoo.git] / addons / mrp / mrp_view.xml

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8c9054f..260deed 100644 (file)
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -242,21 +242,19 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-                           <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                           <field name="name" select="1"/>
-                           <field name="code" select="1"/>
-                           <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                      <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                      <field name="name" select="1"/>
+                      <field name="code" select="1"/>
+                      <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
+                    <field name="product_uom"/>
+                    <field name="product_qty"/>
+                    <newline/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="routing_id" select="2" groups="base.group_extended"/>
                     <field name="type" groups="base.group_extended"/>
-                    <group colspan="4" col="6">
-                           <field name="product_uom"/>
-                               <field name="product_qty"/>
-                           <field name="multi_level_bom"/>
-                       </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
@@ -276,9 +274,6 @@
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
-                        <page string="Multi-Level BoM" attrs="{'invisible':[('multi_level_bom','=',False)]}">
-                               <field colspan="4" name="child_ids" nolabel="1" string="BoM Hierarchy"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -292,7 +287,6 @@
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
                     <field name="name"/>
-                    <field name="sequence" invisible="1"/>
                     <field name="code"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
@@ -444,15 +438,7 @@
                     <field name="cycle_total" operator="+"/>
                 </graph>
             </field>
-        </record>
-
-<!--        <wizard-->
-<!--            string="Change Product Qty."-->
-<!--            model="mrp.production"-->
-<!--            name="change_production_qty"-->
-<!--            id="mrp.wizard_change_production_qty"-->
-<!--            keyword="client_action_multi"-->
-<!--            multi="True"/>-->
+        </record>        
 
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
@@ -491,9 +477,9 @@
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Consume">
-                                    <field name="product_id" select="1"/>
-                                                   <field name="product_qty" select="1" string="Qty"/>
-                                                   <field name="product_uom" select="1" string="UOM"/>
+                                    <field name="product_id" />
+                                                   <field name="product_qty"  string="Qty"/>
+                                                   <field name="product_uom"  string="UOM"/>
                                                    <button name="%(stock.move_consume)d"
                                                        string="Consume Products" type="action"
                                                        icon="gtk-go-forward" context="{'consume': True}"
@@ -501,11 +487,7 @@
                                                    <button name="%(stock.move_scrap)d"
                                                        string="Scrap Products" type="action"
                                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                                       states="draft,waiting,confirmed,assigned" />
-                                                   <field name="state"/>
-                                                   <field name="location_id" select="1" string="Source" />
-                                                   <field name="location_dest_id" select="1" string="Destination"/>
-                                                   <field name="prodlot_id" select="1"/>
+                                                       states="draft,waiting,confirmed,assigned" />                                                
                                 </tree>
                             </field>
 
@@ -513,8 +495,10 @@
                                                widget="one2many_list" mode="tree,form" height="275">
                                        <tree string="Consumed Products" editable="bottom" colors="red:state=='cancel';black:state=='done';">
                                                <field name="product_id" readonly="1"/>
-                                               <field name="product_qty" select="1" string="Qty"/>
-                                                   <field name="product_uom" select="1" string="UOM"/>
+                                               <field name="product_qty" readonly="1" string="Qty"/>
+                                                   <field name="product_uom" readonly="1" string="UOM"/>
+                                    <field name="location_dest_id"  readonly="1" string="Destination"/>
+                                                   <field name="prodlot_id" />
                                                <button
                                                        name="%(stock.track_line)d"
                                                        string="Split in production lots"
@@ -524,11 +508,8 @@
                                                        name="%(stock.move_scrap)d"
                                                        string="Scrap Products" type="action"
                                                        icon="gtk-convert"
-                                                       states="done,cancel" />
-                                               <field name="state"/>
-                                                   <field name="location_id" select="1" string="Source" />
-                                                   <field name="location_dest_id" select="1" string="Destination"/>
-                                                   <field name="prodlot_id" select="1"/>
+                                                       states="done,cancel" />                                                 
+                                                   
                                        </tree>
                                </field>
 
@@ -547,9 +528,9 @@
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
-                                    <field name="product_id" select="1"/>
-                                                   <field name="product_qty" select="1" string="Qty"/>
-                                                   <field name="product_uom" select="1" string="UOM"/>
+                                    <field name="product_id" />
+                                                   <field name="product_qty"  string="Qty"/>
+                                                   <field name="product_uom"  string="UOM"/>
                                                    <button name="%(stock.move_consume)d"
                                                        string="Consume Products" type="action"
                                                        icon="gtk-go-forward" context="{'consume': True}"
@@ -557,11 +538,7 @@
                                                    <button name="%(stock.move_scrap)d"
                                                        string="Scrap Products" type="action"
                                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                                       states="draft,waiting,confirmed,assigned" />
-                                                   <field name="state"/>
-                                                   <field name="location_id" select="1" string="Source" />
-                                                   <field name="location_dest_id" select="1" string="Destination"/>
-                                                   <field name="prodlot_id" select="1"/>
+                                                       states="draft,waiting,confirmed,assigned" />                                                
                                 </tree>
                             </field>
 
@@ -570,8 +547,7 @@
                                        <tree string="Finished Products" editable="bottom">
                                                <field name="product_id" readonly="1"/>
                                                <field name="product_qty" readonly="1"/>
-                                               <field name="product_uom" readonly="1" />
-                                               <field name="state" invisible="1" />
+                                               <field name="product_uom" readonly="1" />                                               
                                                <field name="location_id" readonly="1"/>
                                                <field name="prodlot_id" />
                                                <button name="%(stock.track_line)d"