Merge lp:~mallorymarcot/unifield-server/us-3106 into lp:unifield-server

[jftempo]

[jftempo (jfb-tempo-consulting)]

Please see my comment.

=== 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-11-05 13:26:55 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2018-11-09 16:23:13 +0000
@@ -28,6 +28,7 @@
 from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
 from tools.translate import _
 from purchase import PURCHASE_ORDER_STATE_SELECTION
+from datetime import datetime
 
 import pooler
 import time
@@ -507,6 +508,16 @@
             report_line['qty_backordered'] = ''
             report_line['unit_price'] = ''
             report_line['in_unit_price'] = ''
+            report_line['delivery_requested_date'] = ''
+            report_line['customer'] = ''
+            report_line['customer_ref'] = ''
+            report_line['source_doc'] = ''
+            report_line['supplier'] = ''
+            report_line['supplier_ref'] = ''
+            report_line['order_type'] = ''
+            report_line['currency'] = ''
+            report_line['total_currency'] = ''
+            report_line['total_func_currency'] = ''
             report_line['destination'] = analytic_line.get('destination')
             report_line['cost_centre'] = analytic_line.get('cost_center')
             res.append(report_line)
@@ -519,6 +530,86 @@
 
         raise StopIteration
 
+    def getLineStyle(self, line):
+        return 'lgrey' if line.get('raw_state', '') in ['cancel', 'cancel_r'] else 'line'
+
+    def get_total_currency(self, in_unit_price, qty_received):
+        if not in_unit_price or not qty_received:
+            return '0.00'
+        try:
+            in_unit_price = float(in_unit_price)
+            qty_received = float(qty_received)
+        except:
+            return '0.00'
+        return in_unit_price * qty_received
+
+    def get_exchange_rate(self, pol_id):
+        pol = self.pool.get('purchase.order.line').browse(self.cr, self.uid, pol_id)
+        context = {}
+        exchange_rate = 0.0
+        if pol.closed_date:
+            context.update({'date': pol.closed_date})
+        elif pol.confirmation_date:
+            context.update({'date': pol.confirmation_date})
+        elif pol.validation_date:
+            context.update({'date': pol.validation_date})
+        elif pol.create_date: # could be null, because not mandatory in DB
+            context.update({'date': pol.create_date})
+        else:
+            context.update({'date': datetime.now().strftime('%Y-%m-%d')})
+
+        currency_from = pol.order_id.pricelist_id.currency_id
+        currency_to = self.pool.get('res.users').browse(self.cr, self.uid, self.uid, context=context).company_id.currency_id
+        exchange_rate = self.pool.get('res.currency')._get_conversion_rate(self.cr, self.uid, currency_from, currency_to, context=context)
+
+        return exchange_rate
+
+    def get_total_func_currency(self, pol_id, in_unit_price, qty_received):
+        ex_rate = self.get_exchange_rate(pol_id)
+        total_currency = self.get_total_currency(in_unit_price, qty_received)
+        total_currency = float(total_currency)
+
+        return total_currency * ex_rate
+
+    def get_qty_backordered(self, pol_id, qty_ordered, qty_received, first_line):
+        pol = self.pool.get('purchase.order.line').browse(self.cr, self.uid, pol_id)
+        if pol.state.startswith('cancel'):
+            return '0.00'
+        if not qty_ordered:
+            return '0.00'
+        try:
+            qty_ordered = float(qty_ordered)
+            qty_received = float(qty_received)
+        except:
+            return '0.00'
+
+        # Line partially received:
+        in_move_done = self.pool.get('stock.move').search(self.cr, self.uid, [
+            ('type', '=', 'in'),
+            ('purchase_line_id', '=', pol.id),
+            ('state', '=', 'done'),
+        ])
+        if first_line and in_move_done:
+            total_done = 0.0
+            for move in self.pool.get('stock.move').browse(self.cr, self.uid, in_move_done, fields_to_fetch=['product_qty','product_uom']):
+                if pol.product_uom.id != move.product_uom.id:
+                    total_done += self.pool.get('product.uom')._compute_qty(self.cr, self.uid, move.product_uom.id, move.product_qty, pol.product_uom.id)
+                else:
+                    total_done += move.product_qty
+            return qty_ordered - total_done
+
+        return qty_ordered - qty_received
+
+
+    def format_date(self, date):
+        if not date:
+            return ''
+        time_tuple = time.strptime(date, '%Y-%m-%d')
+        new_date = time.strftime('%d.%m.%Y', time_tuple)
+
+        return new_date
+
+
     def getPOLines(self, po_id):
         ''' developer note: would be a lot easier to write this as a single sql and then use on-break '''
         po_obj = self.pool.get('purchase.order')
