Merge lp:~unifield-team/unifield-server/us-2065 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/analytic_distribution_supply/purchase.py'
--- bin/addons/analytic_distribution_supply/purchase.py	2016-11-09 10:33:09 +0000
+++ bin/addons/analytic_distribution_supply/purchase.py	2016-12-06 13:37:01 +0000
@@ -498,16 +498,11 @@
         if not default:
             default = {}
 
-        if isinstance(l_id, (int, long)):
-            l_id = [l_id]
-        data = self.read(cr, uid, l_id[0], ['confirmed_delivery_date'], context=context)
-
         # Update default
         default.update({'commitment_line_ids': [(6, 0, [])],})
-        default.update({"confirmed_delivery_date": data['confirmed_delivery_date']})
         if 'analytic_distribution_id' not in default and not context.get('keepDateAndDistrib'):
             default['analytic_distribution_id'] = False
-        new_data = super(purchase_order_line, self).copy_data(cr, uid, l_id[0], default, context)
+        new_data = super(purchase_order_line, self).copy_data(cr, uid, l_id, default, context)
         if new_data and new_data.get('analytic_distribution_id'):
             new_data['analytic_distribution_id'] = self.pool.get('analytic.distribution').copy(cr, uid, new_data['analytic_distribution_id'], {}, context=context)
         return new_data

=== modified file 'bin/addons/purchase_compare_rfq/wizard/compare_rfq.py'
--- bin/addons/purchase_compare_rfq/wizard/compare_rfq.py	2016-11-09 10:33:09 +0000
+++ bin/addons/purchase_compare_rfq/wizard/compare_rfq.py	2016-12-06 13:37:01 +0000
@@ -521,7 +521,7 @@
                 r.update({
                     'name_%s' % sid: sup.name,
                     'unit_price_%s' % sid: rfql and pu or 0.00,
-                    'confirmed_delivery_date_%s' % sid: rfql.confirmed_delivery_date,
+                    'confirmed_delivery_date_%s' % sid: rfql and rfql.confirmed_delivery_date or False,
                     'comment_%s' % sid: rfql and rfql.comment or '',
                 })
 

=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2016-11-09 10:33:09 +0000
+++ bin/addons/sourcing/procurement_order.py	2016-12-06 13:37:01 +0000
@@ -128,8 +128,9 @@
             if procurement and procurement.tender_line_id:
                 if procurement.tender_line_id.comment:
                     line['comment'] = procurement.tender_line_id.comment
-                if procurement.tender_line_id.purchase_order_line_id and procurement.tender_line_id.purchase_order_line_id.confirmed_delivery_date:
-                    line.update({'confirmed_delivery_date': procurement.tender_line_id.purchase_order_line_id.confirmed_delivery_date})
+                # US-2065 - Do not push Delivery confirmed date on the RfQ to the PO
+                # if procurement.tender_line_id.purchase_order_line_id and procurement.tender_line_id.purchase_order_line_id.confirmed_delivery_date:
+                #     line.update({'confirmed_delivery_date': procurement.tender_line_id.purchase_order_line_id.confirmed_delivery_date})
 
         if not line.get('price_unit', False):
             cur_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2016-10-27 10:25:44 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2016-12-06 13:37:01 +0000
@@ -588,7 +588,11 @@
       %>
     <Cell ss:StyleID="s87"><Data ss:Type="String">${line.get(sup_name, '')|x}</Data></Cell>
     <Cell ss:StyleID="s88"><Data ss:Type="Number">${line.get(sup_price, 0.00)}</Data></Cell>
-    <Cell ss:StyleID="sShortDate"><Data ss:Type="DateTime">${line.get(sup_confirmed_delivery_date, '')|x}T00:00:00.000</Data></Cell>
+    % if line.get(sup_confirmed_delivery_date, False):
+        <Cell ss:StyleID="sShortDate"><Data ss:Type="DateTime">${line.get(sup_confirmed_delivery_date, '')|x}T00:00:00.000</Data></Cell>
+    % else:
+        <Cell ss:StyleID="s87"><Data ss:Type="String"></Data></Cell>
+    % endif
     <Cell ss:StyleID="s90"><Data ss:Type="String">${line.get(sup_comment, '')|x}</Data></Cell>
       % endfor
     <Cell ss:StyleID="s91"><Data ss:Type="String">${line.choosen_supplier_id or ''|x}</Data></Cell>

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.py'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2016-10-25 07:31:30 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2016-12-06 13:37:01 +0000
@@ -78,7 +78,7 @@
                     'name_%s' % sid: sup.name,
                     'unit_price_%s' % sid: pu,
                     'comment_%s' % sid: rfql and rfql.comment or '',
-                    'confirmed_delivery_date_%s' % sid: rfql.confirmed_delivery_date,
+                    'confirmed_delivery_date_%s' % sid: rfql and rfql.confirmed_delivery_date or False,
                 })
 
             lines.append(line_vals)

=== modified file 'bin/addons/tender_flow/tender_flow.py'
--- bin/addons/tender_flow/tender_flow.py	2016-11-09 10:33:09 +0000
+++ bin/addons/tender_flow/tender_flow.py	2016-12-06 13:37:01 +0000
@@ -641,8 +641,9 @@
                     'comment': line.comment,
                 }
 
-                if line.purchase_order_line_id:
-                    pol_values.update({'confirmed_delivery_date': line.purchase_order_line_id.confirmed_delivery_date})
+                # US-2065 - Do not push Delivery confirmed date on the RfQ to the PO
+                # if line.purchase_order_line_id:
+                #     pol_values.update({'confirmed_delivery_date': line.purchase_order_line_id.confirmed_delivery_date})
 
                 data.setdefault(line.supplier_id.id, {}) \
                     .setdefault('order_line', []).append((0,0, dict(pol_values)))