[MERGE]

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

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 29e37f9..260deed 100644 (file)
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -438,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>
@@ -462,7 +454,9 @@
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
-                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
+                        <button type="action"
+                               name="%(mrp.action_change_production_qty)d"
+                               string="Change Qty" states="ready,confirmed" />
                         </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -484,35 +478,27 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Consume">
                                     <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string=">" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="D" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                                   <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}"
+                                                       states="draft,waiting,confirmed,assigned" />
+                                                   <button name="%(stock.move_scrap)d"
+                                                       string="Scrap Products" type="action"
+                                                       icon="gtk-justify-fill" context="{'scrap': True}"
+                                                       states="draft,waiting,confirmed,assigned" />                                                
                                 </tree>
-                                <form string="Products to Consume">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                                widget="one2many_list" mode="tree,form" height="275">
-                                       <tree string="Consumed Products" editable="bottom">
+                                       <tree string="Consumed Products" editable="bottom" colors="red:state=='cancel';black:state=='done';">
                                                <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="location_id" readonly="1"/>
-                                               <field name="prodlot_id" />
+                                               <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"
@@ -520,15 +506,11 @@
                                                        states="done,cancel" />
                                                <button
                                                        name="%(stock.move_scrap)d"
-                                                       string="D" type="action"
+                                                       string="Scrap Products" type="action"
                                                        icon="gtk-convert"
-                                                       states="done,cancel" />
+                                                       states="done,cancel" />                                                 
+                                                   
                                        </tree>
-                                       <form string="Consumed Products">
-                                               <field name="product_id" />
-                                               <field name="product_qty" />
-                                               <field name="product_uom" />
-                                       </form>
                                </field>
 
                             <group col="9" colspan="4">
@@ -547,24 +529,17 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string=">" type="action"
-                                        icon="gtk-go-forward"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="D" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                                   <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}"
+                                                       states="draft,waiting,confirmed,assigned" />
+                                                   <button name="%(stock.move_scrap)d"
+                                                       string="Scrap Products" type="action"
+                                                       icon="gtk-justify-fill" context="{'scrap': True}"
+                                                       states="draft,waiting,confirmed,assigned" />                                                
                                 </tree>
-                                <form string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
@@ -572,21 +547,15 @@
                                        <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"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                                                <button name="%(stock.move_scrap)d"
-                                                       string="D" type="action" icon="gtk-go-forward"
+                                                       string="Scrap Products" type="action" icon="gtk-go-forward"
                                                        states="done,cancel" />
                                        </tree>
-                                       <form string="Finished Products">
-                                               <field name="product_id" />
-                                               <field name="product_qty" />
-                                               <field name="product_uom" />
-                                       </form>
                                </field>
                         </page>
                         <page string="Work Orders">