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

[jftempo]

=== 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-03-02 16:53:19 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-03-27 07:15:50 +0000
@@ -46,7 +46,7 @@
 
 
 NB_OF_HEADER_LINES = 20
-NB_LINES_COLUMNS = 19
+NB_LINES_COLUMNS = 20
 
 
 PRODUCT_CODE_ID = {}
@@ -80,8 +80,8 @@
 HEADER_COLUMNS = [(1, _('Order Reference'), 'mandatory'),
                   (5, _('Supplier Reference'), 'optionnal'),
                   (9, _('Ready To Ship Date'), 'optionnal'),
-                  (16, _('Shipment Date'), 'optionnal'),
-                  (20, _('Message ESC'), 'optionnal')
+                  (14, _('Shipment Date'), 'optionnal'),
+                  (18, _('Message ESC'), 'optionnal')
                   ]
 
 
@@ -448,7 +448,7 @@
                                  'product_code', 'product_name',
                                  'product_qty', 'product_uom',
                                  'price_unit', 'currency_id',
-                                 'origin', 'comment', 'date_planned',
+                                 'origin', 'stock_take_date','comment', 'date_planned',
                                  'confirmed_delivery_date',
                                  'nomen_manda_0', 'nomen_manda_1',
                                  'nomen_manda_2',
@@ -687,11 +687,14 @@
                 # Line 6: Details
                 # Nothing to do
 
-                # Line 7: Delivery Requested Date
-                # Nothing to do
-
-                # Line 8: Transport mode
-                transport_mode = values.get(8, [])[1]
+                # Line 7: Stock take date
+                # Nothing to do
+
+                # Line 8: Delivery Requested Date
+                # Nothing to do
+
+                # Line 9: Transport mode
+                transport_mode = values.get(9, [])[1]
                 if transport_mode:
                     transport_select = self.fields_get(cr, uid, ['imp_transport_mode'], context=context)
                     for x in transport_select['imp_transport_mode']['selection']:
@@ -700,13 +703,13 @@
                             break
                     else:
                         possible_mode = ', '.join(x[1] for x in transport_select['imp_transport_mode']['selection'] if x[1])
-                        err_msg = _('Line 8 of the file: The transport mode \'%s\' is not \
+                        err_msg = _('Line 9 of the file: The transport mode \'%s\' is not \
 a valid transport mode. Valid transport modes: %s') % (transport_mode, possible_mode)
                         values_header_errors.append(err_msg)
 
 
-                # Line 9: RTS Date
-                rts_date = values.get(9, [])[1]
+                # Line 10: RTS Date
+                rts_date = values.get(10, [])[1]
                 if rts_date:
                     if type(rts_date) == type(DateTime.now()):
                         rts_date = rts_date.strftime('%Y-%m-%d')
@@ -716,30 +719,24 @@
                             time.strptime(rts_date, '%Y-%m-%d')
                             header_values['imp_ready_to_ship_date'] = rts_date
                         except:
-                            err_msg = _('Line 9 of the file: The date \'%s\' is not \
+                            err_msg = _('Line 10 of the file: The date \'%s\' is not \
     a valid date. A date must be formatted like \'YYYY-MM-DD\'') % rts_date
                             values_header_errors.append(err_msg)
 
-                # Line 10: Address name
-                # Nothing to do
-
-                # Line 11: Address street
-                # Nothing to do
-
-                # Line 12: Address street 2
-                # Nothing to do
-
-                # Line 13: Zip
-                # Nothing to do
-
-                # Line 14: City
-                # Nothing to do
-
-                # Line 15: Country
-                # Nothing to do
-
-                # Line 16: Shipment date
-                shipment_date = values.get(16, [])[1]
+                # Line 11: Delivery address name
+                # Nothing to do
+
+                # Line 12: Delivery address
+                # Nothing to do
+
+                # Line 13: Customer address name
+                # Nothing to do
+
+                # Line 14: Customer address
+                # Nothing to do
+
+                # Line 15: Shipment date
+                shipment_date = values.get(15, [])[1]
                 if shipment_date:
                     if type(shipment_date) == type(DateTime.now()):
                         shipment_date = shipment_date.strftime('%Y-%m-%d')
@@ -749,25 +746,27 @@
                             time.strptime(shipment_date, '%Y-%m-%d')
                             header_values['imp_shipment_date'] = shipment_date
                         except:
-                            err_msg = _('Line 9 of the file: The date \'%s\' is not \
+                            err_msg = _('Line 15 of the file: The date \'%s\' is not \
     a valid date. A date must be formatted like \'YYYY-MM-DD\'') % shipment_date
                             values_header_errors.append(err_msg)
 
-                # Line 17: Notes
+                # Line 16: Notes
                 # UFTP-59
                 if wiz.filetype != 'excel':
-                    header_values['imp_notes'] = values.get(17, [])[1]
-
-                # Line 18: Origin
-                # Nothing to do
-
-                # Line 19: Project Ref.
-                # Nothing to do
-
-                # Line 20: Message ESC Header
+                    header_values['imp_notes'] = values.get(16, [])[1]
+
+                # Line 17: Origin
+                # Nothing to do
+
+                # Line 18: Project Ref.
+                # Nothing to do
+
+                # Line 19: Message ESC Header
                 if wiz.filetype != 'excel':
-                    header_values['imp_message_esc'] = values.get(20, [])[1]
+                    header_values['imp_message_esc'] = values.get(19, [])[1]
 
+                # Line 20: Sourcing group
+                # Nothing to do
 
                 '''
                 The header values have been imported, start the importation of
@@ -1351,7 +1350,7 @@
                 errors.append(_('PO line #%s has been confirmed or cancelled and consequently is not editable') % line.in_line_number)
 
             # Comment
-            write_vals['imp_comment'] = values[14] and values[14].strip()
+            write_vals['imp_comment'] = values[15] and values[15].strip()
 
             # External Ref.
             write_vals['imp_external_ref'] = values[1]
@@ -1486,7 +1485,7 @@
                     write_vals['type_change'] = 'error'
 
             # Delivery Requested Date
-            drd_value = values[9]
+            drd_value = values[10]
             if drd_value and type(drd_value) == type(DateTime.now()):
                 write_vals['imp_drd'] = drd_value.strftime('%Y-%m-%d')
             elif drd_value and isinstance(drd_value, str):
@@ -1503,7 +1502,7 @@
                 write_vals['type_change'] = 'error'
 
             # Delivery Confirmed Date
-            dcd_value = values[10]
+            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):
@@ -1520,12 +1519,12 @@
                 write_vals['type_change'] = 'error'
 
             # Project Ref.
-            write_vals['imp_project_ref'] = values[16]
+            write_vals['imp_project_ref'] = values[17]
 
             # Message ESC1
-            write_vals['imp_esc1'] = values[17]
+            write_vals['imp_esc1'] = values[18]
             # Message ESC2
-            write_vals['imp_esc2'] = values[18]
+            write_vals['imp_esc2'] = values[19]
 
             if line.error_msg:
                 write_vals['type_change'] = 'error'
 
=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2017-11-06 10:23:04 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2018-03-27 07:15:50 +0000
@@ -126,9 +126,15 @@
             context = {}
         context['lang'] = 'en_MF'
         super(validated_purchase_order_report_xls, self).__init__(cr, uid, name, context=context)
+        self.cr = cr
+        self.uid = uid
         self.localcontext.update({
             'time': time,
             'maxADLines': self.get_max_ad_lines,
+            'getInstanceName': self.getInstanceName,
+            'getCustomerAddress': self.getCustomerAddress,
+            'getInstanceAddress': self.getInstanceAddress,
+            'getContactName': self.getContactName,
         })
 
     def set_context(self, objects, data, ids, report_type = None):
@@ -144,6 +150,29 @@
 
         return max_ad_lines
 
+    def getInstanceName(self):
+        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 ''
+
+    def getCustomerAddress(self, customer_id):
+        part_addr_obj = self.pool.get('res.partner.address')
+        part_addr_id = part_addr_obj.search(self.cr, self.uid, [('partner_id', '=', customer_id)], limit=1)[0]
+
+        return part_addr_obj.browse(self.cr, self.uid, part_addr_id).name
+
+    def getContactName(self, addr_id):
+        res = ''
+        if addr_id:
+            res = self.pool.get('res.partner.address').read(self.cr, self.uid, addr_id)['name']
+        return res
+
+
 SpreadsheetReport('report.validated.purchase.order_xls', 'purchase.order', 'addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako', parser=validated_purchase_order_report_xls)
 
 # VALIDATE PURCHASE ORDER (Pure XML)
@@ -153,9 +182,15 @@
             context = {}
         context['lang'] = 'en_MF'
         super(parser_validated_purchase_order_report_xml, self).__init__(cr, uid, name, context=context)
+        self.cr = cr
+        self.uid = uid
         self.localcontext.update({
             'time': time,
             'maxADLines': self.get_max_ad_lines,
+            'getInstanceName': self.getInstanceName,
+            'getCustomerAddress': self.getCustomerAddress,
+            'getContactName': self.getContactName,
+            'getInstanceAddress': self.getInstanceAddress,
         })
 
     def set_context(self, objects, data, ids, report_type = None):
@@ -171,6 +206,29 @@
 
         return max_ad_lines
 
+    def getInstanceName(self):
+        return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id.instance_id.instance
+
+    def getCustomerAddress(self, customer_id):
+        part_addr_obj = self.pool.get('res.partner.address')
+        part_addr_id = part_addr_obj.search(self.cr, self.uid, [('partner_id', '=', customer_id)], limit=1)[0]
+
+        return part_addr_obj.browse(self.cr, self.uid, part_addr_id).name
+
+    def getContactName(self, addr_id):
+        res = ''
+        if addr_id:
+            res = self.pool.get('res.partner.address').read(self.cr, self.uid, addr_id)['name']
+        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 ''
+
+
 class validated_purchase_order_report_xml(WebKitParser):
     def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
         WebKitParser.__init__(self, name, table, rml=rml, parser=parser, header=header, store=store)
 
=== 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	2017-11-17 09:11:27 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2018-03-27 07:15:50 +0000
@@ -103,6 +103,10 @@
         <Cell ss:StyleID="line" ><Data ss:Type="String">${o.details or ''|x}</Data></Cell>
     </Row>
     <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Stock Take Date')}</Data></Cell>
+        <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${o.stock_take_date|n}T00:00:00.000</Data></Cell>
+    </Row>
+    <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery Requested Date')}</Data></Cell>
         % if isDate(o.delivery_requested_date):
         <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${o.delivery_requested_date|n}T00:00:00.000</Data></Cell>
@@ -123,28 +127,28 @@
         % endif
     </Row>
     <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Address name')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery address name')}</Data></Cell>
+        % if o.order_type == 'direct':
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${getContactName(o.dest_address_id.id) or ''|x}</Data></Cell>
+        % else:
         <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.name or ''|x}</Data></Cell>
-    </Row>
-    <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Address street')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.street or ''|x}</Data></Cell>
-    </Row>
-    <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Address street 2')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.street2 or ''|x}</Data></Cell>
-    </Row>
-    <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Zip')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.zip or ''|x}</Data></Cell>
-    </Row>
-    <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('City')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.city or ''|x}</Data></Cell>
-    </Row>
-    <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Country')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.country_id and o.dest_address_id.country_id.name or ''|x}</Data></Cell>
+        % endif
+    </Row>
+    <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery address')}</Data></Cell>
+        % if o.order_type == 'direct':
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_partner_id and o.dest_partner_id.name or ''|x}</Data></Cell>
+        % else:
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${getInstanceName()|x}</Data></Cell>
+        % endif
+    </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>
+    </Row>
+    <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Customer address')}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${getInstanceName()|x}</Data></Cell>
     </Row>
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Shipment Date')}</Data></Cell>
@@ -170,6 +174,10 @@
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Message ESC Header')}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${o.message_esc or ''|x}</Data></Cell>
     </Row>
+    <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Sourcing group')}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${o.related_sourcing_id and o.related_sourcing_id.name or ''|x}</Data></Cell>
+    </Row>
 
     % if need_ad and o.analytic_distribution_id:
         <Row>
@@ -219,6 +227,7 @@
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Price Unit*')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency*')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Origin*')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Stock Take Date')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery requested date')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery confirmed date*')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Nomen Name')}</Data></Cell>
@@ -256,6 +265,7 @@
             <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.price_unit or 0.00)|x}</Data></Cell>
             <Cell ss:StyleID="line" ><Data ss:Type="String">${(o.pricelist_id.currency_id.name or '')|x}</Data></Cell>
             <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.origin or '')|x}</Data></Cell>
+            <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${line.stock_take_date|n}T00:00:00.000</Data></Cell>
             % if isDate(line.date_planned):
             <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${line.date_planned|n}T00:00:00.000</Data></Cell>
             % elif isDate(o.delivery_requested_date):
 
=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2017-11-17 09:15:40 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2018-03-27 07:15:50 +0000
@@ -12,6 +12,7 @@
         % endif
         <field name="partner_ref">${o.partner_ref or ''|x}</field>
         <field name="details">${o.details or ''|x}</field>
+        <field name="stock_take_date">${o.stock_take_date or ''|x}</field>
         % if o.delivery_requested_date and o.delivery_requested_date not in (False, 'False'):
         <field name="delivery_requested_date">${o.delivery_requested_date or ''|n}</field>
         % else:
@@ -24,14 +25,18 @@
         <field name="ready_to_ship_date"></field>
         % endif
         <field name="dest_address_id" key="name,parent.partner_id">
-        <field name="name">${o.dest_address_id and o.dest_address_id.name or ''|x}</field>
-        <field name="street">${o.dest_address_id and o.dest_address_id.street or ''|x}</field>
-        <field name="street2">${o.dest_address_id and o.dest_address_id.street2 or ''|x}</field>
-        <field name="zip">${o.dest_address_id and o.dest_address_id.zip or ''|x}</field>
-        <field name="city">${o.dest_address_id and o.dest_address_id.city or ''|x}</field>
-        <field name="country_id" key="name">
-            <field name="name">${o.dest_address_id and o.dest_address_id.country_id and o.dest_address_id.country_id.name or ''|x}</field>
-        </field>
+            % if o.order_type == 'direct':
+            <field name="delivery_name">${getContactName(o.dest_address_id.id) or ''|x}</field>
+            % else:
+            <field name="delivery_name">${o.dest_address_id and o.dest_address_id.name or ''|x}</field>
+            % endif
+            % if o.order_type == 'direct':
+            <field name="delivery_address">${o.dest_partner_id and o.dest_partner_id.name or ''|x}</field>
+            % else:
+            <field name="delivery_address">${getInstanceName()|x}</field>
+            % endif
+            <field name="customer_name">${getInstanceAddress() or ''|x}</field>
+            <field name="customer_address">${getInstanceName()|x}</field>
         </field>
         % if o.shipment_date and o.shipment_date not in (False, 'False'):
         <field name="shipment_date">${o.shipment_date|n}</field>
@@ -42,6 +47,7 @@
         <field name="origin">${o.origin or ''|x}</field>
         <field name="project_ref">${o.fnct_project_ref or ''|x}</field>
         <field name="message_esc">${o.message_esc or ''|x}</field>
+        <field name="related_sourcing_id">${o.related_sourcing_id and o.related_sourcing_id.name or ''|x}</field>
         <field name="analytic_distribution_id">
             % if need_ad and o.analytic_distribution_id:
                 % for ccl in o.analytic_distribution_id.cost_center_lines:
@@ -71,6 +77,7 @@
                         <field name="name">${l.currency_id and l.currency_id.name or ''|x}</field>
                     </field>
                     <field name="origin">${l.origin or ''|x}</field>
+                    <field name="stock_take_date">${l.stock_take_date or ''|x}</field>
                     % if l.date_planned and l.date_planned not in (False, 'False'):
                     <field name="date_planned">${l.date_planned|n}</field>
                     % else:
 
=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2018-02-22 14:23:17 +0000
+++ bin/addons/purchase/purchase_order.py	2018-03-27 07:15:50 +0000
@@ -646,8 +646,8 @@
         'customer_ref': fields.function(_get_customer_ref, fnct_search=_src_customer_ref, method=True, string='Customer Ref.', type='text', store=False),
         'line_count': fields.function(_get_line_count, method=True, type='integer', string="Line count", store=False),
 
-        'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
-        'dest_address_id':fields.many2one('res.partner.address', 'Destination Address',
+        'date_approve': fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
+        'dest_address_id': fields.many2one('res.partner.address', 'Destination Address',
                                           help="Put an address if you want to deliver directly from the supplier to the customer." \
                                           "In this case, it will remove the warehouse link and set the customer location."
                                           ),