Merge lp:~dorian-kemps/unifield-server/US-4662 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2018-05-25 09:13:25 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2018-06-08 07:59:32 +0000
@@ -625,7 +625,7 @@
 
                 # Line 3: Origin
                 origin = values.get(3, ['', ''])[1]
-                if origin != wiz.origin:
+                if wiz.purchase_id.name not in origin:
                     message = _("Import aborted, the Origin (%s) is not the same as in the Incoming Shipment %s (%s).") \
                         % (origin, wiz.picking_id.name, wiz.origin)
                     self.write(cr, uid, [wiz.id], {'message': message, 'state': 'error'}, context)
@@ -633,7 +633,7 @@
                     cr.commit()
                     cr.close(True)
                     return res
-                header_values['imp_origin'] = origin
+                header_values['imp_origin'] = wiz.origin
 
                 # Line 5: Transport mode
                 transport_mode = values.get(5, ['', ''])[1]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-05-22 13:24:12 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-06-08 07:59:32 +0000
@@ -1318,6 +1318,7 @@
                                            type='float', string='Discrepancy',
                                            store={'wizard.import.po.simulation.screen.line': (lambda self, cr, uid, ids, c={}: ids, ['imp_qty', 'imp_price', 'in_qty', 'in_price', 'type_change', 'po_line_id'], 20),}),
         'imp_currency': fields.many2one('res.currency', string='Currency', readonly=True),
+        'imp_stock_take_date': fields.date(string='Stock Take Date', readonly=True),
         'imp_drd': fields.date(string='Delivery Requested Date', readonly=True),
         'imp_dcd': fields.date(string='Delivery Confirmed Date', readonly=True),
         'esc_conf': fields.boolean(string='ESC Confirmed', readonly=True),
@@ -1503,6 +1504,23 @@
                     errors.append(err_msg)
                     write_vals['type_change'] = 'error'
 
+            # Stock Take Date
+            stock_take_date = values[9]
+            if stock_take_date and type(stock_take_date) == type(DateTime.now()):
+                write_vals['imp_stock_take_date'] = stock_take_date.strftime('%Y-%m-%d')
+            elif stock_take_date and isinstance(stock_take_date, str):
+                try:
+                    time.strptime(stock_take_date, '%Y-%m-%d')
+                    write_vals['imp_stock_take_date'] = stock_take_date
+                except ValueError:
+                    err_msg = _('Incorrect date value for field \'Stock Take Date\'')
+                    errors.append(err_msg)
+                    write_vals['type_change'] = 'error'
+            elif stock_take_date:
+                err_msg = _('Incorrect date value for field \'Stock Take Date\'')
+                errors.append(err_msg)
+                write_vals['type_change'] = 'error'
+
             # Delivery Requested Date
             drd_value = values[10]
             if drd_value and type(drd_value) == type(DateTime.now()):
@@ -1638,6 +1656,8 @@
                         line_vals['origin'] = line.imp_origin
                     if line.imp_external_ref:
                         line_vals['external_ref'] = line.imp_external_ref
+                    if line.imp_stock_take_date:
+                        line_vals['stock_take_date'] = line.imp_stock_take_date,
 
                     # UF-2537 after split reinject import qty computed in
                     # simu for import consistency versus simu
@@ -1684,6 +1704,8 @@
                              'display_sync_ref': True,
                              'created_by_vi_import': True,
                              }
+                if line.imp_stock_take_date:
+                    line_vals['stock_take_date'] = line.imp_stock_take_date,
                 if line.imp_dcd:
                     line_vals['confirmed_delivery_date'] = line.imp_dcd
                 if line.imp_project_ref:

=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2018-05-18 12:12:41 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2018-06-08 07:59:32 +0000
@@ -119,6 +119,22 @@
 
 purchase_order_report_xls('report.purchase.order_xls','purchase.order','addons/msf_supply_doc_export/report/report_purchase_order_xls.mako')
 
+
+def getInstanceAddressG(self):
+    part_addr = []
+    deliv_addr = ''
+    company_partner = self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id.partner_id
+    for addr in company_partner.address:
+        if addr.active:
+            if addr.type == 'default':
+                return addr.name or ''
+            elif addr.type == 'delivery':
+                deliv_addr = addr.name
+            else:
+                part_addr.append(addr.name)
+
+    return deliv_addr or (part_addr and part_addr[0]) or ''
+
 # VALIDATED PURCHASE ORDER (Excel XML)
 class validated_purchase_order_report_xls(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -154,11 +170,7 @@
         return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id.instance_id.instance
 
     def getInstanceAddress(self):
-        part_addr_id = self.pool.get('res.partner.address').search(self.cr, self.uid, [('partner_id', '=', self.uid)], limit=1)
-        part_addr = False
-        if part_addr_id:
-            part_addr = self.pool.get('res.partner.address').browse(self.cr, self.uid, part_addr_id)[0]
-        return part_addr.name if part_addr else ''
+        return getInstanceAddressG(self)
 
     def getCustomerAddress(self, customer_id):
         part_addr_obj = self.pool.get('res.partner.address')
@@ -222,11 +234,7 @@
         return res
 
     def getInstanceAddress(self):
-        part_addr_id = self.pool.get('res.partner.address').search(self.cr, self.uid, [('partner_id', '=', self.uid)], limit=1)
-        part_addr = False
-        if part_addr_id:
-            part_addr = self.pool.get('res.partner.address').browse(self.cr, self.uid, part_addr_id)[0]
-        return part_addr.name if part_addr else ''
+        return getInstanceAddressG(self)
 
 
 class validated_purchase_order_report_xml(WebKitParser):

=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2018-03-27 07:05:07 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2018-06-08 07:59:32 +0000
@@ -144,7 +144,7 @@
     </Row>
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Customer address name')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${getInstanceAddress() or ''|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${getInstanceAddress()|x}</Data></Cell>
     </Row>
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Customer address')}</Data></Cell>