@@ -549,8 +640,9 @@
             if not same_product_same_uom:
                 report_line = {
                     'order_ref': order.name or '',
-                    'order_created': order.date_order or '',
-                    'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
+                    'order_created': self.format_date(order.date_order),
+                    'order_confirmed_date': self.format_date(line.confirmed_delivery_date),
+                    'delivery_requested_date': self.format_date(line.date_planned),
                     'raw_state': line.state,
                     'line_status': get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
                     'state': line.state_to_display or '',
@@ -562,7 +654,7 @@
                     'uom': line.product_uom.name or '',
                     'qty_received': '0.00',
                     'in': '',
-                    'qty_backordered': '',
+                    'qty_backordered': self.get_qty_backordered(line.id, line.product_qty, 0.0, first_line),
                     'destination': analytic_lines[0].get('destination'),
                     'cost_centre': analytic_lines[0].get('cost_center'),
                     'unit_price': line.price_unit or '',
@@ -570,7 +662,13 @@
                     'customer': line.linked_sol_id and line.linked_sol_id.order_id.partner_id.name or '',
                     'customer_ref': line.linked_sol_id and line.linked_sol_id.order_id.client_order_ref and '.' in line.linked_sol_id.order_id.client_order_ref and line.linked_sol_id.order_id.client_order_ref.split('.')[1] or '',
                     'source_doc': line.origin or '',
+                    'supplier': line.order_id.partner_id.name or '',
                     'supplier_ref': line.order_id.partner_ref and '.' in line.order_id.partner_ref and line.order_id.partner_ref.split('.')[1] or '',
+                    # new
+                    'order_type': get_sel(self.cr, self.uid, 'purchase.order', 'order_type', line.order_id.order_type, {}) or '',
+                    'currency': line.order_id.pricelist_id.currency_id.name or '',
+                    'total_currency': '', 
+                    'total_func_currency': '',
                 }
                 report_lines.append(report_line)
                 report_lines.extend(self.printAnalyticLines(analytic_lines))
