[IMP] mrp: improvement

bzr revid: hmo@tinyerp.com-20100302092209-ngsgg0532gxffbvh

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index bea0e5f..5bb5d8a 100644 (file)
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -689,7 +689,7 @@ class mrp_production(osv.osv):
 
     def action_in_production(self, cr, uid, ids):
         move_ids = []        
-        self.write(cr, uid, ids, {'state': 'in_production'})
+        self.write(cr, uid, ids, {'state': 'in_production','date_start':time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def test_if_product(self, cr, uid, ids):

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d47311f..cf73468 100644 (file)
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -505,12 +505,12 @@
                             <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">
-                                               <field name="product_id" readonly="1"/>
-                                               <field name="product_qty" readonly="1"/>
-                                               <field name="product_uom" readonly="1" />
+                                               <field name="product_id" readonly="1" string="Product"/>
+                                               <field name="product_qty" readonly="1" string="Qty"/>
+                                               <field name="product_uom" readonly="1" string="Prod. UOM"/>
                                                <field name="state" invisible="1" />
-                                               <field name="location_id" readonly="1"/>
-                                               <field name="prodlot_id" />                                             
+                                               <field name="location_id" readonly="1" string="Source Loc."/>
+                                               <field name="prodlot_id" string="Production Lot"/>                                              
                                                <button
                                                        name="%(stock.track_line)d"
                                                        string="Split in production lots"
@@ -521,28 +521,20 @@
                                                        string="D" type="action"
                                                        icon="gtk-convert"
                                                        states="done,cancel" />
-                                       </tree>
-                                       <form string="Consumed Products">
-                                               <field name="product_id" />
-                                               <field name="product_qty" />
-                                               <field name="product_uom" />
-                                       </form>
+                                       </tree>                                         
                                </field>                                                
 
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Mark as Start" icon="gtk-execute"/>                                
+                                <button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>                                
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
                             </group>
-                        </page>
-                        <page string="Scheduled Products">
-                            <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
-                        </page>
+                        </page>                        
                         <page string="Finished Products">
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
                                mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
@@ -609,6 +601,9 @@
                             </field>
 
                         </page>
+                        <page string="Scheduled Products">
+                            <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
+                        </page>
                         <page string="Extra Information">
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>