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

[jftempo]

=== modified file 'bin/addons/consumption_calculation/weekly_forecast_report.py'
--- bin/addons/consumption_calculation/weekly_forecast_report.py	2021-05-31 15:26:49 +0000
+++ bin/addons/consumption_calculation/weekly_forecast_report.py	2021-08-26 07:25:55 +0000
@@ -799,7 +799,7 @@
             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
+               coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned) AS date
             FROM
                purchase_order_line pol
                LEFT JOIN product_product p ON p.id = pol.product_id
@@ -810,8 +810,8 @@
                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)
+               coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned) <= %(max_date)s
+            GROUP BY pol.product_id, coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned)
         UNION
             SELECT
                p.id AS product_id,
 
=== modified file 'bin/addons/procurement_cycle/replenishment.py'
--- bin/addons/procurement_cycle/replenishment.py	2021-08-09 17:12:00 +0000
+++ bin/addons/procurement_cycle/replenishment.py	2021-08-26 07:25:55 +0000
@@ -898,7 +898,7 @@
 
 
     _columns = {
-        'parent_id': fields.many2one('replenishment.parent.segment', 'Parent', required=1, ondelete='cascade', select=1, domain="[('hidden', '=', False), ('state_parent', 'in', ['complete', 'draft'])]"),
+        'parent_id': fields.many2one('replenishment.parent.segment', 'Parent', required=1, ondelete='cascade', select=1, domain="[('hidden', '=', False), ('state_parent', 'in', ['complete', 'draft']), ('is_current_instance', '=', True)]"),
         'name_seg': fields.char('Reference', size=64, readonly=1, select=1),
         'description_seg': fields.char('Replenishment Segment Description', required=1, size=28, select=1),
 
@@ -906,7 +906,7 @@
         'rule_alert': fields.function(_get_rule_alert, method=1, string='Replenishment Rule (Alert Theshold)', type='char'),
         'product_list_id': fields.many2one('product.list', 'Primary product list'),
         'state': fields.selection([('draft', 'Draft'), ('complete', 'Complete'), ('cancel', 'Cancelled'), ('archived', 'Archived')], 'State', readonly=1),
-        'fake_state': fields.related('state', string='State internal', readonly=1, write_relate=False),
+        'fake_state': fields.related('state', string='State internal', readonly=1, write_relate=False, type='char'),
         'safety_stock': fields.float_null('Safety Stock', computation=-1),
         'safety_stock_month': fields.function(_get_ss_month, type='float', method=True, string='Safety Stock in months'),
         'line_ids': fields.one2many('replenishment.segment.line', 'segment_id', 'Products', context={'default_code_only': 1}),
@@ -1021,7 +1021,7 @@
             loc_ids = [x.id for x in seg.local_location_ids]
             cr.execute('''
               select prod_id, min(date) from (
-                  select pol.product_id as prod_id, min(coalesce(pol.confirmed_delivery_date, pol.date_planned)) as date
+                  select pol.product_id as prod_id, min(coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned)) as date
                         from
                           purchase_order_line pol, replenishment_segment_line l
                         where
@@ -1195,15 +1195,15 @@
 
                     cr.execute('''
                     select date, sum(qty) from (
-                        select coalesce(pol.confirmed_delivery_date, pol.date_planned) as date, sum(pol.product_qty) as qty
+                        select coalesce(pol.confirmed_delivery_date, pol.esti_dd, 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)
+                          coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned) <= %(date)s
+                        group by coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned)
                         UNION
 
                         select date(m.date) as date, sum(product_qty) as product_qty from stock_move m, stock_picking p
@@ -1712,6 +1712,7 @@
             updated = 0
             ignored = 0
             for row in file_data.getRows():
+                cr.execute("SAVEPOINT seg_line")
                 idx += 1
                 if idx < 8:
                     # header
@@ -1863,12 +1864,19 @@
                     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
+                try:
+                    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 osv.except_osv as e:
+                    error.append(_('Line %d: %s' % (idx+1, misc.ustr(e.value))))
+                    ignored += 1
+                    cr.execute("ROLLBACK TO SAVEPOINT seg_line")
+                    continue
+                cr.execute("RELEASE SAVEPOINT seg_line")
 
         except Exception, e:
             cr.rollback()
@@ -2378,6 +2386,7 @@
 
     def _valid_fmc(self, cr, uid, ids, context=None):
         error = []
+        has_error = False
         line_ids = self.search(cr, uid, [('id', 'in', ids), ('segment_id.rule', '=', 'cycle')], context=context)
         if not line_ids:
             return True
@@ -2392,7 +2401,11 @@
                 if rr_from:
                     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 x == 1:
+                            error.append(_('%s, FMC FROM %d must start the 1st day of the month') % (line.product_id.default_code, x))
+                        else:
+                            # do not display error for computed value
+                            has_error = True
                     if not rr_to:
                         if not rr_fmc:
                             continue
@@ -2410,7 +2423,7 @@
                             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
-            if error:
+            if error or has_error:
                 raise osv.except_osv(_('Error'), _('Please correct the following FMC values:\n%s') % ("\n".join(error)))
 
             fmc_version = hashlib.md5(''.join(md5_data)).hexdigest()
 
=== modified file 'bin/addons/procurement_cycle/replenishment_view.xml'
--- bin/addons/procurement_cycle/replenishment_view.xml	2021-04-19 14:30:16 +0000
+++ bin/addons/procurement_cycle/replenishment_view.xml	2021-08-26 07:25:55 +0000
@@ -44,6 +44,7 @@
             <field name="name">replenishment.location.config.tree</field>
             <field name="model">replenishment.location.config</field>
             <field name="type">tree</field>
+            <field name="priority" eval="100"/>
             <field name="arch" type="xml">
                 <tree string="Location Configuration" colors="red:not review_active">
                     <field name="name" />
@@ -56,6 +57,23 @@
             </field>
         </record>
 
+        <record id="replenishment_location_config_tree_hide_new" model="ir.ui.view">
+            <field name="name">replenishment.location.config.tree_hide_new</field>
+            <field name="model">replenishment.location.config</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <tree string="Location Configuration" colors="red:not review_active" hide_new_button="1">
+                    <field name="name" />
+                    <field name="description" />
+                    <field name="synched" />
+                    <field name="main_instance" />
+                    <field name="active" />
+                    <field name="review_active" />
+                </tree>
+            </field>
+        </record>
+
         <record id="replenishment_location_config_search" model="ir.ui.view">
             <field name="name">replenishment.location.config.search</field>
             <field name="model">replenishment.location.config</field>
@@ -78,6 +96,7 @@
             <field name="res_model">replenishment.location.config</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="replenishment_location_config_tree" />
             <field name="domain">[('is_current_instance', '=', True)]</field>
         </record>
 
 
=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2021-08-09 17:27:06 +0000
+++ bin/addons/purchase/purchase_view.xml	2021-08-26 07:25:55 +0000
@@ -1042,6 +1042,7 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="date_planned" widget="date" />
+                    <field name="esti_dd" 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" />
 
=== modified file 'bin/addons/stock/product.py'
--- bin/addons/stock/product.py	2021-05-31 15:26:49 +0000
+++ bin/addons/stock/product.py	2021-08-26 07:25:55 +0000
@@ -244,7 +244,7 @@
         date_values = False
         where = [tuple(location_ids), tuple(location_ids), tuple(ids), tuple(states)]
 
-        pol_query_date = 'coalesce(pol.confirmed_delivery_date, pol.date_planned)'
+        pol_query_date = 'coalesce(pol.confirmed_delivery_date, pol.esti_dd, pol.date_planned)'
         date_pol_str = ''
         date_pol_cond = {}
         if from_strict_date and to_date:
 
=== modified file 'bin/addons/sync_so/picking.py'
--- bin/addons/sync_so/picking.py	2021-08-10 16:18:43 +0000
+++ bin/addons/sync_so/picking.py	2021-08-26 07:25:55 +0000
@@ -605,9 +605,9 @@
 
             in_name = self.browse(cr, uid, new_picking, context=context)['name']
             if po_id:
-                message = "The INcoming " + in_name + "(" + po_name + ") is now become shipped available!"
+                message = "The INcoming " + in_name + "(" + po_name + ") has now become shipped available!"
             else:
-                message = "The INcoming " + in_name + "(no PO) is now become shipped available!"
+                message = "The INcoming " + in_name + "(no PO) has now become shipped available!"
             if ignored_lines:
                 message = "\n".join([message]+ignored_lines)
                 context['partial_sync_run'] = True