@@ -579,20 +677,21 @@
             for spsul in sorted(same_product_same_uom, key=lambda spsu: spsu.get('backorder_id'), reverse=True):
                 report_line = {
                     'order_ref': order.name or '',
-                    'order_created': order.date_order or '',
-                    'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
+                    'order_created': self.format_date(order.date_order),
+                    'order_confirmed_date': self.format_date(line.confirmed_delivery_date or order.delivery_confirmed_date),
+                    'delivery_requested_date': self.format_date(line.date_planned),
                     'raw_state': line.state,
                     'order_status': self._get_states().get(order.state, ''),
                     'line_status': first_line and get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
                     'state': line.state_to_display or '',
-                    'item': first_line and line.line_number or '',
-                    'code': first_line and line.product_id.default_code or '',
-                    'description': first_line and line.product_id.name or '',
+                    'item': line.line_number or '',
+                    'code': line.product_id.default_code or '',
+                    'description': line.product_id.name or '',
                     'qty_ordered': first_line and line.product_qty or '',
                     'uom': line.product_uom.name or '',
                     'qty_received': spsul.get('state') == 'done' and spsul.get('product_qty', '') or '0.00',
                     'in': spsul.get('name', '') or '',
-                    'qty_backordered': '',
+                    'qty_backordered': self.get_qty_backordered(line.id, first_line and line.product_qty or 0.0, spsul.get('state') == 'done' and spsul.get('product_qty', 0.0) or 0.0, first_line),
                     'destination': analytic_lines[0].get('destination'),
                     'cost_centre': analytic_lines[0].get('cost_center'),
                     'unit_price': line.price_unit or '',
@@ -600,13 +699,23 @@
                     'customer': line.linked_sol_id and line.linked_sol_id.order_id.partner_id.name or '',
                     'customer_ref': line.linked_sol_id and line.linked_sol_id.order_id.client_order_ref and '.' in line.linked_sol_id.order_id.client_order_ref and line.linked_sol_id.order_id.client_order_ref.split('.')[1] or '',
                     'source_doc': line.origin or '',
+                    'supplier': line.order_id.partner_id.name or '',
                     'supplier_ref': line.order_id.partner_ref and '.' in line.order_id.partner_ref and line.order_id.partner_ref.split('.')[1] or '',
+                    # new
+                    'order_type': get_sel(self.cr, self.uid, 'purchase.order', 'order_type', line.order_id.order_type, {}) or '',
+                    'currency': line.order_id.pricelist_id.currency_id.name or '',
+                    'total_currency': self.get_total_currency(spsul.get('price_unit'), spsul.get('state') == 'done' and spsul.get('product_qty', '') or 0.0), 
+                    'total_func_currency': self.get_total_func_currency(
+                        line.id,
+                        spsul.get('price_unit', 0.0),
+                        spsul.get('state') == 'done' and spsul.get('product_qty', 0.0) or 0.0
+                    ), 
                 }
 
                 report_lines.append(report_line)
 
-                if spsul.get('backorder_id') and spsul.get('state') != 'done':
-                    report_line['qty_backordered'] = spsul.get('product_qty', '')
+                # if spsul.get('backorder_id') and spsul.get('state') != 'done':
+                #     report_line['qty_backordered'] = spsul.get('product_qty', '')
 
                 if first_line:
                     report_lines.extend(self.printAnalyticLines(analytic_lines))
@@ -615,20 +724,21 @@
             for spl in sorted(same_product, key=lambda spsu: spsu.get('backorder_id'), reverse=True):
                 report_line = {
                     'order_ref': order.name or '',
-                    'order_created': order.date_order or '',
-                    'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
+                    'order_created': self.format_date(order.date_order),
+                    'order_confirmed_date': self.format_date(line.confirmed_delivery_date or order.delivery_confirmed_date),
+                    'delivery_requested_date': self.format_date(line.date_planned),
                     'raw_state': line.state,
                     'order_status': self._get_states().get(order.state, ''),
                     'line_status': first_line and get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
                     'state': line.state_to_display or '',
-                    'item': first_line and line.line_number or '',
-                    'code': first_line and line.product_id.default_code or '',
-                    'description': first_line and line.product_id.name or '',
+                    'item': line.line_number or '',
+                    'code': line.product_id.default_code or '',
+                    'description': line.product_id.name or '',
                     'qty_ordered': first_line and line.product_qty or '',
                     'uom': uom_obj.read(self.cr, self.uid, spl.get('product_uom'), ['name'])['name'],
                     'qty_received': spl.get('state') == 'done' and spl.get('product_qty', '') or '0.00',
                     'in': spl.get('name', '') or '',
-                    'qty_backordered': '',
+                    'qty_backordered': self.get_qty_backordered(line.id, first_line and line.product_qty or 0.0, spl.get('state') == 'done' and spl.get('product_qty', 0.0) or 0.0, first_line),
                     'destination': analytic_lines[0].get('destination'),
                     'cost_centre': analytic_lines[0].get('cost_center'),
                     'unit_price': line.price_unit or '',
@@ -636,12 +746,22 @@
                     'customer': line.linked_sol_id and line.linked_sol_id.order_id.partner_id.name or '',
                     'customer_ref': line.linked_sol_id and line.linked_sol_id.order_id.client_order_ref and '.' in line.linked_sol_id.order_id.client_order_ref and line.linked_sol_id.order_id.client_order_ref.split('.')[1] or '',
                     'source_doc': line.origin or '',
+                    'supplier': line.order_id.partner_id.name or '',
                     'supplier_ref': line.order_id.partner_ref and '.' in line.order_id.partner_ref and line.order_id.partner_ref.split('.')[1] or '',
+                    # new
+                    'order_type': get_sel(self.cr, self.uid, 'purchase.order', 'order_type', line.order_id.order_type, {}) or '',
+                    'currency': line.order_id.pricelist_id.currency_id.name or '',
+                    'total_currency': self.get_total_currency(spl.get('price_unit'), spl.get('state') == 'done' and spl.get('product_qty', 0.0) or 0.0),
+                    'total_func_currency': self.get_total_func_currency(
+                        line.id,
+                        spl.get('price_unit', 0.0),
+                        spl.get('state') == 'done' and spl.get('product_qty', 0.0) or 0.0
+                    ), 
                 }
                 report_lines.append(report_line)
 
