From ff4bab8693d020aa733f758a660aff6863e2c95c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 31 May 2009 11:22:26 +0200
Subject: [PATCH] modifs

bzr revid: fp@tinyerp.com-20090531092226-4ne7idukti4j669o
---
 addons/mrp/mrp.py                             |  1 +
 addons/mrp/mrp_view.xml                       |  2 +-
 addons/mrp_operations/mrp_operations.py       | 73 +++++++++++--------
 addons/mrp_operations/mrp_operations_view.xml | 13 ++++
 4 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index b22d264f40c..e1f02ec39a6 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -731,6 +731,7 @@ stock_move()
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
     _description = 'Work Orders'
+    _order = 'sequence'
     _columns = {
         'name': fields.char('Work Order', size=64, required=True),
         'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8a2509e9450..38adabb19b5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -411,8 +411,8 @@
             <field name="arch" type="xml">
                 <gantt color="product_id" date_stop="date_finnished" date_start="date_start" string="Productions">
                     <level object="mrp.routing" link="routing_id" domain="[]">
-                        <field name="product_id"/>
                         <field name="origin"/>
+                        <field name="product_id"/>
                     </level>
                 </gantt>
             </field>
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 6a3ac22cbcd..324a093f1b8 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -108,13 +108,11 @@ class mrp_production_workcenter_line(osv.osv):
         result = super(mrp_production_workcenter_line, self).write(cr, uid, ids, vals, context=context)
         if vals.get('date_planned', False) and update:
             pids = {}
+            pids2 = {}
             for prod in self.browse(cr, uid, ids, context=context):
-                if prod.production_id.date_start>vals['date_planned']:
-                    pids[prod.production_id.id] = True
-                    continue
-                if prod.production_id.date_finnished<prod.date_planned_end:
-                    pids[prod.production_id.id] = True
-            self.pool.get('mrp.production').write(cr, uid, pids.keys(), {'date_start':vals['date_planned']})
+                if prod.production_id.workcenter_lines:
+                    dstart = prod.production_id.workcenter_lines[0]['date_planned']
+                    self.pool.get('mrp.production').write(cr, uid, [prod.production_id.id], {'date_start':dstart}, context=context)
         return result
 
     def action_draft(self, cr, uid, ids):
@@ -146,9 +144,10 @@ class mrp_production_workcenter_line(osv.osv):
 mrp_production_workcenter_line()
 
 class mrp_production(osv.osv):
-    _name = 'mrp.production'
     _inherit = 'mrp.production'
-    _description = 'Production'
+    _columns = {
+        'allow_reorder': fields.boolean('Free Serialisation', help="Check this to be able to move independently all production orders, without moving dependent ones."),
+    }
 
     def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
         result = {}
@@ -183,19 +182,24 @@ class mrp_production(osv.osv):
                 wc  = po.workcenter_lines[wci]
                 if (old is None) or (wc.sequence>old):
                     dt = dt_end
-                self.pool.get('mrp.production.workcenter.line').write(cr, uid, [wc.id],  {
-                    'date_planned':dt.strftime('%Y-%m-%d %H:%M:%S')
-                }, context=context, update=False)
-                i = self.pool.get('hr.timesheet.group').interval_get(
-                    cr,
-                    uid,
-                    wc.workcenter_id.timesheet_id and wc.workcenter_id.timesheet_id.id or False,
-                    dt,
-                    wc.hour or 0.0
-                )
-                old = wc.sequence
-                if i:
-                    dt_end = max(dt_end, i[-1][1])
+                if context.get('__last_update'):
+                    del context['__last_update']
+                if wc.date_planned<dt.strftime('%Y-%m-%d %H:%M:%S'):
+                    self.pool.get('mrp.production.workcenter.line').write(cr, uid, [wc.id],  {
+                        'date_planned':dt.strftime('%Y-%m-%d %H:%M:%S')
+                    }, context=context, update=False)
+                    i = self.pool.get('hr.timesheet.group').interval_get(
+                        cr,
+                        uid,
+                        wc.workcenter_id.timesheet_id and wc.workcenter_id.timesheet_id.id or False,
+                        dt,
+                        wc.hour or 0.0
+                    )
+                    if i:
+                        dt_end = max(dt_end, i[-1][1])
+                else:
+                    dt_end = DateTime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
+                old = wc.sequence or 0
             super(mrp_production, self).write(cr, uid, [po.id], {
                 'date_finnished': dt_end
             })
@@ -203,6 +207,8 @@ class mrp_production(osv.osv):
 
     def _move_pass(self, cr, uid, ids, context={}):
         for po in self.browse(cr, uid, ids, context):
+            if po.allow_reorder:
+                continue
             todo = po.move_lines
             dt = DateTime.strptime(po.date_start,'%Y-%m-%d %H:%M:%S')
             while todo:
@@ -211,26 +217,31 @@ class mrp_production(osv.osv):
                     continue
                 todo += l.move_dest_id_lines
                 if l.production_id and (l.production_id.date_finnished>dt):
-                    for wc in l.production_id.workcenter_lines:
-                        i = self.pool.get('hr.timesheet.group').interval_min_get(
-                            cr, 
-                            uid, 
-                            wc.workcenter_id.timesheet_id.id or False, 
-                            dt, wc.hour or 0.0
-                        )
+                    if l.production_id.state not in ('done','cancel'):
+                        for wc in l.production_id.workcenter_lines:
+                            i = self.pool.get('hr.timesheet.group').interval_min_get(
+                                cr, 
+                                uid, 
+                                wc.workcenter_id.timesheet_id.id or False, 
+                                dt, wc.hour or 0.0
+                            )
                         dt = i[0][0]
-                    self.write(cr, uid, [l.production_id.id], {'date_start':dt.strftime('%Y-%m-%d %H:%M:%S')})
-                    continue
+                        if l.production_id.date_start>dt.strftime('%Y-%m-%d %H:%M:%S'):
+                            self.write(cr, uid, [l.production_id.id], {'date_start':dt.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def _move_futur(self, cr, uid, ids, context={}):
         for po in self.browse(cr, uid, ids, context):
+            if po.allow_reorder:
+                continue
             for line in po.move_created_ids:
                 l = line
                 while l.move_dest_id:
                     l = l.move_dest_id
                     if l.state in ('done','cancel','draft'):
                         break
+                    if l.production_id.state in ('done','cancel'):
+                        break
                     if l.production_id and (l.production_id.date_start<po.date_finnished):
                         self.write(cr, uid, [l.production_id.id], {'date_start':po.date_finnished})
                         break
@@ -240,8 +251,6 @@ class mrp_production(osv.osv):
         direction = {}
         if vals.get('date_start', False):
             for po in self.browse(cr, uid, ids, context=context):
-                print po, po.date_start, type(po.date_start)
-                print 'o'
                 direction[po.id] = cmp(po.date_start, vals.get('date_start', False))
         result = super(mrp_production, self).write(cr, uid, ids, vals, context=context)
         if (vals.get('workcenter_lines', False) or vals.get('date_start', False)) and update:
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 823d02b0cbb..d08e3504f20 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -137,6 +137,7 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
+        <field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
         <field name="view_mode">gantt,tree,form,graph,calendar</field>
     </record>
 
@@ -276,6 +277,18 @@
         id="menu_mrp_production_operation_action"
         action="mrp_production_operation_action"/>
 
+    <record id="mrp_production_reorder_form_view" model="ir.ui.view">
+        <field name="name">mrp.production.allow_reorder.form</field>
+        <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+        <field name="model">mrp.production</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <field name="priority" position="after">
+                <field name="allow_reorder"/>
+            </field>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="operation_calendar_view">
             <field name="name">mrp.perations.calendar</field>
             <field name="model">mrp_operations.operation</field>