Merge lp:~jfb-tempo-consulting/unifield-server/US-7646 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/consumption_calculation/weekly_forecast_report.py'
--- bin/addons/consumption_calculation/weekly_forecast_report.py	2019-08-14 09:17:27 +0000
+++ bin/addons/consumption_calculation/weekly_forecast_report.py	2020-07-27 12:47:56 +0000
@@ -414,6 +414,10 @@
                     intervals.append((interval_name, interval_from, interval_to))
                     dict_int_from.setdefault(interval_from.strftime('%Y-%m-%d'), interval_name)
 
+                max_date = fixed_now
+                if intervals:
+                    max_date = intervals[-1][2]
+
                 percent_completed = 0.00
                 progress_comment = ""
                 product_ids = []
@@ -446,7 +450,12 @@
 
                 if len(product_ids) > 0:
                     ##### UFTP-220: Filter this list of products for those only appeared in the selected location of the report, not all product
-                    new_cr.execute("select distinct product_id from report_stock_inventory where location_id in %s and product_id in %s and state !='cancel'", (tuple(loc_asked_by_user),tuple(product_ids),) )
+                    new_cr.execute("""
+                        select product_id from (
+                            select product_id from report_stock_inventory where location_id in %(loc)s and product_id in %(p_id)s and state !='cancel' group by product_id
+                        UNION
+                            select product_id from purchase_order_line where location_dest_id in %(loc)s and product_id in %(p_id)s and state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') group by product_id
+                    ) x group by product_id """, {'loc': tuple(loc_asked_by_user), 'p_id': tuple(product_ids)} )
                     product_ids = []
                     for row in new_cr.dictfetchall():
                         product_ids.append(row['product_id'])
@@ -459,7 +468,7 @@
                 while t < nb_products:
                     # Get consumption, in-pipe and expired quantities for each product
                     product_cons.update(self._get_product_consumption(new_cr, uid, product_ids, location_ids, report, context=context))
-                    in_pipe_vals.update(self._get_in_pipe_vals(new_cr, uid, product_ids, location_ids, report, context=context))
+                    in_pipe_vals.update(self._get_in_pipe_vals(new_cr, uid, product_ids, location_ids, report, max_date, context=context))
                     exp_vals.update(self._get_expiry_batch(new_cr, uid, product_cons, location_ids, report, fixed_now=fixed_now, context=context))
 
                     percent_completed = (t/nb_products) * 100
@@ -766,7 +775,7 @@
 
         return res
 
-    def _get_in_pipe_vals(self, cr, uid, product_ids, location_ids, report, context=None):
+    def _get_in_pipe_vals(self, cr, uid, product_ids, location_ids, report, max_date, context=None):
         """
         Returns a dictionary with for each product in product_ids, the quantity in-pipe.
 
@@ -785,14 +794,29 @@
             context = {}
 
         res = {}
-
         cr.execute("""
-            SELECT product_id, sum(qty) AS qty, date
+        SELECT product_id, sum(qty) AS qty, date FROM (
+            SELECT
+               pol.product_id AS product_id,
+               sum(pol.product_qty/u1.factor/u2.factor) AS qty,
+               coalesce(pol.confirmed_delivery_date, pol.date_planned) AS date
             FROM
-            ((SELECT
+               purchase_order_line pol
+               LEFT JOIN product_product p ON p.id = pol.product_id
+               LEFT JOIN product_template pt ON p.product_tmpl_id = pt.id
+               LEFT JOIN product_uom u1 ON pol.product_uom = u1.id
+               LEFT JOIN product_uom u2 ON pt.uom_id = u2.id
+            WHERE
+               pol.location_dest_id IN %(location_ids)s AND
+               pol.product_id IN %(product_ids)s  AND
+               pol.state IN ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') AND
+               coalesce(pol.confirmed_delivery_date, pol.date_planned) <= %(max_date)s
+            GROUP BY pol.product_id, coalesce(pol.confirmed_delivery_date, pol.date_planned)
+        UNION
+            SELECT
                p.id AS product_id,
                sum(-s.product_qty/u1.factor/u2.factor) AS qty,
-               s.date AS date
+               date(s.date) AS date
             FROM
                stock_move s
                LEFT JOIN product_product p ON p.id = s.product_id
@@ -800,29 +824,16 @@
                LEFT JOIN product_uom u1 ON s.product_uom = u1.id
                LEFT JOIN product_uom u2 ON pt.uom_id = u2.id
             WHERE
-               s.location_id IN %(location_ids)s
-               AND
-               s.product_id IN %(product_ids)s
-               AND
-               s.state IN ('assigned', 'confirmed')
-               AND
-               s.id NOT IN 
-                    (SELECT
-                        l.move_dest_id
-                     FROM
-                        purchase_order_line l
-                        LEFT JOIN purchase_order o ON o.id = l.order_id
-                     WHERE
-                        l.move_dest_id IS NOT NULL
-                        AND
-                        o.state NOT IN ('approved', 'except_picking', 'except_invoice', 'done')
-                    )
-            GROUP BY p.id, s.date)
+               s.location_id IN %(location_ids)s AND
+               s.product_id IN %(product_ids)s  AND
+               s.state IN ('assigned', 'confirmed') AND
+               s.date <= %(max_date)s
+            GROUP BY p.id, date(s.date)
         UNION
-            (SELECT
+            SELECT
                p.id AS product_id,
                sum(s.product_qty/u1.factor/u2.factor) AS qty,
-               s.date AS date
+               date(s.date) AS date
             FROM
                stock_move s
                LEFT JOIN product_product p ON p.id = s.product_id
@@ -830,29 +841,18 @@
                LEFT JOIN product_uom u1 ON s.product_uom = u1.id
                LEFT JOIN product_uom u2 ON pt.uom_id = u2.id
             WHERE
-              s.location_dest_id IN %(location_ids)s
-              AND
-              s.product_id IN %(product_ids)s
-              AND
-              s.state IN ('assigned', 'confirmed')
-              AND
-              s.id NOT IN 
-                   (SELECT
-                       l.move_dest_id
-                    FROM
-                       purchase_order_line l
-                       LEFT JOIN purchase_order o ON o.id = l.order_id
-                    WHERE
-                       l.move_dest_id IS NOT NULL
-                       AND
-                       o.state NOT IN ('approved', 'except_picking', 'except_invoice', 'done')
-                   )
-            GROUP BY p.id, s.date))
+              s.location_dest_id IN %(location_ids)s AND
+              s.product_id IN %(product_ids)s AND
+              s.state IN ('assigned', 'confirmed') AND
+              s.date <= %(max_date)s
+            GROUP BY p.id, date(s.date)
+        )
             AS subrequest
             GROUP BY product_id, date;
         """, {
             'location_ids': tuple(location_ids),
-            'product_ids': tuple(product_ids)
+            'product_ids': tuple(product_ids),
+            'max_date': max_date.strftime('%Y-%m-%d'),
         })
 
         for r in cr.dictfetchall():

=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2020-03-02 07:55:11 +0000
+++ bin/addons/mission_stock/mission_stock.py	2020-07-27 12:47:56 +0000
@@ -934,13 +934,26 @@
 
         for report_id in report_ids:
             # In-Pipe moves
-            cr.execute('''SELECT m.product_id, sum(m.product_qty), m.product_uom, p.name
-                          FROM stock_move m
-                              LEFT JOIN stock_picking s ON m.picking_id = s.id
-                              LEFT JOIN res_partner p ON s.partner_id2 = p.id
-                          WHERE s.type = 'in' AND m.state in ('confirmed', 'waiting', 'assigned')
-                          GROUP BY m.product_id, m.product_uom, p.name
-                          ORDER BY m.product_id''')
+            cr.execute('''
+              SELECT product_id, sum(product_qty), uom_id, p_name
+              FROM (
+                SELECT pol.product_id as product_id, sum(pol.product_qty) as product_qty, pol.product_uom as uom_id, p.name as p_name
+                    FROM purchase_order_line pol, purchase_order po, res_partner p
+                WHERE
+                    pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
+                    po.id = pol.order_id and
+                    po.partner_id = p.id
+                GROUP BY pol.product_id, pol.product_uom, p.name
+                UNION
+                SELECT m.product_id as product_id, sum(m.product_qty) as product_qty, m.product_uom as uom_id, p.name as p_name
+                    FROM stock_move m
+                    LEFT JOIN stock_picking s ON m.picking_id = s.id
+                    LEFT JOIN res_partner p ON s.partner_id2 = p.id
+                  WHERE
+                    s.type = 'in' AND m.state in ('confirmed', 'waiting', 'assigned')
+                  GROUP BY m.product_id, m.product_uom, p.name
+                ) x GROUP BY product_id, product_qty, uom_id, p_name
+                  ORDER BY product_id''')
 
             in_pipe_moves = cr.fetchall()
             current_product = None

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2020-04-21 16:07:23 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2020-07-27 12:47:56 +0000
@@ -210,9 +210,9 @@
         if not po_name:
             raise osv.except_osv(_('Error'), _('No PO name found in the given import file'))
 
-        po_id = self.search(cr, uid, [('name', '=', po_name), ('state', 'in', ['validated', 'validated_p'])], context=context)
+        po_id = self.search(cr, uid, [('name', '=', po_name), ('state', 'in', ['validated', 'validated_p', 'confirmed', 'confirmed_p'])], context=context)
         if not po_id:
-            raise osv.except_osv(_('Error'), _('No validated PO found with the name %s') % po_name)
+            raise osv.except_osv(_('Error'), _('No available PO found with the name %s') % po_name)
 
         return po_id[0]
 
@@ -348,9 +348,10 @@
                 if pol.line_number in context.get('line_number_to_confirm', []) or \
                         (pol.external_ref and pol.external_ref in context.get('ext_ref_to_confirm', [])):
                     try:
-                        self.pool.get('purchase.order.line').button_confirmed(cr, uid, [pol.id], context=context)
-                        cr.commit()
-                        nb_pol_confirmed += 1
+                        if pol.state not in ['confirmed', 'done', 'cancel', 'cancel_r']:
+                            self.pool.get('purchase.order.line').button_confirmed(cr, uid, [pol.id], context=context)
+                            cr.commit()
+                            nb_pol_confirmed += 1
                     except:
                         context['rejected_confirmation'] += 1
                         cr.rollback()

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2020-02-17 11:35:43 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2020-07-27 12:47:56 +0000
@@ -1537,7 +1537,7 @@
         'in_ext_ref': fields.char(size=256, string='External Ref.', readonly=True),
         'type_change': fields.selection([('', ''), ('error', 'Error'), ('new', 'New'),
                                          ('split', 'Split'), ('del', 'Del'),
-                                         ('ignore', 'Ignore'), ('warning', 'Warning')],
+                                         ('ignore', 'Ignore'), ('warning', 'Warning'), ('cdd', 'CDD')],
                                         string='Change type', readonly=True),
         'imp_product_id': fields.many2one('product.product', string='Product',
                                           readonly=True),
@@ -1615,10 +1615,39 @@
                 self.write(cr, uid, [line.id], {'type_change': 'ignore'}, context=context)
                 continue
 
-            if line.po_line_id.state in ('confirmed', 'done'):
+            if line.po_line_id.state == 'done':
                 write_vals['type_change'] = 'warning'
                 warnings.append(_('PO line has been confirmed and consequently is not editable'))
 
+            # Delivery Confirmed Date
+            dcd_value = values[11]
+            if dcd_value and type(dcd_value) == type(DateTime.now()):
+                write_vals['imp_dcd'] = dcd_value.strftime('%Y-%m-%d')
+            elif dcd_value and isinstance(dcd_value, str):
+                try:
+                    time.strptime(dcd_value, '%Y-%m-%d')
+                    write_vals['imp_dcd'] = dcd_value
+                except ValueError:
+                    err_msg = _('Incorrect date value for field \'Delivery Confirmed Date\'')
+                    errors.append(err_msg)
+                    write_vals['type_change'] = 'error'
+            elif dcd_value:
+                err_msg = _('Incorrect date value for field \'Delivery Confirmed Date\'')
+                errors.append(err_msg)
+                write_vals['type_change'] = 'error'
+
+            if line.po_line_id.state == 'confirmed':
+                if write_vals.get('imp_dcd') and write_vals.get('imp_dcd') != line.in_dcd:
+                    if self.pool.get('stock.move').search_exists(cr ,uid, [('purchase_line_id', '=', line.po_line_id.id), ('type', '=', 'in'), ('state', '=', 'done')], context=context):
+                        write_vals['type_change'] = 'warning'
+                        warnings.append(_("IN for line %s has been parially processed, CDD can't be changed") % (line.in_line_number,))
+                    else:
+                        write_vals['type_change'] = 'cdd'
+                if not write_vals.get('type_change'):
+                    write_vals['type_change'] = 'ignore'
+                self.write(cr, uid, [line.id], write_vals, context=context)
+                continue
+
             # External Ref.
             write_vals['imp_external_ref'] = values[1]
             pol_ids = None
@@ -1840,22 +1869,6 @@
                 errors.append(err_msg)
                 write_vals['type_change'] = 'error'
 
-            # Delivery Confirmed Date
-            dcd_value = values[11]
-            if dcd_value and type(dcd_value) == type(DateTime.now()):
-                write_vals['imp_dcd'] = dcd_value.strftime('%Y-%m-%d')
-            elif dcd_value and isinstance(dcd_value, str):
-                try:
-                    time.strptime(dcd_value, '%Y-%m-%d')
-                    write_vals['imp_dcd'] = dcd_value
-                except ValueError:
-                    err_msg = _('Incorrect date value for field \'Delivery Confirmed Date\'')
-                    errors.append(err_msg)
-                    write_vals['type_change'] = 'error'
-            elif dcd_value:
-                err_msg = _('Incorrect date value for field \'Delivery Confirmed Date\'')
-                errors.append(err_msg)
-                write_vals['type_change'] = 'error'
 
             # ESC Confirmed
             if write_vals.get('imp_dcd') and line.simu_id.order_id.partner_type == 'esc':
@@ -1939,6 +1952,14 @@
                 cr.commit()
                 continue
 
+            if line.type_change == 'cdd':
+                line_obj.write(cr, uid, [line.po_line_id.id], {'confirmed_delivery_date': line.imp_dcd}, context=context)
+                in_ids = self.pool.get('stock.move').search(cr ,uid, [('purchase_line_id', '=', line.po_line_id.id), ('type', '=', 'in'), ('state', 'in', ['confirmed', 'assigned'])], context=context)
+                if in_ids:
+                    self.pool.get('stock.move').write(cr, uid, in_ids, {'date_expected': line.imp_dcd}, context=context)
+
+                cr.commit()
+                continue
             line_vals = {
                 'product_id': line.imp_product_id.id,
                 'product_uom': line.imp_uom.id,

=== modified file 'bin/addons/msf_order_date/wizard/update_lines.py'
--- bin/addons/msf_order_date/wizard/update_lines.py	2019-07-22 12:08:20 +0000
+++ bin/addons/msf_order_date/wizard/update_lines.py	2020-07-27 12:47:56 +0000
@@ -53,6 +53,8 @@
 
         for obj in obj_obj.browse(cr, uid, obj_ids, context=context):
             delivery_requested_date = obj.delivery_requested_date
+            if type == 'purchase.order' and obj.state != 'draft':
+                delivery_requested_date = obj.delivery_requested_date_modified
             delivery_confirmed_date = obj.delivery_confirmed_date
             stock_take_date = obj.stock_take_date
 
@@ -153,13 +155,17 @@
         # working objects
         obj_ids = context.get('active_ids', [])
 
+        ftf = ['delivery_requested_date']
         if obj_type == 'purchase.order':
             line_obj = self.pool.get('purchase.order.line')
+            ftf += ['state', 'delivery_requested_date_modified']
         else:
             line_obj = self.pool.get('sale.order.line')
 
-        for obj in obj_obj.browse(cr, uid, obj_ids, fields_to_fetch=['delivery_requested_date'], context=context):
+        for obj in obj_obj.browse(cr, uid, obj_ids, fields_to_fetch=ftf, context=context):
             requested_date = obj.delivery_requested_date
+            if obj_type == 'purchase.order' and obj.state != 'draft':
+                requested_date = obj.delivery_requested_date_modified
             dom = [('order_id', '=', obj.id), ('state', 'in',['draft', 'validated', 'validated_n'])]
             if selected and context.get('button_selected_ids'):
                 dom += [('id', 'in', context['button_selected_ids'])]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-07-24 12:56:20 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-07-27 12:47:56 +0000
@@ -564,7 +564,14 @@
             <field name="method">sync_msg_from_itself</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF18.0 -->
+=======
+        <record id="us_7646_dest_loc_on_pol" model="patch.scripts">
+            <field name="method">us_7646_dest_loc_on_pol</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
         <record id="us_6544_no_sync_on_forced_out" model="patch.scripts">
             <field name="method">us_6544_no_sync_on_forced_out</field>
         </record>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-07-24 12:56:20 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-07-27 12:47:56 +0000
@@ -53,6 +53,7 @@
     }
 
     # UF18.0
+<<<<<<< TREE
     def us_7412_set_fy_closure_settings(self, cr, uid, *a, **b):
         """
         Sets the Fiscal Year Closure options depending on the OC.