-                if spl.get('backorder_id') and spl.get('state') != 'done':
-                    report_line['qty_backordered'] = spl.get('product_qty', '')
+                # if spl.get('backorder_id') and spl.get('state') != 'done':
+                #     report_line['qty_backordered'] = spl.get('product_qty', '')
 
                 if first_line:
                     report_lines.extend(self.printAnalyticLines(analytic_lines))
@@ -651,8 +771,9 @@
                 prod_brw = prod_obj.browse(self.cr, self.uid, ol.get('product_id'))
                 report_line = {
                     'order_ref': order.name or '',
-                    'order_created': order.date_order or '',
-                    'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
+                    'order_created': self.format_date(order.date_order),
+                    'order_confirmed_date': self.format_date(line.confirmed_delivery_date or order.delivery_confirmed_date),
+                    'delivery_requested_date': self.format_date(line.date_planned),
                     'raw_state': line.state,
                     'order_status': self._get_states().get(order.state, ''),
                     'line_status': get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
@@ -664,7 +785,7 @@
                     'uom': uom_obj.read(self.cr, self.uid, ol.get('product_uom'), ['name'])['name'],
                     'qty_received': ol.get('state') == 'done' and ol.get('product_qty', '') or '0.00',
                     'in': ol.get('name', '') or '',
-                    'qty_backordered': '',
+                    'qty_backordered': self.get_qty_backordered(line.id, first_line and line.product_qty or 0.0, ol.get('state') == 'done' and ol.get('product_qty', 0.0) or 0.0, first_line),
                     'destination': analytic_lines[0].get('destination'),
                     'cost_centre': analytic_lines[0].get('cost_center'),
                     'unit_price': line.price_unit or '',
@@ -672,7 +793,17 @@
                     'customer': line.linked_sol_id and line.linked_sol_id.order_id.partner_id.name or '',
                     'customer_ref': line.linked_sol_id and line.linked_sol_id.order_id.client_order_ref and '.' in line.linked_sol_id.order_id.client_order_ref and line.linked_sol_id.order_id.client_order_ref.split('.')[1] or '',
                     'source_doc': line.origin or '',
+                    'supplier': line.order_id.partner_id.name or '',
                     'supplier_ref': line.order_id.partner_ref and '.' in line.order_id.partner_ref and line.order_id.partner_ref.split('.')[1] or '',
+                    # new
+                    'order_type': get_sel(self.cr, self.uid, 'purchase.order', 'order_type', line.order_id.order_type, {}) or '',
+                    'currency': line.order_id.pricelist_id.currency_id.name or '',
+                    'total_currency': self.get_total_currency(ol.get('price_unit'), ol.get('state') == 'done' and ol.get('product_qty', 0.0) or 0.0),
+                    'total_func_currency': self.get_total_func_currency(
+                        line.id,
+                        ol.get('price_unit', 0.0),
+                        ol.get('state') == 'done' and ol.get('product_qty', 0.0) or 0.0
+                    ), 
                 }
                 report_lines.append(report_line)
 