@@ -73,6 +74,97 @@
                              SET has_move_regular_bs_to_0 = %s, has_book_pl_results = %s;
                              """
             cr.execute(update_company, (has_move_regular_bs_to_0, has_book_pl_results))
+=======
+    def us_7646_dest_loc_on_pol(self, cr, uid, *a, **b):
+        data_obj = self.pool.get('ir.model.data')
+        try:
+            service_id = self.pool.get('stock.location').get_service_location(cr, uid)
+            conso_id = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
+            log_id = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_logistic')[1]
+            med_id = data_obj.get_object_reference(cr, uid, 'msf_config_locations', 'stock_location_medical')[1]
+            cross_dock_id =  data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_cross_docking')[1]
+        except:
+            return True
+
+        cr.execute('''update purchase_order_line set location_dest_id = %s where id in (
+            select pol.id
+            from purchase_order_line pol, purchase_order po, product_product prod, product_template tmpl
+            where
+                pol.order_id = po.id and
+                pol.product_id = prod.id and
+                tmpl.id = prod.product_tmpl_id and
+                tmpl.type = 'service_recep' and
+                coalesce(po.cross_docking_ok, 'f') = 'f' and
+                pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n')
+            ) ''', (service_id,))
+        self._logger.warn('POL loc_dest service on %s lines' % (cr.rowcount,))
+
+        cr.execute('''update purchase_order_line set location_dest_id = %s where id in (
+            select pol.id
+            from purchase_order_line pol, purchase_order po, product_product prod, product_template tmpl
+            where
+                pol.order_id = po.id and
+                pol.product_id = prod.id and
+                tmpl.id = prod.product_tmpl_id and
+                tmpl.type = 'consu' and
+                pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n')
+            ) ''', (conso_id,))
+        self._logger.warn('POL loc_dest conso on %s lines' % (cr.rowcount,))
+
+        cr.execute('''update purchase_order_line set location_dest_id = so.location_requestor_id
+                        from sale_order so, sale_order_line sol, stock_location loc, product_product prod, product_template tmpl
+                        where
+                            so.id = sol.order_id and
+                            loc.id = so.location_requestor_id and
+                            loc.usage != 'customer' and
+                            so.procurement_request = 't' and
+                            purchase_order_line.linked_sol_id = sol.id and
+                            purchase_order_line.product_id = prod.id and
+                            tmpl.id = prod.product_tmpl_id and
+                            tmpl.type != 'consu' and
+                            purchase_order_line.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') ''', (conso_id,))
+        self._logger.warn('POL loc_dest IR on %s lines' % (cr.rowcount,))
+
+        cr.execute('''update purchase_order_line set location_dest_id = %s from purchase_order po
+                        where
+                            po.id = purchase_order_line.order_id and
+                            purchase_order_line.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
+                            coalesce(po.cross_docking_ok, 'f') = 't' and
+                            location_dest_id is NULL ''', (cross_dock_id,))
+        self._logger.warn('POL loc_dest Cross Dock on %s lines' % (cr.rowcount,))
+
+        cr.execute('''update purchase_order_line set location_dest_id = %s
+                    from product_product prod, product_template tmpl, product_nomenclature nom
+                    where
+                        purchase_order_line.product_id = prod.id and
+                        tmpl.nomen_manda_0 = nom.id and
+                        nom.name = 'MED' and
+                        tmpl.id = prod.product_tmpl_id and
+                        location_dest_id is NULL and
+                        purchase_order_line.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') ''', (med_id,))
+        self._logger.warn('POL loc_dest MED on %s lines' % (cr.rowcount,))
+
+        cr.execute('''update purchase_order_line set location_dest_id = %s
+                    from product_product prod, product_template tmpl, product_nomenclature nom
+                    where
+                        purchase_order_line.product_id = prod.id and
+                        tmpl.nomen_manda_0 = nom.id and
+                        nom.name = 'LOG' and
+                        tmpl.id = prod.product_tmpl_id and
+                        location_dest_id is NULL and
+                        purchase_order_line.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') ''', (log_id,))
+        self._logger.warn('POL loc_dest LOG on %s lines' % (cr.rowcount,))
+        return True
+
+
+    def sync_msg_from_itself(self, cr, uid, *a, **b):
+        instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if not instance:
+            return True
+        cr.execute(''' update sync_client_message_received set run='t', manually_ran='t', log='Set manually to run without execution', manually_set_run_date=now() where run='f' and source=%s ''', (instance.instance, ))
+        self._logger.warn('Set %s self sync messages as Run' % (cr.rowcount,))
+        return True
+>>>>>>> MERGE-SOURCE
 
 
     def us_6544_no_sync_on_forced_out(self, cr, uid, *a, **b):

=== modified file 'bin/addons/procurement_cycle/replenishment.py'
--- bin/addons/procurement_cycle/replenishment.py	2020-06-09 09:28:55 +0000
+++ bin/addons/procurement_cycle/replenishment.py	2020-07-27 12:47:56 +0000
@@ -15,6 +15,7 @@
 import decimal_precision as dp
 import math
 
+life_cycle_status = [('active', _('Active')), ('new', _('New')), ('replaced', _('Replaced')), ('replacing', _('Replacing')), ('phasingout', _('Phasing Out')), ('activereplacing', _('Active-Replacing'))]
 class replenishment_location_config(osv.osv):
     _name = 'replenishment.location.config'
     _description = 'Location Configuration'
@@ -387,7 +388,7 @@
                 for prod in cr.fetchall():
                     self.pool.get('replenishment.segment.line').create(cr, uid, {'state': 'active', 'product_id': prod[0], 'segment_id': hidden_seg}, context=context)
 
-                # in pipe at coo / only project
+                # move in pipe at coo / only project
                 cr.execute('''
                     select move.product_id from
                         stock_move move, stock_picking p
@@ -410,6 +411,27 @@
                 for prod in cr.fetchall():
                     self.pool.get('replenishment.segment.line').create(cr, uid, {'state': 'active', 'product_id': prod[0], 'segment_id': hidden_seg}, context=context)
 
+                # PO lines
+                cr.execute('''
+                    select pol.product_id from
+                        purchase_order_line pol
+                    where
+                        pol.location_dest_id in %s and
+                        pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
+                        pol.product_id not in (
+                              select
+                                seg_line.product_id
+                            from replenishment_segment_line seg_line, replenishment_segment seg
+                            where
+                                seg.state in ('draft', 'complete') and seg_line.segment_id = seg.id and seg.location_config_id = %s
+
+                        )
+                    group by pol.product_id
+                ''', (tuple(amc_location_ids), loc_config.id))
+
+                for prod in cr.fetchall():
+                    self.pool.get('replenishment.segment.line').create(cr, uid, {'state': 'active', 'product_id': prod[0], 'segment_id': hidden_seg}, context=context)
+
         return True
 
 replenishment_location_config()
@@ -693,15 +715,28 @@
 
             loc_ids = [x.id for x in seg.local_location_ids]
             cr.execute('''
-                select l.product_id, min(m.date) from stock_move m, stock_picking p, replenishment_segment_line l
+              select prod_id, min(date) from (
+                  select pol.product_id as prod_id, min(coalesce(pol.confirmed_delivery_date, pol.date_planned)) as date
+                        from
+                          purchase_order_line pol, replenishment_segment_line l
+                        where
+                          l.product_id = pol.product_id and
+                          l.segment_id = %(seg_id)s and
+                          pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
+                          location_dest_id in %(location_id)s
+                        group by pol.product_id
+                UNION
+                    select l.product_id as prod_id, min(m.date) as date from stock_move m, stock_picking p, replenishment_segment_line l
                     where
                         m.picking_id = p.id and
                         m.state in ('assigned', 'confirmed') and
-                        m.location_dest_id in %s and
+                        m.location_dest_id in %(location_id)s and
                         l.product_id = m.product_id and
-                        l.segment_id = %s
+                        l.segment_id = %(seg_id)s
                     group by l.product_id
-                    ''', (tuple(loc_ids), seg.id)
+                ) x
+                group by prod_id
+                    ''', {'location_id': tuple(loc_ids), 'seg_id': seg.id}
                        )
             prod_eta = {}
             for x in cr.fetchall():
@@ -810,6 +845,7 @@
                 total_month_oc = 0
 
                 valid_rr_fmc = True
+                valid_line = True
                 before_today = False
                 before_oc = False
                 before_rdd = False
@@ -823,15 +859,29 @@
                 if seg.rule == 'cycle':
 
                     cr.execute('''
-                        select m.date, sum(product_qty) from stock_move m, stock_picking p
+                    select date, sum(qty) from (
+                        select coalesce(pol.confirmed_delivery_date, pol.date_planned) as date, sum(pol.product_qty) as qty
+                        from
+                          purchase_order_line pol
+                        where
+                          pol.product_id=%(product_id)s and
+                          pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
+                          location_dest_id in %(location_id)s and
+                          coalesce(pol.confirmed_delivery_date, pol.date_planned) <= %(date)s
+                        group by coalesce(pol.confirmed_delivery_date, pol.date_planned)
+                        UNION
+
+                        select date(m.date) as date, sum(product_qty) as product_qty from stock_move m, stock_picking p
                             where
                                 m.picking_id = p.id and
                                 m.state in ('assigned', 'confirmed') and
-                                m.location_dest_id in %s and
-                                m.product_id = %s and
-                                m.date <= %s
-                            group by m.date
-                            ''', (tuple(loc_ids), line.product_id.id, oc)
+                                m.location_dest_id in %(location_id)s and
+                                m.product_id = %(product_id)s and
+                                m.date <= %(date)s
+                            group by date(m.date)
+                        ) x
+                    group by date
+                            ''', {'location_id': tuple(loc_ids), 'product_id': line.product_id.id, 'date': oc}
                                )
                     pipe_data = {}
                     for x in cr.fetchall():
@@ -967,6 +1017,8 @@
                     else:
                         valid_rr_fmc = before_today and before_rdd
 
+                    valid_line = valid_rr_fmc
+
                     if review_id and loc_ids and seg.rule == 'cycle':
                         total_expired_qty = sum_line[line.id].get('expired_rdd_oc', 0) + sum_line[line.id].get('expired_before_rdd', 0)
                         for nb_month in range(1, line.segment_id.projected_view+1):
@@ -996,19 +1048,31 @@
                         # sum fmc from today to ETC - qty in stock
                         #qty_lacking =  max(0, total_fmc - sum_line.get(line.id, {}).get('pas_no_pipe_no_fmc', 0))
                         if total_month_oc+total_month:
-                            ss_stock = seg.safety_stock * ((total_fmc_oc+total_fmc)/(total_month_oc+total_month))
-                        if total_month and pas and pas <= line.buffer_qty + seg.safety_stock * (total_fmc / total_month):
-                            wmsg = _('Projected use of safety stock/buffer')
-                            warnings.append(wmsg)
-                            warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('SS used'))))
-                        if qty_lacking:
-                            wmsg = _('Stock-out before next RDD')
-                            warnings.append(wmsg)
-                            warnings_html.append('<span title="%s">%s</span>'  % (misc.escape_html(wmsg), misc.escape_html(_('Stock out'))))
+                            if line.status == 'replacing':
+                                ss_stock = seg.safety_stock * ((total_fmc_oc+total_fmc)/(line.segment_id.order_coverage+int(line.segment_id.total_lt)/30.44))
+                            else:
+                                ss_stock = seg.safety_stock * ((total_fmc_oc+total_fmc)/(total_month_oc+total_month))
+
+                        if line.status != 'phasingout':
+                            if total_month and pas and pas <= line.buffer_qty + seg.safety_stock * (total_fmc / total_month):
+                                wmsg = _('Projected use of safety stock/buffer')
+                                warnings.append(wmsg)
+                                warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('SS used'))))
+                            if qty_lacking:
+                                wmsg = _('Stock-out before next RDD')
+                                warnings.append(wmsg)
+                                warnings_html.append('<span title="%s">%s</span>'  % (misc.escape_html(wmsg), misc.escape_html(_('Stock out'))))
+
+                        if line.status == 'activereplacing':
+                            replaced_lack = lacking_by_prod.get(line.replaced_product_id.id)
+                            if replaced_lack:
+                                wmsg = _('SODate of linked products is %s') % (self.pool.get('date.tools').get_date_formatted(cr, uid, datetime=replaced_lack.strftime('%Y-%m-%d'), context=context))
+                                warnings.append(wmsg)
+                                warnings_html.append('<span title="%s">%s</span>'  % (misc.escape_html(wmsg), misc.escape_html(_('Replaced SO'))))
 
                         if lacking:
                             qty_lacking_needed_by = today + relativedelta(days=month_of_supply*30.44)
-                    if review_id and round(sum_line.get(line.id, {}).get('expired_before_rdd',0)):
+                    if line.status != 'phasingout' and review_id and round(sum_line.get(line.id, {}).get('expired_before_rdd',0)):
                         wmsg = _('Forecasted expiries')
                         warnings.append(wmsg)
                         warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Expiries'))))
@@ -1016,39 +1080,57 @@
                     if line.status == 'replaced':
                         proposed_order_qty = 0
                         qty_lacking = 0
+                    elif line.status == 'phasingout':
+                        proposed_order_qty = 0
+                        qty_lacking = False
                     else:
                         proposed_order_qty = max(0, total_fmc_oc + ss_stock + line.buffer_qty + sum_line.get(line.id, {}).get('expired_rdd_oc',0) - pas - line.pipeline_between_rdd_oc)
 
                 elif seg.rule == 'minmax':
-                    proposed_order_qty = max(0, line.max_qty - sum_line.get(line.id, {}).get('real_stock') + sum_line.get(line.id, {}).get('reserved_stock_qty') + sum_line.get(line.id, {}).get('expired_qty_before_eta', 0) - line.pipeline_before_rdd)
+                    valid_line = bool(line.min_qty) and bool(line.max_qty)
+                    if line.status in ('phasingout', 'replaced'):
+                        proposed_order_qty = 0
+                        qty_lacking = False
+                    else:
+                        proposed_order_qty = max(0, line.max_qty - sum_line.get(line.id, {}).get('real_stock') + sum_line.get(line.id, {}).get('reserved_stock_qty') + sum_line.get(line.id, {}).get('expired_qty_before_eta', 0) - line.pipeline_before_rdd)
 
-                    if line.status != 'new' and sum_line.get(line.id, {}).get('real_stock') - sum_line.get(line.id, {}).get('expired_qty_before_eta') <= line.min_qty:
-                        if sum_line.get(line.id, {}).get('expired_qty_before_eta'):
-                            wmsg = _('Alert: "inventory – batches expiring before ETA <= Min"')
-                            warnings.append(wmsg)
-                            warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Expiries'))))
-                        else:
-                            wmsg = _('Alert: "inventory <= Min"')
-                            warnings.append(wmsg)
-                            warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Insufficient'))))
+                        qty_lacking = line.min_qty - sum_line.get(line.id, {}).get('real_stock') + sum_line.get(line.id, {}).get('reserved_stock_qty') - sum_line.get(line.id, {}).get('expired_qty_before_eta')
+                        if line.status != 'new' and sum_line.get(line.id, {}).get('real_stock') - sum_line.get(line.id, {}).get('expired_qty_before_eta') <= line.min_qty:
+                            if sum_line.get(line.id, {}).get('expired_qty_before_eta'):
+                                wmsg = _('Alert: "inventory – batches expiring before ETA <= Min"')
+                                warnings.append(wmsg)
+                                warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Expiries'))))
+                            else:
+                                wmsg = _('Alert: "inventory <= Min"')
+                                warnings.append(wmsg)
+                                warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Insufficient'))))
                 else:
-                    proposed_order_qty = line.auto_qty
+                    valid_line = bool(line.auto_qty)
+                    if line.status in ('phasingout', 'replaced'):
+                        proposed_order_qty = 0
+                    else:
+                        proposed_order_qty = line.auto_qty
 
                 if not valid_rr_fmc:
                     wmsg = _('Invalid FMC')
                     warnings.append(wmsg)
                     warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('FMC'))))
 
-                if review_id and month_of_supply and month_of_supply*30.44 > (seg_rdd-today).days + line.segment_id.safety_stock*30.44:
-                    wmsg = _('Excess Stock')
-                    warnings.append(wmsg)
-                    warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Excess'))))
-
-                if review_id and seg.hidden:
-                    wmsg = _('Product is not in any related segment, only in stock / pipeline of location')
-                    warnings.append(wmsg)
-                    warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('No Segment'))))
-
+                if line.status != 'phasingout':
+                    if review_id and month_of_supply and month_of_supply*30.44 > (seg_rdd-today).days + line.segment_id.safety_stock*30.44:
+                        wmsg = _('Excess Stock')
+                        warnings.append(wmsg)
+                        warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Excess'))))
+
+                    if review_id and seg.hidden:
+                        wmsg = _('Product is not in any related segment, only in stock / pipeline of location')
+                        warnings.append(wmsg)
+                        warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('No Segment'))))
+
+                    if prod_eta.get(line.product_id.id) and prod_eta.get(line.product_id.id) < time.strftime('%Y-%m-%d'):
+                        wmsg = _('Pipeline in the past')
+                        warnings.append(wmsg)
+                        warnings_html.append('<span title="%s">%s</span>' % (misc.escape_html(wmsg), misc.escape_html(_('Delay'))))
 
                 #lacking_by_prod[line.product_id.id] = qty_lacking_needed_by
                 line_data = {
@@ -1058,17 +1140,22 @@
                     'pipeline_qty': round(line.pipeline_before_rdd or 0),
                     'eta_for_next_pipeline': prod_eta.get(line.product_id.id, False),
                     'reserved_stock_qty': sum_line.get(line.id, {}).get('reserved_stock_qty'),
-                    'qty_lacking': False if seg.rule !='cycle' else round(qty_lacking),
+                    'qty_lacking': False if seg.rule not in ('cycle', 'minmax') else round(qty_lacking),
                     'qty_lacking_needed_by': qty_lacking_needed_by and qty_lacking_needed_by.strftime('%Y-%m-%d') or False,
                     'expired_qty_before_cons': False if seg.rule !='cycle' else round(sum_line.get(line.id, {}).get('expired_before_rdd',0)),
                     'expired_qty_before_eta': round(sum_line.get(line.id, {}).get('expired_qty_before_eta',0)),
                     'warning': False,
                     'warning_html': False,
-                    'valid_rr_fmc': valid_rr_fmc,
+                    'valid_rr_fmc': valid_line,
                     'status': line.status,
                     'open_loan': sum_line.get(line.id, {}).get('open_loan', False),
                     'open_donation': sum_line.get(line.id, {}).get('open_donation', False),
+                    'auto_qty': line.auto_qty if seg.rule =='auto' else False,
+                    'buffer_qty': line.buffer_qty if seg.rule =='cycle' else False,
+                    'min_max': '',
                 }
+                if seg.rule == 'minmax':
+                    line_data['min_max'] = '%d / %d' % (line.min_qty, line.max_qty)
 
                 # order_cacl
                 if not review_id:
@@ -1083,11 +1170,13 @@
                         'projected_stock_qty': round(pas),
                         'cost_price': line.product_id.standard_price,
                     })
+
                     order_calc_line.create(cr, uid, line_data, context=context)
 
                 else: # review
                     if seg.hidden:
                         line_data['valid_rr_fmc'] = False
+                    line_data['paired_product_id'] = line.replacing_product_id and line.replacing_product_id.id or line.replaced_product_id and line.replaced_product_id.id
                     std_dev_hmc = False
                     amc = False
                     if total_fmc_hmc.get(line.product_id.id):
@@ -1138,8 +1227,6 @@
                         'rule': seg.rule,
                         'min_qty': line.min_qty,
                         'max_qty': line.max_qty,
-                        'auto_qty': line.auto_qty,
-                        'buffer_qty': line.buffer_qty,
                         'safety_stock': seg.safety_stock * coeff,
                         'pas_ids': detailed_pas,
                         'segment_line_id': line.id,
@@ -1251,164 +1338,178 @@
         return True
 
     def import_lines(self, cr, uid, ids, context=None):
+        ''' import replenishment.segment '''
+
         product_obj = self.pool.get('product.product')
         seg_line_obj = self.pool.get('replenishment.segment.line')
+        wizard_obj = self.pool.get('physical.inventory.import.wizard')
 
         seg = self.browse(cr, uid, ids[0],  context=context)
         if not seg.file_to_import:
             raise osv.except_osv(_('Error'), _('Nothing to import.'))
-        file_data = SpreadsheetXML(xmlstring=base64.decodestring(seg.file_to_import))
-
-        existing_line = {}
-        for line in seg.line_ids:
-            existing_line[line.product_id.default_code] =line.id
-
-        idx = -1
-
-        status = {
-            _('Active'): 'active',
-            _('New'): 'new',
-            _('Replaced'): 'replaced',
-            _('Replacing'): 'replacing',
-        }
-        error = []
-        code_created = {}
-        created = 0
-        updated = 0
-        ignored = 0
-        for row in file_data.getRows():
-            idx += 1
-            if idx < 8:
-                # header
-                continue
-            line_error = []
-            prod_code = row.cells[0].data
-            if not prod_code:
-                continue
-            prod_code = prod_code.strip()
-
-            cells_nb = len(row.cells)
-
-            data_towrite = {
-                'status': cells_nb > 3 and status.get(row.cells[3].data and row.cells[3].data.strip()),
-                'replacing_product_id': False,
-                'replaced_product_id': False,
-                'buffer_qty': False,
-                'min_qty': 0,
-                'max_qty': 0,
-                'auto_qty': 0
-            }
-            for fmc in range(1, 13):
-                data_towrite.update({
-                    'rr_fmc_%d' % fmc: False,
-                    'rr_fmc_from_%d' % fmc: False,
-                    'rr_fmc_to_%d' % fmc: False,
-                })
-
-
-            col_replacing = 4
-            col_replaced = 5
-            col_buffer_min_qty = 8
-            col_first_fmc = 9
-
-            if cells_nb > col_replacing and row.cells[col_replacing].data and row.cells[col_replacing].data.strip():
-                if data_towrite['status'] != 'replaced':
-                    line_error.append(_('Line %d: you can not set a Replacing product on this line, please change the satus or remove the replacing product') % (idx+1, ))
-                else:
-                    replacing_id = product_obj.search(cr, uid, [('default_code', '=ilike', row.cells[col_replacing].data.strip())], context=context)
-                    if not replacing_id:
-                        line_error.append(_('Line %d: replacing product code %s not found') % (idx+1, row.cells[col_replacing].data))
-                    else:
-                        data_towrite['replacing_product_id'] = replacing_id[0]
-            elif data_towrite['status'] == 'replaced' and not data_towrite['replacing_product_id']:
-                line_error.append(_('Line %d: replacing product must be set !') % (idx+1, ))
-
-            if cells_nb > col_replaced and row.cells[col_replaced].data and row.cells[col_replaced].data.strip():
-                if data_towrite['status'] != 'replacing':
-                    line_error.append(_('Line %d: you can not set a Replaced product on this line, please change the satus or remove the replaced product') % (idx+1, ))
-                else:
-                    replaced_id = product_obj.search(cr, uid, [('default_code', '=ilike', row.cells[col_replaced].data.strip())], context=context)
-                    if not replaced_id:
-                        line_error.append(_('Line %d: replaced product code %s not found') % (idx+1, row.cells[col_replaced].data))
-                    else:
-                        data_towrite['replaced_product_id'] = replaced_id[0]
-            elif data_towrite['status'] == 'replacing' and not data_towrite['replaced_product_id']:
-                line_error.append(_('Line %d: replaced product must be set !') % (idx+1, ))
-
-
-            if cells_nb > col_buffer_min_qty and seg.rule == 'cycle':
-                if row.cells[col_buffer_min_qty].data and not isinstance(row.cells[col_buffer_min_qty].data, (int, long, float)):
-                    line_error.append(_('Line %d: Buffer Qty must be a number, found %s') % (idx+1, row.cells[col_buffer_min_qty].data))
-                else:
-                    data_towrite['buffer_qty'] = row.cells[col_buffer_min_qty].data
+
+        try:
+            file_data = SpreadsheetXML(xmlstring=base64.decodestring(seg.file_to_import))
+
+            existing_line = {}
+            for line in seg.line_ids:
+                existing_line[line.product_id.default_code] = line.id
+
+            idx = -1
+
+            status = dict([(x[1], x[0]) for x in life_cycle_status])
+            error = []
+            code_created = {}
+            created = 0
+            updated = 0
+            ignored = 0
+            for row in file_data.getRows():
+                idx += 1
+                if idx < 8:
+                    # header
+                    continue
+
+                if not len(row.cells):
+                    # empty line
+                    continue
+
+                line_error = []
+                prod_code = row.cells[0].data
+                if not prod_code:
+                    continue
+                prod_code = prod_code.strip()
+
+                cells_nb = len(row.cells)
+
+                data_towrite = {
+                    'status': cells_nb > 3 and status.get(row.cells[3].data and row.cells[3].data.strip()),
+                    'replacing_product_id': False,
+                    'replaced_product_id': False,
+                    'buffer_qty': False,
+                    'min_qty': 0,
+                    'max_qty': 0,
+                    'auto_qty': 0
+                }
                 for fmc in range(1, 13):
-                    if cells_nb - 1 >=  col_first_fmc and row.cells[col_first_fmc].data:
-                        if cells_nb - 1 < col_first_fmc+1:
-                            line_error.append(_('Line %d: FMC FROM %d, date expected') % (idx+1, fmc))
-                            continue
-                        if not row.cells[col_first_fmc+1].type == 'datetime':
-                            line_error.append(_('Line %d: FMC FROM %d, date is not valid, found %s') % (idx+1, fmc, row.cells[col_first_fmc+1].data))
-                            continue
-                        if cells_nb - 1 < col_first_fmc+2:
-                            line_error.append(_('Line %d: FMC TO %d, date expected') % (idx+1, fmc))
-                            continue
-                        if not row.cells[col_first_fmc+2].data or row.cells[col_first_fmc+2].type != 'datetime':
-                            line_error.append(_('Line %d: FMC TO %d, date is not valid, found %s') % (idx+1, fmc, row.cells[col_first_fmc+2].data))
-                            continue
-                        if not isinstance(row.cells[col_first_fmc].data, (int, long, float)):
-                            line_error.append(_('Line %d: FMC %d, number expected, found %s') % (idx+1, fmc, row.cells[col_first_fmc].data))
-                            continue
+                    data_towrite.update({
+                        'rr_fmc_%d' % fmc: False,
+                        'rr_fmc_from_%d' % fmc: False,
+                        'rr_fmc_to_%d' % fmc: False,
+                    })
+
+
+                col_replacing = 4
+                col_replaced = 5
+                col_buffer_min_qty = 8
+                col_first_fmc = 9
+
+                if cells_nb > col_replacing and row.cells[col_replacing].data and row.cells[col_replacing].data.strip():
+                    if data_towrite['status'] not in  ('replaced', 'phasingout'):
+                        line_error.append(_('Line %d: you can not set a Replacing product on this line, please change the satus or remove the replacing product') % (idx+1, ))
+                    else:
+                        replacing_id = product_obj.search(cr, uid, [('default_code', '=ilike', row.cells[col_replacing].data.strip())], context=context)
+                        if not replacing_id:
+                            line_error.append(_('Line %d: replacing product code %s not found') % (idx+1, row.cells[col_replacing].data))
+                        else:
+                            data_towrite['replacing_product_id'] = replacing_id[0]
+                elif data_towrite['status'] == 'replaced' and not data_towrite['replacing_product_id']:
+                    line_error.append(_('Line %d: replacing product must be set !') % (idx+1, ))
+
+                if cells_nb > col_replaced and row.cells[col_replaced].data and row.cells[col_replaced].data.strip():
+                    if data_towrite['status'] not in  ('replacing', 'activereplacing'):
+                        line_error.append(_('Line %d: you can not set a Replaced product on this line, please change the satus or remove the replaced product') % (idx+1, ))
+                    else:
+                        replaced_id = product_obj.search(cr, uid, [('default_code', '=ilike', row.cells[col_replaced].data.strip())], context=context)
+                        if not replaced_id:
+                            line_error.append(_('Line %d: replaced product code %s not found') % (idx+1, row.cells[col_replaced].data))
+                        else:
+                            data_towrite['replaced_product_id'] = replaced_id[0]
+                elif data_towrite['status'] in ('replacing', 'activereplacing') and not data_towrite['replaced_product_id']:
+                    line_error.append(_('Line %d: replaced product must be set !') % (idx+1, ))
+
+
+                if cells_nb > col_buffer_min_qty and seg.rule == 'cycle':
+                    if row.cells[col_buffer_min_qty].data and not isinstance(row.cells[col_buffer_min_qty].data, (int, long, float)):
+                        line_error.append(_('Line %d: Buffer Qty must be a number, found %s') % (idx+1, row.cells[col_buffer_min_qty].data))
+                    else:
+                        data_towrite['buffer_qty'] = row.cells[col_buffer_min_qty].data
+                    for fmc in range(1, 13):
+                        if cells_nb - 1 >=  col_first_fmc and row.cells[col_first_fmc].data:
+                            from_data = False
+                            fmc_data = row.cells[col_first_fmc].data
+                            if fmc == 1:
+                                if cells_nb - 1 < col_first_fmc+1:
+                                    line_error.append(_('Line %d: FMC FROM %d, date expected') % (idx+1, fmc))
+                                    continue
+                                if not row.cells[col_first_fmc+1].type == 'datetime':
+                                    line_error.append(_('Line %d: FMC FROM %d, date is not valid, found %s') % (idx+1, fmc, row.cells[col_first_fmc+1].data))
+                                    continue
+                                from_data = row.cells[col_first_fmc+1].data.strftime('%Y-%m-%d')
+                                col_first_fmc += 1
+
+                            if cells_nb - 1 < col_first_fmc+1:
+                                line_error.append(_('Line %d: FMC TO %d, date expected') % (idx+1, fmc))
+                                continue
+                            if not row.cells[col_first_fmc+1].data or row.cells[col_first_fmc+1].type != 'datetime':
+                                line_error.append(_('Line %d: FMC TO %d, date is not valid, found %s') % (idx+1, fmc, row.cells[col_first_fmc+1].data))
+                                continue
+                            if not isinstance(fmc_data, (int, long, float)):
+                                line_error.append(_('Line %d: FMC %d, number expected, found %s') % (idx+1, fmc, fmc_data))
+                                continue
+                            data_towrite.update({
+                                'rr_fmc_%d' % fmc: fmc_data,
+                                'rr_fmc_from_%d' % fmc:from_data,
+                                'rr_fmc_to_%d' % fmc: row.cells[col_first_fmc+1].data.strftime('%Y-%m-%d'),
+                            })
+                        col_first_fmc += 2
+                elif cells_nb > col_buffer_min_qty and seg.rule == 'minmax':
+                    if not row.cells[col_buffer_min_qty] or not isinstance(row.cells[col_buffer_min_qty].data, (int, long, float)):
+                        line_error.append(_('Line %d: Min Qty, number expected, found %s') % (idx+1, row.cells[col_buffer_min_qty].data))
+                    elif not row.cells[col_buffer_min_qty+1] or not isinstance(row.cells[col_buffer_min_qty+1].data, (int, long, float)):
+                        line_error.append(_('Line %d: Max Qty, number expected, found %s') % (idx+1, row.cells[col_buffer_min_qty+1].data))
+                    elif row.cells[col_buffer_min_qty+1].data < row.cells[col_buffer_min_qty].data:
+                        line_error.append(_('Line %d: Max Qty (%s) must be larger than Min Qty (%s)') % (idx+1, row.cells[col_buffer_min_qty+1].data, row.cells[col_buffer_min_qty].data))
+                    else:
                         data_towrite.update({
-                            'rr_fmc_%d' % fmc: row.cells[col_first_fmc].data,
-                            'rr_fmc_from_%d' % fmc: row.cells[col_first_fmc+1].data.strftime('%Y-%m-%d'),
-                            'rr_fmc_to_%d' % fmc: row.cells[col_first_fmc+2].data.strftime('%Y-%m-%d'),
+                            'min_qty': row.cells[col_buffer_min_qty].data,
+                            'max_qty': row.cells[col_buffer_min_qty+1].data,
                         })
-                    col_first_fmc += 3
-            elif cells_nb > col_buffer_min_qty and seg.rule == 'minmax':
-                if not row.cells[col_buffer_min_qty] or not isinstance(row.cells[col_buffer_min_qty].data, (int, long, float)):
-                    line_error.append(_('Line %d: Min Qty, number expected, found %s') % (idx+1, row.cells[col_buffer_min_qty].data))
-                elif not row.cells[col_buffer_min_qty+1] or not isinstance(row.cells[col_buffer_min_qty+1].data, (int, long, float)):
-                    line_error.append(_('Line %d: Max Qty, number expected, found %s') % (idx+1, row.cells[col_buffer_min_qty+1].data))
-                elif row.cells[col_buffer_min_qty+1].data < row.cells[col_buffer_min_qty].data:
-                    line_error.append(_('Line %d: Max Qty (%s) must be larger than Min Qty (%s)') % (idx+1, row.cells[col_buffer_min_qty+1].data, row.cells[col_buffer_min_qty].data))
-                else:
-                    data_towrite.update({
-                        'min_qty': row.cells[col_buffer_min_qty].data,
-                        'max_qty': row.cells[col_buffer_min_qty+1].data,
-                    })
-            elif cells_nb > col_buffer_min_qty:
-                if not row.cells[col_buffer_min_qty] or not isinstance(row.cells[col_buffer_min_qty].data, (int, long, float)):
-                    line_error.append(_('Line %d: Auto Supply Qty, number expected, found %s') % (idx+1, row.cells[col_buffer_min_qty].data))
-                else:
-                    data_towrite['auto_qty'] = row.cells[col_buffer_min_qty].data
-
-            if prod_code not in existing_line:
-                prod_id = product_obj.search(cr, uid, [('default_code', '=ilike', prod_code)], context=context)
-                if not prod_id:
-                    line_error.append(_('Line %d: product code %s not found') % (idx+1, prod_code))
-                else:
-                    if prod_id[0] in code_created:
-                        line_error.append(_('Line %d: product code %s already defined in the file') % (idx+1, prod_code))
-
-                    code_created[prod_id[0]] = True
-                    data_towrite['product_id'] = prod_id[0]
-                    data_towrite['segment_id'] = seg.id
-            else:
-                line_id = existing_line[prod_code]
-
-            if line_error:
-                error += line_error
-                ignored += 1
-                continue
-            if 'product_id' in data_towrite:
-                seg_line_obj.create(cr, uid, data_towrite, context=context)
-                created += 1
-            else:
-                seg_line_obj.write(cr, uid, line_id, data_towrite, context=context)
-                updated += 1
+                elif cells_nb > col_buffer_min_qty:
+                    if not row.cells[col_buffer_min_qty] or not isinstance(row.cells[col_buffer_min_qty].data, (int, long, float)):
+                        line_error.append(_('Line %d: Auto Supply Qty, number expected, found %s') % (idx+1, row.cells[col_buffer_min_qty].data))
+                    else:
+                        data_towrite['auto_qty'] = row.cells[col_buffer_min_qty].data
+
+                if prod_code not in existing_line:
+                    prod_id = product_obj.search(cr, uid, [('default_code', '=ilike', prod_code)], context=context)
+                    if not prod_id:
+                        line_error.append(_('Line %d: product code %s not found') % (idx+1, prod_code))
+                    else:
+                        if prod_id[0] in code_created:
+                            line_error.append(_('Line %d: product code %s already defined in the file') % (idx+1, prod_code))
+
+                        code_created[prod_id[0]] = True
+                        data_towrite['product_id'] = prod_id[0]
+                        data_towrite['segment_id'] = seg.id
+                else:
+                    line_id = existing_line[prod_code]
+
+                if line_error:
+                    error += line_error
+                    ignored += 1
+                    continue
+                if 'product_id' in data_towrite:
+                    seg_line_obj.create(cr, uid, data_towrite, context=context)
+                    created += 1
+                else:
+                    seg_line_obj.write(cr, uid, line_id, data_towrite, context=context)
+                    updated += 1
+
+        except Exception, e:
+            cr.rollback()
+            return wizard_obj.message_box_noclose(cr, uid, title=_('Importation errors'), message=_("Unexpected error during import:\n%s") % (misc.get_traceback(e), ))
 
         self.write(cr, uid, seg.id, {'file_to_import': False}, context=context)
-        wizard_obj = self.pool.get('physical.inventory.import.wizard')
         if error:
             error.insert(0, _('%d line(s) created, %d line(s) updated, %d line(s) in error') % (created, updated, ignored))
             return wizard_obj.message_box_noclose(cr, uid, title=_('Importation errors'), message='\n'.join(error))
@@ -1426,7 +1527,7 @@
         if self.pool.get('replenishment.segment.line').search_exist(cr, uid, [('segment_id', 'in', ids), ('status', '=', 'replaced'), ('replacing_product_id', '=', False)], context=context):
             raise osv.except_osv(_('Warning'), _('Please complete Replacing products with a paired product, see red lines'))
 
-        if self.pool.get('replenishment.segment.line').search_exist(cr, uid, [('segment_id', 'in', ids), ('status', '=', 'replacing'), ('replaced_product_id', '=', False)], context=context):
+        if self.pool.get('replenishment.segment.line').search_exist(cr, uid, [('segment_id', 'in', ids), ('status', 'in', ['replacing', 'activereplacing']), ('replaced_product_id', '=', False)], context=context):
             raise osv.except_osv(_('Warning'), _('Please complete Replaced products with a paired product, see red lines'))
 
         cr.execute('''
@@ -1710,13 +1811,19 @@
 
         prod_obj = self.pool.get('product.product')
         for seg_id in segment:
-            # TODO JFB RR: compute_child ?
-            for prod_id in prod_obj.browse(cr, uid, segment[seg_id]['prod_seg_line'].keys(), fields_to_fetch=['incoming_qty'], context={'to_date': segment[seg_id]['to_date_rdd'], 'location': segment[seg_id]['location_ids']}):
-                ret[segment[seg_id]['prod_seg_line'][prod_id.id]]['pipeline_before_rdd'] =  prod_id.incoming_qty
-
-            if not inv_review:
+            # compute_child ?
+            if 'pipeline_before_rdd' in field_name:
+                for prod_id in prod_obj.browse(cr, uid, segment[seg_id]['prod_seg_line'].keys(), fields_to_fetch=['incoming_qty'], context={'to_date': segment[seg_id]['to_date_rdd'], 'location': segment[seg_id]['location_ids']}):
+                    ret[segment[seg_id]['prod_seg_line'][prod_id.id]]['pipeline_before_rdd'] =  prod_id.incoming_qty
+
+                for prod_id, qty in prod_obj.get_pipeline_from_po(cr, uid, segment[seg_id]['prod_seg_line'].keys(), to_date=segment[seg_id]['to_date_rdd'], location_ids=segment[seg_id]['location_ids']).iteritems():
+                    ret[segment[seg_id]['prod_seg_line'][prod_id]]['pipeline_before_rdd'] += qty
+
+            if not inv_review and 'pipeline_between_rdd_oc' in field_name:
                 for prod_id in prod_obj.browse(cr, uid, segment[seg_id]['prod_seg_line'].keys(), fields_to_fetch=['incoming_qty'], context={'from_strict_date': segment[seg_id]['to_date_rdd'], 'to_date': segment[seg_id]['to_date_oc'], 'location': segment[seg_id]['location_ids']}):
                     ret[segment[seg_id]['prod_seg_line'][prod_id.id]]['pipeline_between_rdd_oc'] = prod_id.incoming_qty
+                    for prod_id, qty in prod_obj.get_pipeline_from_po(cr, uid, segment[seg_id]['prod_seg_line'].keys(), from_date=segment[seg_id]['to_date_rdd'], to_date=segment[seg_id]['to_date_oc'], location_ids=segment[seg_id]['location_ids']).iteritems():
+                        ret[segment[seg_id]['prod_seg_line'][prod_id]]['pipeline_between_rdd_oc'] += qty
 
         return ret
 
@@ -1750,7 +1857,7 @@
         ret = {}
         for _id in ids:
             ret[_id] = False
-        for _id in self.search(cr, uid, [('id', 'in', ids), ('status', 'in', ['replaced', 'replacing'])], context=context):
+        for _id in self.search(cr, uid, [('id', 'in', ids), ('status', 'in', ['replaced', 'replacing', 'phasingout', 'activereplacing'])], context=context):
             ret[_id] = True
         return ret
 
@@ -1760,6 +1867,7 @@
             ret[_id] = {'warning': False, 'warning_html': ''}
 
 
+        # has stock for new prod ?
         new_ids = self.search(cr, uid, [('id', 'in', ids), ('status', '=', 'new')], context=context)
         if new_ids:
             for line in self.browse(cr, uid, new_ids, fields_to_fetch=['real_stock'], context=context):
@@ -1770,23 +1878,41 @@
                         'warning_html': '<img src="/openerp/static/images/stock/gtk-dialog-warning.png" title="%s" class="warning"/> <div>%s</div> ' % (misc.escape_html(warn), _('New?'))
                     }
 
+
+        # has pipe for replaced, phasingout statuses ?
         cr.execute('''
-            select line.id from
+          select l_id, l_status from (
+            select line.id as l_id, line.status as l_status from
+                purchase_order_line pol, replenishment_segment_line line
+            where
+                pol.product_id = line.product_id and
+                line.id in %(ids)s and
+                pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and
+                line.status in ('replaced', 'phasingout')
+            UNION
+            select line.id as l_id, line.status as l_status from
                 stock_move m, stock_picking p, replenishment_segment_line line
             where
                 m.picking_id = p.id and
                 m.product_id = line.product_id and
-                line.id in %s and
+                line.id in %(ids)s and
                 (p.type = 'in' or p.type = 'internal' and p.subtype = 'sysint') and
                 m.state in ('confirmed','waiting','assigned') and
-                line.status = 'replaced'
+                line.status in ('replaced', 'phasingout')
             group by line.id
-        ''', (tuple(ids), ))
+            ) x group by l_id, l_status
+        ''', {'ids': tuple(ids)})
+
         for line in cr.fetchall():
             warn = _('Product has pipeline - check status!')
+            if line[1] == 'replaced':
+                error = _('Replaced?')
+            else:
+                error = _('Phased out?')
+
             ret[line[0]] = {
                 'warning': warn,
-                'warning_html': '<img src="/openerp/static/images/stock/gtk-dialog-warning.png" title="%s" class="warning"/> <div>%s</div> ' % (misc.escape_html(warn), _('Replaced?'))
+                'warning_html': '<img src="/openerp/static/images/stock/gtk-dialog-warning.png" title="%s" class="warning"/> <div>%s</div> ' % (misc.escape_html(warn), error)
             }
         return ret
 
@@ -1798,7 +1924,7 @@
         'in_main_list': fields.function(_get_main_list, type='boolean', method=True, string='Prim. prod. list'),
         'status_tooltip': fields.function(_get_status_tooltip, type='char', method=True, string='Paired product'),
         'display_paired_icon': fields.function(_get_display_paired_icon, type='boolean', method=True, string='Display paired icon'),
-        'status': fields.selection([('active', 'Active'), ('new', 'New'), ('replaced', 'Replaced'), ('replacing', 'Replacing')], string='RR Lifecycle'),
+        'status': fields.selection(life_cycle_status, string='RR Lifecycle'),
         'min_qty': fields.float('Min Qty', related_uom='uom_id'),
         'max_qty': fields.float('Max Qty', related_uom='uom_id'),
         'auto_qty': fields.float('Auto. Supply Qty', related_uom='uom_id'),
@@ -1862,21 +1988,16 @@
             return True
         for line in self.browse(cr, uid, line_ids, context=context):
             prev_to = False
-            empty = 0
             for x in range(1, 13):
                 rr_fmc = getattr(line, 'rr_fmc_%d'%x)
                 rr_from = getattr(line, 'rr_fmc_from_%d'%x)
                 rr_to = getattr(line, 'rr_fmc_to_%d'%x)
                 if rr_from:
-                    if empty:
-                        error.append(_('%s, FMC FROM %d is not set, you can\'t have gap in FMC (%s is set)') % (line.product_id.default_code, empty, x))
-                        continue
                     rr_from = datetime.strptime(rr_from, '%Y-%m-%d')
                     if rr_from.day != 1:
                         error.append(_('%s, FMC FROM %d must start the 1st day of the month') % (line.product_id.default_code, x))
                     if not rr_to:
                         if not rr_fmc:
-                            empty = x
                             continue
                         error.append(_("%s, FMC TO %d can't be empty if FMC from is set") % (line.product_id.default_code, x))
                     else:
@@ -1892,8 +2013,6 @@
                             if prev_to > rr_from:
                                 error.append(_("%s, FMC FROM %d must be later than FMC TO %d") % (line.product_id.default_code, x, x-1))
                     prev_to = rr_to
-                elif not empty:
-                    empty = x
             if error:
                 raise osv.except_osv(_('Error'), _('Please correct the following FMC values:\n%s') % ("\n".join(error)))
 
@@ -1940,19 +2059,25 @@
         'status': 'active',
     }
 
-    def _remove_paired_product(self, cr, uid, vals, context=None):
+    def _clean_data(self, cr, uid, vals, context=None):
         if vals and 'status' in vals:
-            if vals['status'] != 'replacing':
+            if vals['status'] not in  ('replacing', 'activereplacing'):
                 vals['replaced_product_id'] = False
-            if vals['status'] != 'replaced':
+            if vals['status'] not in  ('replaced', 'phasingout'):
                 vals['replacing_product_id'] = False
+        for x in range(1, 12):
+            if vals.get('rr_fmc_to_%d'%x):
+                try:
+                    vals['rr_fmc_from_%d'%(x+1)] = (datetime.strptime(vals['rr_fmc_to_%d'%x], '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d')
+                except:
+                    pass
 
     def create(self, cr, uid, vals, context=None):
-        self._remove_paired_product(cr, uid, vals, context=context)
+        self._clean_data(cr, uid, vals, context=context)
         return super(replenishment_segment_line, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-        self._remove_paired_product(cr, uid, vals, context=context)
+        self._clean_data(cr, uid, vals, context=context)
         return super(replenishment_segment_line, self).write(cr, uid, ids, vals, context=context)
 
     def create_multiple_lines(self, cr, uid, parent_id, product_ids, context=None):
@@ -1979,13 +2104,14 @@
             return {'msg': "Warning, duplicate products already in Segment have been ignored.\nProducts in duplicate:\n - %s" % '\n - '.join(exist_code)}
         return True
 
-    def change_fmc(selc, cr, uid, ids, ch_type, nb, value, context=None):
-        if not value:
+    def change_fmc(selc, cr, uid, ids, ch_type, nb, date_str, update_next, context=None):
+        if not date_str:
             return {}
 
         msg = False
+        value = {}
         try:
-            fmc_date = datetime.strptime(value, '%Y-%m-%d')
+            fmc_date = datetime.strptime(date_str, '%Y-%m-%d')
         except:
             return {}
         if ch_type == 'from' and fmc_date.day != 1:
@@ -1993,11 +2119,13 @@
         elif ch_type == 'to':
             if fmc_date + relativedelta(months=1, day=1, days=-1) != fmc_date:
                 msg = _('FMC TO %s must be the last day of the month') % (nb, )
+            if update_next:
+                value = {'rr_fmc_from_%s'%(int(nb)+1): fmc_date and (fmc_date + relativedelta(days=1)).strftime('%Y-%m-%d') or False}
 
         if msg:
-            return {'warning': {'message': msg}}
+            return {'warning': {'message': msg}, 'value': value}
 
-        return {}
+        return {'value': value}
 
     def set_paired_product(self, cr, uid, ids, context=None):
 
@@ -2419,6 +2547,8 @@
     }
 
     def import_lines(self, cr, uid, ids, context=None):
+        ''' import replenishment.order_calc '''
+
         calc_line_obj = self.pool.get('replenishment.order_calc.line')
 
         calc = self.browse(cr, uid, ids[0],  context=context)
@@ -2431,11 +2561,11 @@
             existing_line[line.product_id.default_code] = line.id
 
         if calc.rule == 'cycle':
+            qty_col = 16
+            comment_col = 19
+        elif calc.rule in ('auto', 'minmax'):
             qty_col = 14
             comment_col = 17
-        elif calc.rule in ('auto', 'minmax'):
-            qty_col = 12
-            comment_col = 15
         idx = -1
 
         error = []
@@ -2446,6 +2576,9 @@
                 # header
                 continue
 
+            if not len(row.cells):
+                continue
+
             prod_code = row.cells[0].data
             if not prod_code:
                 continue
@@ -2556,16 +2689,16 @@
         'order_calc_id': fields.many2one('replenishment.order_calc', 'Order Calc', required=1, select=1),
         'product_id': fields.many2one('product.product', 'Product Code', select=1, required=1, readonly=1),
         'product_description': fields.related('product_id', 'name',  string='Description', type='char', size=64, readonly=True, select=True, write_relate=False),
-        'status': fields.selection([('active', 'Active'), ('new', 'New'), ('replaced', 'Replaced'), ('replacing', 'Replacing')], string='Life cycle status', readony=1),
+        'status': fields.selection(life_cycle_status, string='Life cycle status', readony=1),
         'uom_id': fields.related('product_id', 'uom_id',  string='UoM', type='many2one', relation='product.uom', readonly=True, select=True, write_relate=False),
         'in_main_list': fields.boolean('Prim. prod. list', readonly=1),
-        'valid_rr_fmc': fields.boolean('Valid FMC', readonly=1),
+        'valid_rr_fmc': fields.boolean('Valid', readonly=1),
         'real_stock': fields.float('Real Stock', readonly=1, related_uom='uom_id'),
         'pipeline_qty': fields.float('Pipeline Qty', readonly=1, related_uom='uom_id'),
         'eta_for_next_pipeline': fields.date('ETA for Next Pipeline', readonly=1),
         'reserved_stock_qty': fields.float('Reserved Stock Qty', readonly=1, related_uom='uom_id'),
         'projected_stock_qty': fields.float('Projected Stock Level', readonly=1, related_uom='uom_id'),
-        'qty_lacking': fields.float('Qty lacking before next RDD', readonly=1, related_uom='uom_id'),
+        'qty_lacking': fields.float_null('Qty lacking before next RDD', readonly=1, related_uom='uom_id', null_value='N/A'),
         'qty_lacking_needed_by': fields.date('Qty lacking needed by', readonly=1),
         'open_loan': fields.boolean('Open Loan', readonly=1),
         'open_donation': fields.boolean('Donations pending', readonly=1),
@@ -2578,6 +2711,9 @@
         'order_qty_comment': fields.char('Order Qty Comment', size=512),
         'warning': fields.text('Warning', readonly='1'),
         'warning_html': fields.text('Warning', readonly='1'),
+        'buffer_qty': fields.float_null('Buffer Qty', related_uom='uom_id', readonly=1),
+        'auto_qty': fields.float('Auto. Supply Qty', related_uom='uom_id', readonly=1),
+        'min_max': fields.char('Min/Max', size=128, readonly=1),
     }
 
 replenishment_order_calc_line()
@@ -2625,15 +2761,31 @@
             'inv_review': inv_review,
         }
 
+    def pipeline_po(self, cr, uid, ids, context=None):
+        data = self._selected_data(cr, uid, ids, context=context)
+
+        product_ids = [x.id for x in data['products']]
+        product_code = [x.default_code for x in data['products']]
+
+
+        res = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'purchase.purchase_line_pipeline_action', ['tree'], new_tab=True, context=context)
+        res['domain'] = ['&', '&', ('location_dest_id', 'in', data['location_ids']), ('state', 'in', ['validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n']), ('product_id', 'in', product_ids)]
+        res['name'] = _('Pipeline %s: %s') % (data['inv_review'].location_config_id.name, ', '.join(product_code))
+        res['nodestroy'] = True
+        res['target'] = 'new'
+        return res
+
     def pipeline(self, cr, uid, ids, context=None):
         data = self._selected_data(cr, uid, ids, context=context)
 
         product_ids = [x.id for x in data['products']]
         product_code = [x.default_code for x in data['products']]
 
-        res = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'stock.action_move_form3', ['tree', 'form'], new_tab=True, context=context)
+        res = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'stock.action_move_form3', ['tree', 'form'], context=context)
         res['domain'] = ['&', '&', ('location_dest_id', 'in', data['location_ids']), ('state', 'in', ['confirmed', 'assigned']), ('product_id', 'in', product_ids)]
         res['name'] = _('Pipeline %s: %s') % (data['inv_review'].location_config_id.name, ', '.join(product_code))
+        res['nodestroy'] = True
+        res['target'] = 'new'
         return res
 
     def stock_by_location(self, cr, uid, ids, context=None):
@@ -2657,18 +2809,20 @@
         'product_id': fields.many2one('product.product', 'Product Code', select=1, required=1), # OC
         'product_description': fields.related('product_id', 'name',  string='Description', type='char', size=64, readonly=True, select=True, write_relate=False), # OC
         'uom_id': fields.related('product_id', 'uom_id',  string='UoM', type='many2one', relation='product.uom', readonly=True, select=True, write_relate=False), # OC
-        'status': fields.selection([('active', 'Active'), ('new', 'New'), ('replaced', 'Replaced'), ('replacing', 'Replacing')], string='Life cycle status'), # OC
+        'status': fields.selection(life_cycle_status, string='Life cycle status'), # OC
+        'paired_product_id': fields.many2one('product.product', 'Replacing/Replaced product'),
         'primay_product_list': fields.char('Primary Product List', size=512), # OC
         'rule': fields.selection([('cycle', 'Order Cycle'), ('minmax', 'Min/Max'), ('auto', 'Automatic Supply')], string='Replenishment Rule (Order quantity)', required=1), #Seg
-        'min_qty': fields.float('Min Qty', related_uom='uom_id'), # Seg line
-        'max_qty': fields.float('Max Qty', related_uom='uom_id'), # Seg line
-        'auto_qty': fields.float('Auto. Supply Qty', related_uom='uom_id'), # Seg line
+        'min_qty': fields.float_null('Min Qty', related_uom='uom_id'), # Seg line
+        'max_qty': fields.float_null('Max Qty', related_uom='uom_id'), # Seg line
+        'auto_qty': fields.float_null('Auto. Supply Qty', related_uom='uom_id'), # Seg line
         'buffer_qty': fields.float_null('Buffer Qty', related_uom='uom_id'), # Seg line
+        'min_max': fields.char('Min / Max', size=128),
         'safety_stock': fields.integer('Safety Stock'), # Seg
         'segment_ref_name': fields.char('Segment Ref/Name', size=512), # Seg
         'rr_fmc_avg': fields.float_null('RR-FMC (average for period)', null_value='N/A'),
         'rr_amc': fields.float('RR-AMC'),
-        'valid_rr_fmc': fields.boolean('Valid FMC', readonly=1), # OC
+        'valid_rr_fmc': fields.boolean('Valid', readonly=1), # OC
         'real_stock': fields.float('Real Stock', readonly=1, related_uom='uom_id'), # OC
         'pipeline_qty': fields.float('Pipeline Qty', readonly=1, related_uom='uom_id'), # OC
         'reserved_stock_qty': fields.float('Reserved Stock Qty', readonly=1, related_uom='uom_id'),# OC

=== modified file 'bin/addons/procurement_cycle/replenishment_view.xml'
--- bin/addons/procurement_cycle/replenishment_view.xml	2020-06-02 14:41:41 +0000
+++ bin/addons/procurement_cycle/replenishment_view.xml	2020-07-27 12:47:56 +0000
@@ -286,7 +286,7 @@
                             <button name="add_multiple_lines" type="object" icon="gtk-add" string="Add multiple products" colspan="8" />
                         </group>
                             <field name="line_ids" colspan="4" nolabel="1" default_get="rule=rule" scroll="1" attrs="{'readonly': [('state', '!=', 'draft')]}" o2m_selectable="2">
-                                <tree editable="top" editable_style="new" colors="red: not status or (display_paired_icon and not status_tooltip)">
+                                <tree editable="top" editable_style="new" colors="red: not status or (display_paired_icon and not status_tooltip and status!='phasingout')">
                                     <field name="product_id" filter_selector="1" />
                                     <field name="product_description" displayon="noteditable" filter_selector="1" />
                                     <field name="uom_id" invisible="1" />
@@ -302,14 +302,12 @@
                                     <field name="auto_qty" invisible="context.get('rule')!='auto'"/>
                                     <field name="buffer_qty" invisible="context.get('rule')!='cycle'"/>
                                     <field name="rr_fmc_1" invisible="context.get('rule')!='cycle'" nolabel="1"/>
-                                    <field name="rr_fmc_from_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('from', '1', rr_fmc_from_1)"  nolabel="1"/>
-                                    <field name="rr_fmc_to_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('to', '1', rr_fmc_to_1)" nolabel="1"/>
+                                    <field name="rr_fmc_from_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('from', '1', rr_fmc_from_1, False)"  nolabel="1"/>
+                                    <field name="rr_fmc_to_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('to', '1', rr_fmc_to_1, False)" nolabel="1"/>
                                     <field name="rr_fmc_2" invisible="context.get('rule')!='cycle'"  nolabel="1"/>
-                                    <field name="rr_fmc_from_2" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_2', '!=', False)]}" on_change="change_fmc('from', '2', rr_fmc_from_2)" nolabel="1"/>
-                                    <field name="rr_fmc_to_2" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_2', '!=', False)]}" on_change="change_fmc('to', '2', rr_fmc_to_2)" nolabel="1"/>
+                                    <field name="rr_fmc_to_2" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_2', '!=', False)]}" on_change="change_fmc('to', '2', rr_fmc_to_2, False)" nolabel="1"/>
                                     <field name="rr_fmc_3" invisible="context.get('rule')!='cycle'" nolabel="1"/>
-                                    <field name="rr_fmc_from_3" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_3', '!=', False)]}" on_change="change_fmc('from', '3', rr_fmc_from_3)" nolabel="1"/>
-                                    <field name="rr_fmc_to_3" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_3', '!=', False)]}" on_change="change_fmc('to', '3', rr_fmc_to_3)" nolabel="1"/>
+                                    <field name="rr_fmc_to_3" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_3', '!=', False)]}" on_change="change_fmc('to', '3', rr_fmc_to_3, False)" nolabel="1"/>
                                     <field name= "list_fmc" invisible="context.get('rule')!='cycle'" displayon="notedition"/>
                                     <button name="openform" special="openform" string="Edit 12 FMC" invisible="context.get('rule')!='cycle'" attrs="{'invisible': [('state', '!=', 'draft')]}"  icon="terp-go-week" />
                                     <field name="warning_html" widget="html_text" displayon="noteditable"/>
@@ -333,41 +331,41 @@
                                     <separator string="To" colspan="1" />
 
                                     <field name="rr_fmc_1" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('from', '1', rr_fmc_from_1)"  nolabel="1"/>
-                                    <field name="rr_fmc_to_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('to', '1', rr_fmc_to_1)" nolabel="1"/>
+                                    <field name="rr_fmc_from_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('from', '1', rr_fmc_from_1, False)"  nolabel="1"/>
+                                    <field name="rr_fmc_to_1" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_1', '!=', False)]}" on_change="change_fmc('to', '1', rr_fmc_to_1, True)" nolabel="1"/>
                                     <field name="rr_fmc_2" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_2" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_2', '!=', False)]}" on_change="change_fmc('from', '2', rr_fmc_from_2)" nolabel="1"/>
-                                    <field name="rr_fmc_to_2" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_2', '!=', False)]}" on_change="change_fmc('to', '2', rr_fmc_to_2)" nolabel="1"/>
+                                    <field name="rr_fmc_from_2" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_2" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_2', '!=', False)]}" on_change="change_fmc('to', '2', rr_fmc_to_2, True)" nolabel="1"/>
                                     <field name="rr_fmc_3" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_3" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_3', '!=', False)]}" on_change="change_fmc('from', '3', rr_fmc_from_3)" nolabel="1"/>
-                                    <field name="rr_fmc_to_3" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_3', '!=', False)]}" on_change="change_fmc('to', '3', rr_fmc_to_3)" nolabel="1"/>
+                                    <field name="rr_fmc_from_3" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_3" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_3', '!=', False)]}" on_change="change_fmc('to', '3', rr_fmc_to_3, True)" nolabel="1"/>
                                     <field name="rr_fmc_4" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_4" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_4', '!=', False)]}" on_change="change_fmc('from', '4', rr_fmc_from_4)" nolabel="1"/>
-                                    <field name="rr_fmc_to_4" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_4', '!=', False)]}" on_change="change_fmc('to', '4', rr_fmc_to_4)" nolabel="1"/>
+                                    <field name="rr_fmc_from_4" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_4" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_4', '!=', False)]}" on_change="change_fmc('to', '4', rr_fmc_to_4, True)" nolabel="1"/>
                                     <field name="rr_fmc_5" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_5" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_5', '!=', False)]}" on_change="change_fmc('from', '5', rr_fmc_from_5)" nolabel="1"/>
-                                    <field name="rr_fmc_to_5" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_5', '!=', False)]}" on_change="change_fmc('to', '5', rr_fmc_to_5)" nolabel="1"/>
+                                    <field name="rr_fmc_from_5" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_5" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_5', '!=', False)]}" on_change="change_fmc('to', '5', rr_fmc_to_5, True)" nolabel="1"/>
                                     <field name="rr_fmc_6" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_6" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_6', '!=', False)]}" on_change="change_fmc('from', '6', rr_fmc_from_6)" nolabel="1"/>
-                                    <field name="rr_fmc_to_6" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_6', '!=', False)]}" on_change="change_fmc('to', '6', rr_fmc_to_6)" nolabel="1"/>
+                                    <field name="rr_fmc_from_6" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_6" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_6', '!=', False)]}" on_change="change_fmc('to', '6', rr_fmc_to_6, True)" nolabel="1"/>
                                     <field name="rr_fmc_7" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_7" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_7', '!=', False)]}" on_change="change_fmc('from', '7', rr_fmc_from_7)" nolabel="1"/>
-                                    <field name="rr_fmc_to_7" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_7', '!=', False)]}" on_change="change_fmc('to', '7', rr_fmc_to_7)" nolabel="1"/>
+                                    <field name="rr_fmc_from_7" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_7" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_7', '!=', False)]}" on_change="change_fmc('to', '7', rr_fmc_to_7, True)" nolabel="1"/>
                                     <field name="rr_fmc_8" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_8" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_8', '!=', False)]}" on_change="change_fmc('from', '8', rr_fmc_from_8)" nolabel="1"/>
-                                    <field name="rr_fmc_to_8" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_8', '!=', False)]}" on_change="change_fmc('to', '8', rr_fmc_to_8)" nolabel="1"/>
+                                    <field name="rr_fmc_from_8" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_8" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_8', '!=', False)]}" on_change="change_fmc('to', '8', rr_fmc_to_8, True)" nolabel="1"/>
                                     <field name="rr_fmc_9" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_9" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_9', '!=', False)]}" on_change="change_fmc('from', '9', rr_fmc_from_9)" nolabel="1"/>
-                                    <field name="rr_fmc_to_9" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_9', '!=', False)]}" on_change="change_fmc('to', '9', rr_fmc_to_9)" nolabel="1"/>
+                                    <field name="rr_fmc_from_9" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_9" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_9', '!=', False)]}" on_change="change_fmc('to', '9', rr_fmc_to_9, True)" nolabel="1"/>
                                     <field name="rr_fmc_10" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_10" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_10', '!=', False)]}" on_change="change_fmc('from', '10', rr_fmc_from_10)" nolabel="1"/>
-                                    <field name="rr_fmc_to_10" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_10', '!=', False)]}" on_change="change_fmc('to', '10', rr_fmc_to_10)" nolabel="1"/>
+                                    <field name="rr_fmc_from_10" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_10" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_10', '!=', False)]}" on_change="change_fmc('to', '10', rr_fmc_to_10, True)" nolabel="1"/>
                                     <field name="rr_fmc_11" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_11" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_11', '!=', False)]}" on_change="change_fmc('from', '11', rr_fmc_from_11)" nolabel="1"/>
-                                    <field name="rr_fmc_to_11" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_11', '!=', False)]}" on_change="change_fmc('to', '11', rr_fmc_to_11)" nolabel="1"/>
+                                    <field name="rr_fmc_from_11" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_11" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_11', '!=', False)]}" on_change="change_fmc('to', '11', rr_fmc_to_11, True)" nolabel="1"/>
                                     <field name="rr_fmc_12" invisible="context.get('rule')!='cycle'" />
-                                    <field name="rr_fmc_from_12" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_12', '!=', False)]}" on_change="change_fmc('from', '12', rr_fmc_from_12)" nolabel="1"/>
-                                    <field name="rr_fmc_to_12" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_12', '!=', False)]}" on_change="change_fmc('to', '12', rr_fmc_to_12)" nolabel="1"/>
+                                    <field name="rr_fmc_from_12" invisible="context.get('rule')!='cycle'" readonly="1" nolabel="1"/>
+                                    <field name="rr_fmc_to_12" invisible="context.get('rule')!='cycle'" attrs="{'required': [('rr_fmc_12', '!=', False)]}" on_change="change_fmc('to', '12', rr_fmc_to_12, False)" nolabel="1"/>
                                     </group>
                                 </form>
                             </field>
@@ -555,7 +553,10 @@
                                     <field name="uom_id" invisible="1" />
                                     <field name="status" invisible="1" />
                                     <field name="in_main_list" filter_selector="1" />
-                                    <field name="valid_rr_fmc" invisible="context.get('rule')!='cycle'"/>
+                                    <field name="auto_qty" invisible="context.get('rule')!='auto'"/>
+                                    <field name="buffer_qty" invisible="context.get('rule')!='cycle'"/>
+                                    <field name="min_max" invisible="context.get('rule')!='minmax'"/>
+                                    <field name="valid_rr_fmc" />
                                     <field name="real_stock" />
                                     <field name="pipeline_qty" />
                                     <field name="eta_for_next_pipeline" />
@@ -680,7 +681,8 @@
                     <field name="time_unit" />
                     <newline />
                     <group colspan="4">
-                        <button colspan="1" name="pipeline" string="Pipeline" type="object" icon="icons/pipe.png"/>
+                        <button colspan="1" name="pipeline" string="Pipeline (Stock Moves)" type="object" icon="icons/pipe.png"/>
+                        <button colspan="1" name="pipeline_po" string="Pipeline (PO)" type="object" icon="icons/pipe.png"/>
                         <button colspan="1" name="stock_by_location" string="Stock By Location" type="object" icon="gtk-indent"/>
                     </group>
                     <field name="line_ids" colspan="4" nolabel="1" o2m_selectable="2" scroll="1">
@@ -691,9 +693,12 @@
                             <field name="status" invisible="1" />
                             <field name="primay_product_list" filter_selector="1" />
                             <field name="segment_ref_name" />
+                            <field name="min_max" />
+                            <field name="auto_qty" />
                             <field name="projected_stock_qty_amc" />
                             <field name="rr_fmc_avg" />
                             <field name="rr_amc" />
+                            <field name="buffer_qty" />
                             <field name="valid_rr_fmc" />
                             <field name="real_stock" />
                             <field name="pipeline_qty" />

=== modified file 'bin/addons/procurement_cycle/replenishment_wizard.xml'
--- bin/addons/procurement_cycle/replenishment_wizard.xml	2020-05-04 15:28:58 +0000
+++ bin/addons/procurement_cycle/replenishment_wizard.xml	2020-07-27 12:47:56 +0000
@@ -41,8 +41,8 @@
                 <form string="Set Paired Product">
                         <field name="product_id" readonly="1" colspan="4"/>
                         <field name="status" invisible="1" />
-                        <field name="replacing_product_id" attrs="{'invisible': [('status', '!=', 'replaced')], 'required':  [('status', '=', 'replaced')]}" colspan="4" domain="[('id', '!=', product_id)]" />
-                        <field name="replaced_product_id" attrs="{'invisible': [('status', '!=', 'replacing')], 'required':  [('status', '=', 'replacing')]}" colspan="4" domain="[('id', '!=', product_id)]"/>
+                        <field name="replacing_product_id" attrs="{'invisible': [('status', 'not in', ['replaced', 'phasingout'])], 'required':  [('status', '=', 'replaced')]}" colspan="4" domain="[('id', '!=', product_id)]" />
+                        <field name="replaced_product_id" attrs="{'invisible': [('status', 'not in', ['replacing', 'activereplacing'])], 'required':  [('status', 'in', ['replacing', 'activereplacing'])]}" colspan="4" domain="[('id', '!=', product_id)]"/>
                         <group colspan="4">
                             <button name="save_paired" icon="gtk-ok" string="Save" type="object"/>
                             <button special="cancel" string="Close" icon="gtk-cancel" />

=== modified file 'bin/addons/procurement_cycle/report/replenishment_inventory_review.mako'
--- bin/addons/procurement_cycle/report/replenishment_inventory_review.mako	2020-06-02 14:41:41 +0000
+++ bin/addons/procurement_cycle/report/replenishment_inventory_review.mako	2020-07-27 12:47:56 +0000
@@ -911,6 +911,8 @@
    <Row ss:Height="75">
     <Cell ss:StyleID="s128"><Data ss:Type="String">${_('Product Code')|x}</Data></Cell>
     <Cell ss:StyleID="s128"><Data ss:Type="String">${_('Product Description')|x}</Data></Cell>
+    <Cell ss:StyleID="s128"><Data ss:Type="String">${_('RR Lifecycle')|x}</Data></Cell>
+    <Cell ss:StyleID="s128"><Data ss:Type="String">${_('Replaced/Replacing')|x}</Data></Cell>
     <Cell ss:StyleID="s128"><Data ss:Type="String">${_('Primary Product list')|x}</Data></Cell>
     <Cell ss:StyleID="s129red"><Data ss:Type="String">${_('Warnings Recap')|x}</Data></Cell>
     <Cell ss:StyleID="s129"><Data ss:Type="String">${_('Segment Ref/name')|x}</Data></Cell>
@@ -925,7 +927,7 @@
     <Cell ss:StyleID="s130"><Data ss:Type="String">${_('Order coverage')|x} ${getSel(objects[0], 'time_unit')|x}</Data></Cell>
     <Cell ss:StyleID="s130"><Data ss:Type="String">${_('SS')|x} ${getSel(objects[0], 'time_unit')|x}</Data></Cell>
     <Cell ss:StyleID="s130"><Data ss:Type="String">${_('Buffer (Qty)')|x}</Data></Cell>
-    <Cell ss:StyleID="s129"><Data ss:Type="String">${_('Valid RR-FMC(s)')|x}</Data></Cell>
+    <Cell ss:StyleID="s129"><Data ss:Type="String">${_('Valid')|x}</Data></Cell>
     <Cell ss:StyleID="s129"><Data ss:Type="String">${_('RR-FMC (average for period)')|x}</Data></Cell>
     <Cell ss:StyleID="s130"><Data ss:Type="String">${_('RR-AMC (average for AMC period)')|x}</Data></Cell>
 
@@ -965,6 +967,8 @@
    <Row ss:AutoFitHeight="0" ss:Height="24">
     <Cell ss:StyleID="s141"><Data ss:Type="String">${line.product_id.default_code|x}</Data></Cell>
     <Cell ss:StyleID="s141"><Data ss:Type="String">${line.product_id.name|x}</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">${line.segment_ref_name and getSel(line, 'status') or _('N/A')|x}</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">${(line.paired_product_id and line.paired_product_id.default_code or '')|x}</Data></Cell>
     <Cell ss:StyleID="s141"><Data ss:Type="String">${(line.primay_product_list or '')|x}</Data></Cell>
     <Cell ss:StyleID="s141"><Data ss:Type="String">${line.warning or ''|xn}</Data></Cell>
     <Cell ss:StyleID="s141"><Data ss:Type="String">${(line.segment_ref_name or '')|x}</Data></Cell>
@@ -972,7 +976,7 @@
     <Cell ss:StyleID="s141"><Data ss:Type="String">${(line.segment_ref_name and getSel(line, 'rule') or '')|x}</Data></Cell>
     % if line.rule == 'minmax':
         <Cell ss:StyleID="s140">
-            % if line.min_qty:
+            % if line.min_qty is not False:
                 <Data ss:Type="Number">${line.min_qty}</Data>
             % endif
         </Cell>
@@ -982,7 +986,7 @@
 
     % if line.rule == 'minmax':
         <Cell ss:StyleID="s140">
-            % if line.max_qty:
+            % if line.max_qty is not False:
                 <Data ss:Type="Number">${line.max_qty}</Data>
             % endif
         </Cell>
@@ -992,7 +996,7 @@
 
     % if line.rule == 'auto':
         <Cell ss:StyleID="s140">
-            % if line.auto_qty:
+            % if line.auto_qty is not False:
                 <Data ss:Type="Number">${line.auto_qty}</Data>
             % endif
         </Cell>
@@ -1036,11 +1040,7 @@
         <Cell ss:StyleID="irrel" />
     % endif
 
-    % if line.rule == 'cycle':
-        <Cell ss:StyleID="s141"><Data ss:Type="String">${line.valid_rr_fmc and _('Yes') or _('No') }</Data></Cell>
-    % else:
-        <Cell ss:StyleID="irrel" />
-    % endif
+    <Cell ss:StyleID="s141"><Data ss:Type="String">${line.valid_rr_fmc and _('Yes') or _('No') }</Data></Cell>
 
     <Cell ss:StyleID="s141">
         % if line.rr_fmc_avg:

=== modified file 'bin/addons/procurement_cycle/report/replenishment_order_calc.mako'
--- bin/addons/procurement_cycle/report/replenishment_order_calc.mako	2020-06-02 14:41:41 +0000
+++ bin/addons/procurement_cycle/report/replenishment_order_calc.mako	2020-07-27 12:47:56 +0000
@@ -376,6 +376,7 @@
    <Column ss:AutoFitWidth="0" ss:Width="87.75"/> <!--prod code -->
    <Column ss:AutoFitWidth="0" ss:Width="210.75"/> <!--prod desc -->
    <Column ss:AutoFitWidth="0" ss:Width="63"/> <!-- in list -->
+   <Column ss:AutoFitWidth="0" ss:Width="66"/> <!-- buffer / minmax / auto qty -->
    <Column ss:AutoFitWidth="0" ss:Width="63"/> <!-- real stock -->
    <Column ss:AutoFitWidth="0" ss:Width="66"/> <!--pipeline -->
    <Column ss:AutoFitWidth="0" ss:Width="82.5" /> <!-- eta -->
@@ -492,6 +493,16 @@
     <Cell ss:StyleID="s89"><Data ss:Type="String">${_('Product code')|x}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s89"><Data ss:Type="String">${_('Description')|x}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s90"><Data ss:Type="String">${_('In prod. list')|x}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s90">
+      % if objects[0].rule == 'cycle':
+        <Data ss:Type="String">${_('Buffer')|x}</Data>
+      % elif objects[0].rule == 'minmax':
+        <Data ss:Type="String">${_('Min / Max')|x}</Data>
+      % else:
+        <Data ss:Type="String">${_('Auto. Supply Qty')|x}</Data>
+      %endif
+    <NamedCell ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s90"><Data ss:Type="String">${_('Valid')}</Data><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s93"><Data ss:Type="String">${_('Real Stock')|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
     <Cell ss:StyleID="s93"><Data ss:Type="String">${_('Pipeline Qty')|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
     <Cell ss:StyleID="s93"><Data ss:Type="String">${_('Eta For next Pipeline')|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
@@ -526,6 +537,25 @@
     <Cell ss:StyleID="s96"><Data ss:Type="String">${prod.product_id.default_code|x}</Data><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s96"><Data ss:Type="String">${prod.product_id.name|x}</Data><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s95"><Data ss:Type="String">${prod.in_main_list and _('Yes') or _('No')}</Data><NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s95">
+      % if objects[0].rule == 'cycle':
+        % if prod.buffer_qty is not False:
+            ><Data ss:Type="Number">${prod.buffer_qty}</Data>
+        % else:
+            <Data ss:Type="String"/>
+        % endif
+      % elif objects[0].rule == 'minmax':
+        <Data ss:Type="String">${prod.min_max}</Data>
+      % else:
+        % if prod.auto_qty is not False:
+            <Data ss:Type="Number">${prod.auto_qty}</Data>
+        % else:
+            <Data ss:Type="String"/>
+        % endif
+      %endif
+    <NamedCell ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/>
+    </Cell>
+    <Cell ss:StyleID="s95"><Data ss:Type="String">${prod.valid_rr_fmc and _('Yes') or _('No') }</Data></Cell>
     <Cell ss:StyleID="s97"><Data ss:Type="Number">${prod.real_stock}</Data></Cell>
     <Cell ss:StyleID="s97"><Data ss:Type="Number">${prod.pipeline_qty}</Data></Cell>
     <Cell ss:StyleID="s97d">

=== modified file 'bin/addons/procurement_cycle/report/replenishment_segment.mako'
--- bin/addons/procurement_cycle/report/replenishment_segment.mako	2020-05-14 09:26:30 +0000
+++ bin/addons/procurement_cycle/report/replenishment_segment.mako	2020-07-27 12:47:56 +0000
@@ -413,7 +413,9 @@
         <% styles = ['s143', 's149'] %>
         % for fmc in range(1, 13):
         <Cell ss:StyleID="${styles[i]}"><Data ss:Type="String">${_('RR FMC %d')%fmc|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
-        <Cell ss:StyleID="${styles[i]}"><Data ss:Type="String">${_('From %d')%fmc|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
+        % if fmc == 1:
+            <Cell ss:StyleID="${styles[i]}"><Data ss:Type="String">${_('From %d')%fmc|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
+        % endif
         <Cell ss:StyleID="${styles[i]}"><Data ss:Type="String">${_('To %d')%fmc|x}</Data><NamedCell ss:Name="Print_Titles"/></Cell>
         <% i = 1 - i %>
         % endfor
@@ -455,24 +457,26 @@
                 <Data ss:Type="Number">${getattr(prod, 'rr_fmc_%d'%fmc) or ''}</Data>
             % endif
             </Cell>
-        <% from_date = getattr(prod, 'rr_fmc_from_%d'%fmc) %>
-        <Cell ss:StyleID="${styles[i][1]}">
-         % if isDate(from_date):
-            <Data ss:Type="DateTime">${from_date|n}T00:00:00.000</Data>
-        % else:
-            <Data ss:Type="String"></Data>
-        % endif
-        </Cell>
+            % if fmc == 1:
+                <% from_date = getattr(prod, 'rr_fmc_from_%d'%fmc) %>
+                <Cell ss:StyleID="${styles[i][1]}">
+                 % if isDate(from_date):
+                    <Data ss:Type="DateTime">${from_date|n}T00:00:00.000</Data>
+                % else:
+                    <Data ss:Type="String"></Data>
+                % endif
+                </Cell>
+            % endif
 
-        <% to_date = getattr(prod, 'rr_fmc_to_%d'%fmc) %>
-        <Cell ss:StyleID="${styles[i][1]}">
-         % if isDate(to_date):
-            <Data ss:Type="DateTime">${to_date|n}T00:00:00.000</Data>
-        % else:
-            <Data ss:Type="String"></Data>
-        % endif
-        </Cell>
-        <% i = 1 - i %>
+            <% to_date = getattr(prod, 'rr_fmc_to_%d'%fmc) %>
+            <Cell ss:StyleID="${styles[i][1]}">
+             % if isDate(to_date):
+                <Data ss:Type="DateTime">${to_date|n}T00:00:00.000</Data>
+            % else:
+                <Data ss:Type="String"></Data>
+            % endif
+            </Cell>
+            <% i = 1 - i %>
         % endfor
     % endif
    </Row>
@@ -534,7 +538,7 @@
     <Range>R9C4:R${len(objects[0].line_ids)+9}C4</Range>
     <Type>List</Type>
     <CellRangeList/>
-    <Value>&quot;${_('Active')|x},${_('New')|x},${_('Replaced')|x},${_('Replacing')|x}&quot;</Value>
+    <Value>&quot;${_('Active')|x},${_('New')|x},${_('Replaced')|x},${_('Replacing')|x},${_('Phasing Out')|x},${_('Active-Replacing')|x}&quot;</Value>
   </DataValidation>
 
  </Worksheet>

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2020-04-22 15:55:54 +0000
+++ bin/addons/purchase/purchase_order.py	2020-07-27 12:47:56 +0000
@@ -828,6 +828,7 @@
         },
         ),
         'delivery_requested_date': fields.date(string='Delivery Requested Date', required=True),
+        'delivery_requested_date_modified': fields.date(string='Delivery Requested Date (modified)'),
         'delivery_confirmed_date': fields.date(string='Delivery Confirmed Date'),
         'ready_to_ship_date': fields.date(string='Ready To Ship Date'),
         'shipment_date': fields.date(string='Shipment Date', help='Date on which picking is created at supplier'),
@@ -1261,7 +1262,7 @@
             default = {}
         if context is None:
             context = {}
-        fields_to_reset = ['delivery_requested_date', 'ready_to_ship_date', 'date_order', 'delivery_confirmed_date', 'arrival_date', 'shipment_date', 'arrival_date', 'date_approve', 'analytic_distribution_id', 'empty_po_cancelled', 'stock_take_date']
+        fields_to_reset = ['delivery_requested_date', 'delivery_requested_date_modified', 'ready_to_ship_date', 'date_order', 'delivery_confirmed_date', 'arrival_date', 'shipment_date', 'arrival_date', 'date_approve', 'analytic_distribution_id', 'empty_po_cancelled', 'stock_take_date']
         to_del = []
         for ftr in fields_to_reset:
             if ftr not in default:
@@ -1359,6 +1360,8 @@
             context = {}
         # field name
         field_name = context.get('field_name', False)
+        if field_name == 'requested' and self.search_exists(cr, uid, [('id', 'in', ids), ('delivery_requested_date_modified', '=', False), ('state', '!=', 'draft')], context=context):
+            raise osv.except_osv(_('Warning'), _('Please fill the "Delivery Requested Date (modified)" field.'))
         assert field_name, 'The button is not correctly set.'
         # data
         data = getattr(self, field_name + '_data')(cr, uid, ids, context=context)
@@ -2259,7 +2262,6 @@
         if context is None:
             context = {}
         move_obj = self.pool.get('stock.move')
-        data_obj = self.pool.get('ir.model.data')
 
         pol = self.ensure_object(cr, uid, 'purchase.order.line', pol)
         internal = self.ensure_object(cr, uid, 'stock.picking', internal_id)
@@ -2269,18 +2271,8 @@
         # compute source location:
         src_location = pol.order_id.location_id
 
-        # compute destination location:
-        dest = pol.order_id.location_id.id
-        if pol.product_id.type == 'service_recep' and not pol.order_id.cross_docking_ok:
-            # service with reception are directed to Service Location
-            dest = self.pool.get('stock.location').get_service_location(cr, uid)
-        elif pol.product_id.type == 'consu':
-            dest = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
-        elif pol.linked_sol_id and pol.linked_sol_id.order_id.procurement_request and pol.linked_sol_id.order_id.location_requestor_id.usage != 'customer':
-            dest = pol.linked_sol_id.order_id.location_requestor_id.id
-        elif self.pool.get('stock.location').chained_location_get(cr, uid, src_location, product=pol.product_id, context=context):
-            # if input location has a chained location then use it
-            dest = self.pool.get('stock.location').chained_location_get(cr, uid, src_location, product=pol.product_id, context=context)[0].id
+        # compute destination location
+        dest = self.pool.get('purchase.order.line').final_location_dest(cr, uid, pol, context=context)
 
         values = {
             'name': ''.join((pol.order_id.name, ': ', (pol.name or ''))),

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2020-04-09 14:44:46 +0000
+++ bin/addons/purchase/purchase_order_line.py	2020-07-27 12:47:56 +0000
@@ -494,6 +494,7 @@
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True,
                                     ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null', select=True),
+        'location_dest_id': fields.many2one('stock.location', 'Final Destination of move', ondelete='set null', select=True),
         'price_unit': fields.float('Unit Price', required=True,
                                    digits_compute=dp.get_precision('Purchase Price Computation')),
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False,
@@ -1277,6 +1278,8 @@
 
         if not context.get('split_line'):
             default.update({'stock_take_date': False})
+            if 'location_dest_id' not in default:
+                default['location_dest_id'] = False
 
         # from RfQ line to PO line: grab the linked sol if has:
         if pol.order_id.rfq_ok and context.get('generate_po_from_rfq', False):
@@ -1333,6 +1336,7 @@
         if not 'soq_updated' in vals:
             vals['soq_updated'] = False
 
+        check_location_dest_ids = []
         for line in self.browse(cr, uid, ids, context=context):
             new_vals = vals.copy()
             # check qty
@@ -1343,6 +1347,9 @@
                     _('You can not have an order line with a negative or zero quantity')
                 )
 
+            if 'product_id' in vals and line.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n') and line.product_id.id != vals.get('product'):
+                check_location_dest_ids.append(line.id)
+
             # try to fill "link_so_id":
             if not line.link_so_id and not vals.get('link_so_id'):
                 linked_so = False
@@ -1372,6 +1379,10 @@
                         'po_line_id': line.id,
                     }, context=context)
 
+        for line in self.browse(cr, uid, check_location_dest_ids, context=context):
+            super(purchase_order_line, self).write(cr, uid, [line.id], {'location_dest_id': self.final_location_dest(cr, uid, line, context=context)}, context=context)
+
+
         if vals.get('stock_take_date'):
             self._check_stock_take_date(cr, uid, ids, context=context)
 
@@ -2074,6 +2085,44 @@
                         picking_id.write({}, context=context)
         return True
 
+    def final_location_dest(self, cr, uid, pol_obj, fo_obj=False, context=None):
+        data_obj = self.pool.get('ir.model.data')
+
+        dest = pol_obj.order_id.location_id.id
+
+        if not pol_obj.product_id:
+            return dest
+
+        if pol_obj.product_id.type == 'service_recep' and not pol_obj.order_id.cross_docking_ok:
+            # service with reception are directed to Service Location
+            return self.pool.get('stock.location').get_service_location(cr, uid)
+
+        if pol_obj.product_id.type == 'consu':
+            return data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
+
+        fo = fo_obj or pol_obj.linked_sol_id and pol_obj.linked_sol_id.order_id or False
+        if fo and fo.procurement_request and fo.location_requestor_id.usage != 'customer':
+            return fo.location_requestor_id.id
+
+        chained = self.pool.get('stock.location').chained_location_get(cr, uid, pol_obj.order_id.location_id, product=pol_obj.product_id, context=context)
+        if chained:
+            if chained[0].chained_location_type == 'nomenclature':
+                # 1st round : Input > Stock, 2nd round Stock -> MED/LOG
+                chained2 = self.pool.get('stock.location').chained_location_get(cr, uid, chained[0], product=pol_obj.product_id, context=context)
+                if chained2:
+                    return chained2[0].id
+            return chained[0].id
+
+        return dest
+
+    def open_po_form(self, cr, uid, ids, context=None):
+        pol = self.browse(cr, uid, ids[0], fields_to_fetch=['order_id'], context=context)
+
+        res = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'purchase.purchase_form_action', ['form', 'tree'], new_tab=True, context=context)
+        res['keep_open'] = True
+        res['res_id'] = pol.order_id.id
+        return res
+
 purchase_order_line()
 
 

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2020-04-14 07:48:08 +0000
+++ bin/addons/purchase/purchase_view.xml	2020-07-27 12:47:56 +0000
@@ -221,8 +221,10 @@
                                 <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" context="{'rfq_ok': False}"/>
                                 <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object"/>
                             </group>
-                            <button name="wizard_import_file" string="Import PO confirmation" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible':[('state', 'not in', ['validated', 'validated_p'])]}"/>
-                            <button name="export_po_integration" string="Export PO Validated" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible':[('state', 'not in', ['validated', 'validated_p'])]}"/>
+                            <group colspan="4" col="4" attrs="{'invisible':['&amp;', ('state', 'not in', ['validated', 'validated_p']), '|', ('partner_type', 'not in', ['esc', 'external']), ('state', 'not in', ['confirmed', 'confirmed_p'])]}">
+                                <button name="wizard_import_file" string="Import PO confirmation" icon="gtk-execute" colspan="1" type="object" />
+                                <button name="export_po_integration" string="Export PO Validated" icon="gtk-execute" colspan="1" type="object" />
+                            </group>
                             <field name="order_line" colspan="4" nolabel="1" mode="tree,form"
                                 context="{'purchase_id': active_id, 'partner_type': partner_type, 'categ': categ, 'pricelist_id': pricelist_id, 'rfq_ok': False, 'from_fo': po_from_fo or po_from_ir or False}"
                                 on_change="order_line_change(order_line)"
@@ -314,8 +316,11 @@
                             <group colspan="4" col="4">
                                 <separator colspan="4" string="Dates"/>
                                 <group colspan="2" col="3">
-                                    <field name="delivery_requested_date" attrs="{'readonly': [('state', 'not in', ('draft', 'draft_p', 'validated'))]}" on_change="onchange_requested_date(partner_id,date_order,delivery_requested_date,est_transport_lead_time, order_type, context)"/>
-                                    <button colspan="1" name="update_date" string="Apply to lines" type="object" context="{'field_name': 'requested', 'type': 'purchase.order'}" icon="gtk-indent" attrs="{'invisible': [('state', 'not in', ('draft', 'draft_p', 'validated'))]}"/>
+                                   <group colspan="2" col="4">
+                                    <field name="delivery_requested_date" attrs="{'readonly': [('state', '!=', 'draft')]}" on_change="onchange_requested_date(partner_id,date_order,delivery_requested_date,est_transport_lead_time, order_type, context)"/>
+                                    <field name="delivery_requested_date_modified" attrs="{'readonly': [('state', 'not in', ['draft_p', 'validated', 'validated_p'])]}" />
+                                   </group>
+                                    <button colspan="1" name="update_date" string="Apply to lines" type="object" context="{'field_name': 'requested', 'type': 'purchase.order'}" icon="gtk-indent" attrs="{'invisible': [('state', 'not in', ('draft', 'draft_p', 'validated', 'validated_p'))]}"/>
                                 </group>
                                 <group colspan="2" col="3">
                                     <field name="delivery_confirmed_date" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p', 'sourced_p'])]}"/>
@@ -1007,6 +1012,52 @@
 
         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" groups="base.group_extended" parent="menu_procurement_management_invoice" sequence="72"/>
 
+        <record id="purchase_order_line_pipeline_tree" model="ir.ui.view">
+            <field name="name">purchase.order.line.tree</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="250" />
+            <field name="arch" type="xml">
+                <tree string="Purchase Order Lines" hide_delete_button="1" hide_new_button="1">
+                    <field name="order_id"/>
+                    <field name="partner_id" string="Supplier"/>
+                    <field name="line_number"/>
+                    <field name="product_id"/>
+                    <field name="price_unit"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="date_planned" widget="date" />
+                    <field name="confirmed_delivery_date" widget="date" />
+                    <field name="state" />
+                    <button type="object" name="open_po_form" icon="terp-gtk-go-back-rtl" string="View PO" />
+                </tree>
+            </field>
+        </record>
+        <record id="purchase_order_line_pipeline_search" model="ir.ui.view">
+            <field name="name">purchase.order.line.search</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">search</field>
+            <field name="priority" eval="250" />
+            <field name="arch" type="xml">
+                <search>
+                    <field name="order_id"/>
+                    <field name="partner_id" string="Supplier"/>
+                    <field name="product_id"/>
+                    <field name="date_planned" widget="date" />
+                    <field name="confirmed_delivery_date" widget="date" />
+                </search>
+            </field>
+        </record>
+        <record id="purchase_line_pipeline_action" model="ir.actions.act_window">
+            <field name="name">PO Line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="domain"></field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="purchase_order_line_pipeline_tree" />
+            <field name="search_view_id" ref="purchase_order_line_pipeline_search"/>
+        </record>
 
     </data>
 </openerp>

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2020-01-23 16:34:09 +0000
+++ bin/addons/purchase/purchase_workflow.py	2020-07-27 12:47:56 +0000
@@ -18,7 +18,7 @@
         if pol.is_line_split:
             split_po_ids = self.search(cr, uid, [('is_line_split', '=', False), ('line_number', '=', pol.line_number), ('order_id', '=', pol.order_id.id)], context=context)
             if split_po_ids:
-                split_po = self.browse(cr, uid, split_po_ids[0], context=context)
+                split_po = self.browse(cr, uid, split_po_ids[0], fields_to_fetch=['linked_sol_id'], context=context)
                 if split_po.linked_sol_id:
                     sol_values['line_number'] = split_po.linked_sol_id.line_number
         return sol_values
@@ -148,6 +148,7 @@
             if pol.stock_take_date:
                 line_stock_take = pol.stock_take_date
 
+
             sol_values = {
                 'product_id': pol.product_id and pol.product_id.id or False,
                 'name': pol.name,
@@ -171,14 +172,16 @@
                 'nomen_sub_3': pol.nomen_sub_3 and pol.nomen_sub_3.id or False,
                 'nomen_sub_4': pol.nomen_sub_4 and pol.nomen_sub_4.id or False,
                 'nomen_sub_5': pol.nomen_sub_5 and pol.nomen_sub_5.id or False,
-                'confirmed_delivery_date': line_confirmed,
                 'stock_take_date': line_stock_take,
+                'date_planned': pol.date_planned,
                 'sync_sourced_origin': pol.instance_sync_order_ref and pol.instance_sync_order_ref.name or False,
                 'type': 'make_to_order',
                 'is_line_split': pol.is_line_split,
                 'original_line_id': pol.original_line_id.linked_sol_id.id if pol.original_line_id else False,
                 'procurement_request': sale_order.procurement_request,
             }
+            if pol.state not in ['confirmed', 'done', 'cancel', 'cancel_r']:
+                sol_values['confirmed_delivery_date'] = line_confirmed
 
             # update modification comment if it is set
             if pol.modification_comment:
@@ -341,7 +344,7 @@
                 'nomen_sub_5': pol.nomen_sub_5 and pol.nomen_sub_5.id or False,
                 'confirmed_delivery_date': line_confirmed,
                 'stock_take_date': line_stock_take,
-                'date_planned': (datetime.now() + relativedelta(days=+2)).strftime('%Y-%m-%d'),
+                'date_planned': pol.date_planned or (datetime.now() + relativedelta(days=+2)).strftime('%Y-%m-%d'),
                 'sync_sourced_origin': pol.instance_sync_order_ref and pol.instance_sync_order_ref.name or False,
                 'set_as_sourced_n': True,
             }
@@ -363,7 +366,7 @@
             new_sol_id = self.pool.get('sale.order.line').create(cr, uid, sol_values, context=context)
 
             # update current PO line:
-            self.write(cr, uid, pol.id, {'link_so_id': fo_id, 'linked_sol_id': new_sol_id}, context=context)
+            self.write(cr, uid, pol.id, {'link_so_id': fo_id, 'linked_sol_id': new_sol_id, 'location_dest_id': self.final_location_dest(cr, uid, pol, fo_obj=sale_order, context=context)}, context=context)
 
         context['from_back_sync'] = False
         return new_sol_id
@@ -582,7 +585,8 @@
             # doesn't update original qty and uom if already set (from IR)
             line_update = {
                 'original_price': pol.price_unit,
-                'original_currency_id': pol.currency_id.id
+                'original_currency_id': pol.currency_id.id,
+                'location_dest_id': self.final_location_dest(cr, uid, pol, context=context),
             }
 
             if not pol.original_product:

=== modified file 'bin/addons/stock/product.py'
--- bin/addons/stock/product.py	2020-01-09 14:41:10 +0000
+++ bin/addons/stock/product.py	2020-07-27 12:47:56 +0000
@@ -426,6 +426,44 @@
                         res['fields']['qty_available']['string'] = _('Produced Qty')
         return res
 
+    def get_pipeline_from_po(self, cr, uid, ids, from_date=False, to_date=False, location_ids=False, context=None):
+        '''
+            ids: product_ids
+
+            return the pipeline from validated(-p) purchase order line
+        '''
+
+        params = []
+        query = ''
+        if location_ids:
+            query += ' and location_dest_id in %s '
+            if isinstance(location_ids, (int, long)):
+                params.append((location_ids, ))
+            else:
+                params.append(tuple(location_ids))
+
+        if from_date:
+            query += ' and coalesce(confirmed_delivery_date, date_planned) > %s '
+            params.append(from_date)
+
+        if to_date:
+            query += ' and coalesce(confirmed_delivery_date, date_planned) <= %s '
+            params.append(to_date)
+
+
+        cr.execute('''
+            select
+                pol.product_id, sum(pol.product_qty)
+            from
+                purchase_order_line pol
+            where
+                pol.product_id in %s and
+                pol.state in ('validated', 'validated_n', 'sourced_sy', 'sourced_v', 'sourced_n')
+                ''' + query + '''
+                group by pol.product_id''',
+                   [tuple(ids)]+params)  # not_a_user_entry
+        return dict(cr.fetchall())
+
 product_product()
 
 class product_template(osv.osv):

=== modified file 'bin/addons/stock/stock_move.py'
--- bin/addons/stock/stock_move.py	2020-01-29 16:41:23 +0000
+++ bin/addons/stock/stock_move.py	2020-07-27 12:47:56 +0000
@@ -2415,5 +2415,14 @@
         return {
             'value': {'integrity_error': 'empty'}
         }
+
+    def open_in_form(self, cr, uid, ids, context=None):
+        move = self.browse(cr, uid, ids[0], fields_to_fetch=['picking_id', 'linked_incoming_move'], context=context)
+
+        res = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'stock.action_picking_tree4', ['form', 'tree'], new_tab=True, context=context)
+        res['keep_open'] = True
+        res['res_id'] = move.linked_incoming_move and move.linked_incoming_move.picking_id.id or move.picking_id.id
+        return res
+
 stock_move()
 

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2020-02-25 10:55:04 +0000
+++ bin/addons/stock/stock_view.xml	2020-07-27 12:47:56 +0000
@@ -1251,6 +1251,7 @@
                     <field name="ssl_check" invisible="True" widget="null_boolean" />
                     <field name="dg_check" widget="null_boolean" />
                     <field name="np_check" widget="null_boolean" />
+                    <button type="object" name="open_in_form" icon="terp-gtk-go-back-rtl" string="View IN" />
                 </tree>
             </field>
         </record>

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2020-05-25 09:59:55 +0000
+++ bin/osv/orm.py	2020-07-27 12:47:56 +0000
@@ -2117,7 +2117,7 @@
         '''
         return self.search(cr, user, args, offset, limit, order, context, count)
 
-    def search_exist(self, cr, user, args, context=None):
+    def search_exists(self, cr, user, args, context=None):
         """
         return True if there is at least one element matching the criterions,
         False otherwise.
@@ -2125,6 +2125,9 @@
         return bool(self.search(cr, user, args, context=context,
                                 limit=1, order='NO_ORDER'))
 
+    def search_exist(self, cr, user, args, context=None):
+        return self.search_exists(cr, user, args, context=context)
+
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         """
         Search for records based on a search domain.