@@ -722,8 +853,33 @@
         return self.datas.get('report_header')[1]
 
     def getPOLineHeaders(self):
-        return ['Order Ref', 'Item', 'Code', 'Description', 'Qty ordered', 'UoM', 'Qty received', 'IN', 'Qty backorder', 'Unit Price', 'IN unit price', 'Created', 'Confirmed Delivery', 'Doc. Status', 'Line Status', 'Destination', 'Cost Center', 'Customer', 'Customer Reference', 'Source Document', 'Supplier Reference']
-
+        return [
+            'Order Reference',
+            'Supplier',
+            'Order Type',
+            'Line',
+            'Product Code',
+            'Product Description',
+            'Qty ordered',
+            'UoM',
+            'Qty received',
+            'IN Reference',
+            'Qty backorder',
+            'PO Unit Price (Currency)',
+            'IN unit price (Currency)',
+            'Currency',
+            'Total value received (Currency)',
+            'Total value received (Functional Currency)',
+            'Created',
+            'Delivery Requested Date',
+            'Delivery Confirmed Date',
+            'PO Line Status',
+            'PO Document Status',
+            'Customer',
+            'Customer Reference',
+            'Source Document',
+            'Supplier Reference',
+        ]
 
 
 class parser_po_follow_up_xls(po_follow_up_mixin, report_sxw.rml_parse):
@@ -740,6 +896,7 @@
             'getPOLines': self.getPOLines,
             'getPOLineHeaders': self.getPOLineHeaders,
             'getRunParms': self.getRunParms,
+            'getLineStyle': self.getLineStyle,
         })
 
 

=== modified file 'bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako	2018-09-10 09:54:05 +0000
+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako	2018-11-09 16:23:13 +0000
@@ -23,8 +23,8 @@
 <Styles>
   <Style ss:ID="mainheader">
         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="0"/>
-        <Font ss:FontName="Calibri" x:Family="Swiss" ss:Color="#000000"/>
-        <Interior ss:Color="#E6E6E6" ss:Pattern="Solid"/>
+        <Font ss:FontName="Calibri" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
         <Borders>
           <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
           <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
@@ -46,7 +46,7 @@
     
     <Style ss:ID="header">
         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-        <Interior ss:Color="#d3d3d3" ss:Pattern="Solid"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
         <Borders>
           <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
           <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
@@ -65,7 +65,7 @@
         </Borders>
     </Style>
 
-    <Style ss:ID="line_grey">
+    <Style ss:ID="lgrey">
         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
         <Borders>
           <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
@@ -90,60 +90,72 @@
 
 <ss:Worksheet ss:Name="PO Follow Up">
 ## definition of the columns' size
-<% nb_of_columns = 12 %>
+<% nb_of_columns = 21 %>
 <Table x:FullColumns="1" x:FullRows="1">
-    # Order name
+    # Order ref
+    <Column ss:AutoFitWidth="1" ss:Width="150" />
+    # Supplier
+    <Column ss:AutoFitWidth="1" ss:Width="150" />
+    # Order Type
     <Column ss:AutoFitWidth="1" ss:Width="65" />
-    # Item
+    # Line
     <Column ss:AutoFitWidth="1" ss:Width="40" />
-    # Code
-    <Column ss:AutoFitWidth="1" ss:Width="81" />
-    # Description
-    <Column ss:AutoFitWidth="1" ss:Width="161" />
+    # Product Code
+    <Column ss:AutoFitWidth="1" ss:Width="100" />
+    # Product Description
+    <Column ss:AutoFitWidth="1" ss:Width="200" />
     # Qty ordered
     <Column ss:AutoFitWidth="1" ss:Width="57" />
     # UoM
-    <Column ss:AutoFitWidth="1" ss:Width="65" />
+    <Column ss:AutoFitWidth="1" ss:Width="40" />
     # Qty received
-    <Column ss:AutoFitWidth="1" ss:Width="80" />
+    <Column ss:AutoFitWidth="1" ss:Width="65" />
     # IN
     <Column ss:AutoFitWidth="1" ss:Width="60" />
     # Qty backorder
     <Column ss:AutoFitWidth="1" ss:Width="58" />
     # Unit Price
-    <Column ss:AutoFitWidth="1" ss:Width="95" />
+    <Column ss:AutoFitWidth="1" ss:Width="65" />
     # IN Unit Price
+    <Column ss:AutoFitWidth="1" ss:Width="65" />
+    # Currency
+    <Column ss:AutoFitWidth="1" ss:Width="65" />
+    # Total Currency
+    <Column ss:AutoFitWidth="1" ss:Width="95" />
+    # Total Functional Currency
     <Column ss:AutoFitWidth="1" ss:Width="95" />
     # Created (order)
-    <Columns ss:AutoFitWidth="1" ss:Width="95" />
-    # Delivery Confirmed (order)
-    <Columns ss:AutoFitWidth="1" ss:Width="95" />
+    <Column ss:AutoFitWidth="1" ss:Width="80" />
+    # Delivery Requested Date
+    <Column ss:AutoFitWidth="1" ss:Width="80" />
+    # Delivery Confirmed Date
+    <Column ss:AutoFitWidth="1" ss:Width="80" />
+    # Status (line)
+    <Column ss:AutoFitWidth="1" ss:Width="80" />
     # Status (order)
-    <Columns ss:AutoFitWidth="1" ss:Width="95" />
-    # Status (line)
-    <Columns ss:AutoFitWidth="1" ss:Width="95" />
-    # Destination
-    <Column ss:AutoFitWidth="1" ss:Width="95" />
-    # Cost Center
-    <Column ss:AutoFitWidth="1" ss:Width="95" />
+    <Column ss:AutoFitWidth="1" ss:Width="80" />
     # Customer
-    <Columns ss:AutoFitWidth="1" ss:Width="120" />
+    <Column ss:AutoFitWidth="1" ss:Width="120" />
     # Customer ref
-    <Columns ss:AutoFitWidth="1" ss:Width="160" />
+    <Column ss:AutoFitWidth="1" ss:Width="150" />
     # Source document
-    <Columns ss:AutoFitWidth="1" ss:Width="160" />
+    <Column ss:AutoFitWidth="1" ss:Width="150" />
     # Supplier ref
-    <Columns ss:AutoFitWidth="1" ss:Width="160" />
-
+    <Column ss:AutoFitWidth="1" ss:Width="150" />
 <Row>
-    <Cell ss:MergeAcross="11" ss:StyleID="mainheader"><Data ss:Type="String">${getRunParms()['title'] or '' |x}</Data></Cell>
-</Row>
-<Row ss:AutoFitHeight="1">
-   <Cell ss:MergeAcross="2" ss:StyleID="mainheader"><Data ss:Type="String">Report run date: ${getRunParms()['run_date'] or '' |x}</Data></Cell>
-   <Cell ss:MergeAcross="1" ss:StyleID="mainheader"><Data ss:Type="String">PO date from: ${getRunParms()['date_from'] or ''|x}</Data></Cell>
-   <Cell ss:MergeAcross="1" ss:StyleID="mainheader"><Data ss:Type="String">PO date to: ${getRunParms()['date_thru'] or '' |x}</Data></Cell>
-   <Cell ss:MergeAcross="1" ss:StyleID="mainheader"><Data ss:Type="String">Supplier: ${getRunParms()['supplier'] or '' |x}</Data></Cell>
-   <Cell ss:MergeAcross="2" ss:StyleID="mainheader"><Data ss:Type="String">PO State: ${getRunParms()['state'] or '' | x}</Data></Cell>
+    <Cell ss:MergeAcross="2" ss:StyleID="mainheader"><Data ss:Type="String">${getRunParms()['title'] or '' |x}</Data></Cell>
+</Row>
+<Row ss:AutoFitHeight="1">
+   <Cell ss:MergeAcross="1" ss:StyleID="poheader"><Data ss:Type="String">Report run date</Data></Cell>
+   <Cell ss:StyleID="line"><Data ss:Type="String">${getRunParms()['run_date'] or '' |x}</Data></Cell>
+</Row>
+<Row ss:AutoFitHeight="1">
+   <Cell ss:MergeAcross="1" ss:StyleID="poheader"><Data ss:Type="String">PO date from</Data></Cell>
+   <Cell ss:StyleID="line"><Data ss:Type="String">${getRunParms()['date_from'] or ''|x}</Data></Cell>
+</Row>
+<Row ss:AutoFitHeight="1">
+   <Cell ss:MergeAcross="1" ss:StyleID="poheader"><Data ss:Type="String">PO date to</Data></Cell>
+   <Cell ss:StyleID="line"><Data ss:Type="String">${getRunParms()['date_thru'] or '' |x}</Data></Cell>
 </Row>
 
     <Row ss:AutoFitHeight="1" > 
@@ -153,57 +165,36 @@
     </Row>
     
 % for o in objects:
-    
-    % for line in getPOLines(o.id):
+  % for line in getPOLines(o.id):
     <Row ss:AutoFitHeight="1">
-        % if line['raw_state'] in ['cancel', 'cancel_r']:
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['order_ref'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="Number">${(line['item'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['code'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['description'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="Number">${(line['qty_ordered'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['uom'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="Number">${(line['qty_received'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['in'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="Number">${(line['qty_backordered'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="Number">${(line['unit_price'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="Number">${(line['in_unit_price'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['order_created'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['order_confirmed_date'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['order_status'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['state'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['destination'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['cost_centre'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['customer'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['customer_ref'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['source_doc'])|x}</Data></Cell>
-            <Cell ss:StyleID="line_grey"><Data ss:Type="String">${(line['supplier_ref'])|x}</Data></Cell>
-        % else:
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_ref'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['item'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['code'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['description'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['qty_ordered'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['uom'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['qty_received'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['in'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['qty_backordered'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['unit_price'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['in_unit_price'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_created'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_confirmed_date'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_status'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['state'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['destination'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['cost_centre'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['customer'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['customer_ref'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['source_doc'])|x}</Data></Cell>
-            <Cell ss:StyleID="line"><Data ss:Type="String">${(line['supplier_ref'])|x}</Data></Cell>
-        %endif
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['order_ref'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['supplier'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['order_type'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['item'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['code'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['description'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['qty_ordered'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['uom'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['qty_received'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['in'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['qty_backordered'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['unit_price'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['in_unit_price'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['currency'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['total_currency'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="Number">${(line['total_func_currency'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['order_created'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['delivery_requested_date'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['order_confirmed_date'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['state'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['order_status'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['customer'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['customer_ref'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['source_doc'])|x}</Data></Cell>
+      <Cell ss:StyleID="${getLineStyle(line)|x}"><Data ss:Type="String">${(line['supplier_ref'])|x}</Data></Cell>
     </Row>
-    % endfor
- % endfor   
+  % endfor
+% endfor   
     
 </Table>
 <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">

=== modified file 'bin/addons/msf_supply_doc_export/wizard/po_follow_up.py'
--- bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2018-04-13 13:28:59 +0000
+++ bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2018-11-09 16:23:13 +0000
@@ -56,7 +56,7 @@
             states[state_val] = state_string
         report_parms = {
             'title': 'PO Follow Up per Supplier',
-            'run_date': time.strftime("%d/%m/%Y"),
+            'run_date': time.strftime("%d.%m.%Y"),
             'date_from': '',
             'date_thru': '',
             'state': '',
@@ -76,12 +76,12 @@
         if wiz.po_date_from:
             domain.append(('date_order', '>=', wiz.po_date_from))
             tmp = datetime.strptime(wiz.po_date_from, "%Y-%m-%d")
-            report_parms['date_from'] = tmp.strftime("%d/%m/%Y")
+            report_parms['date_from'] = tmp.strftime("%d.%m.%Y")
 
         if wiz.po_date_thru:
             domain.append(('date_order', '<=', wiz.po_date_thru))
             tmp = datetime.strptime(wiz.po_date_thru, "%Y-%m-%d")
-            report_parms['date_thru'] = tmp.strftime("%d/%m/%Y")
+            report_parms['date_thru'] = tmp.strftime("%d.%m.%Y")
 
         # Supplier
         if wiz.partner_id:
@@ -106,7 +106,7 @@
         report_header_line2 = ''
         if wiz.partner_id:
             report_header_line2 += wiz.partner_id.name
-        report_header_line2 += '  Report run date: ' + time.strftime("%d/%m/%Y")  # TODO to be removed
+        report_header_line2 += '  Report run date: ' + time.strftime("%d.%m.%Y")  # TODO to be removed
         if wiz.po_date_from:
             report_header_line2 += wiz.po_date_from
         # UF-2496: Minor fix to append the "date from" correctly into header

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2018-09-17 16:16:37 +0000
+++ bin/addons/purchase/purchase_order_line.py	2018-11-09 16:23:13 +0000
@@ -543,6 +543,10 @@
         'cold_chain': fields.function(_get_product_info, type='char', string='Cold Chain', multi='product_info', method=True),
         'controlled_substance': fields.function(_get_product_info, type='char', string='Controlled Substance', multi='product_info', method=True),
         'justification_code_id': fields.function(_get_product_info, type='char', string='Justification Code', multi='product_info', method=True),
+        'create_date': fields.date('Creation date', readonly=True),
+        'validation_date': fields.date('Validation Date', readonly=True),
+        'confirmation_date': fields.date('Confirmation Date', readonly=True),
+        'closed_date': fields.date('Closed Date', readonly=True),
     }
 
 

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2018-10-28 09:48:14 +0000
+++ bin/addons/purchase/purchase_workflow.py	2018-11-09 16:23:13 +0000
@@ -607,7 +607,7 @@
             self.write(cr, uid, pol.id, line_update, context=context)
 
 
-        self.write(cr, uid, ids, {'state': 'validated'}, context=context)
+        self.write(cr, uid, ids, {'state': 'validated', 'validation_date': datetime.now().strftime('%Y-%m-%d')}, context=context)
 
         return True
 
@@ -748,7 +748,7 @@
             if pol.linked_sol_id:
                 wf_service.trg_validate(uid, 'sale.order.line', pol.linked_sol_id.id, 'confirmed', cr)
 
-            self.write(cr, uid, [pol.id], {'state': 'confirmed'}, context=context)
+            self.write(cr, uid, [pol.id], {'state': 'confirmed', 'confirmation_date': datetime.now().strftime('%Y-%m-%d')}, context=context)
 
             if pol.order_id.order_type == 'direct':
                 wf_service.trg_validate(uid, 'purchase.order.line', pol.id, 'done', cr)
@@ -787,7 +787,7 @@
             if internal_ir or dpo or ir_non_stockable:
                 wf_service.trg_validate(uid, 'sale.order.line', pol.linked_sol_id.id, 'done', cr)
 
-        self.write(cr, uid, ids, {'state': 'done'}, context=context)
+        self.write(cr, uid, ids, {'state': 'done', 'closed_date': datetime.now().strftime('%Y-%m-%d')}, context=context)
 
         return True