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

[jftempo]

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2018-04-20 07:14:38 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2018-05-17 08:41:16 +0000
@@ -1142,6 +1142,7 @@
                             sol_to_relink = self.pool.get('sale.order.line').search(cr, uid, [
                                 ('product_uom_qty', '=', out_move.product_qty - uom_partial_qty),
                                 ('line_number', '=', out_move.sale_line_id.line_number),
+                                ('order_id', '=', out_move.picking_id.sale_id.id),
                             ], context=context)
                             if sol_to_relink:
                                 move_values.update({'sale_line_id': sol_to_relink[0],})
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-04-27 09:58:55 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-05-17 08:41:16 +0000
@@ -107535,6 +107535,132 @@
 msgid "The account %s - %s cannot be used as Account Payable."
 msgstr "Le compte %s - %s ne peut pas être utilisé comme Compte Fournisseur."
 
+#. modules: msf_supply_doc_export, sales_followup
+#: report:po.follow.up_rml:0
+#: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:280
+#: report:ir.follow.up.location.report_pdf:0
+#: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:231
+#: report:sales.follow.up.multi.report_pdf:0
+msgid "Line Status"
+msgstr "Statut de la ligne"
+
+#. module: sales_followup
+#: field:ir.followup.location.wizard,cancel_ok:0
+#: field:sale.followup.multi.wizard,cancel_ok:0
+msgid "Cancelled"
+msgstr "Annulé"
+
+#. modules: purchase, purchase_override, sale
+#: selection:purchase.order.line,state:0
+#: selection:purchase.order.merged.line,state:0
+#: selection:sale.order.line,state:0
+msgid "Cancelled-r"
+msgstr "Annulé-r"
+
+#. modules: msf_order_date, purchase, documents_done, sale, purchase_override, stock_forecast, purchase_allocation_report, sourcing
+#: selection:documents.done.wizard,display_state:0
+#: selection:sale.order.line,so_state_stored:0
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,order_state_purchase_order_line:0
+#: selection:purchase.order.line,po_state_stored:0
+#: selection:purchase.order.line.allocation.report,state:0
+#: selection:purchase.order.merged.line,order_state_purchase_order_line:0
+#: selection:purchase.order.merged.line,po_state_stored:0
+#: selection:sale.order,state:0
+#: selection:sale.order,state_hidden_sale_order:0
+#: selection:sale.order.leave.close,order_state:0
+#: selection:sale.report,state:0
+#: selection:sale.order.line,sale_order_state:0
+#: selection:stock.forecast.line,state:0
+msgid "Draft-p"
+msgstr "Brouillon-p"
+
+#. modules: msf_order_date, purchase, documents_done, sale, purchase_override, stock_forecast, purchase_allocation_report, sourcing
+#: selection:documents.done.wizard,display_state:0
+#: selection:sale.order.line,so_state_stored:0
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,order_state_purchase_order_line:0
+#: selection:purchase.order.line,po_state_stored:0
+#: selection:purchase.order.line.allocation.report,state:0
+#: selection:purchase.order.merged.line,order_state_purchase_order_line:0
+#: selection:purchase.order.merged.line,po_state_stored:0
+#: selection:sale.order,state:0
+#: selection:sale.order,state_hidden_sale_order:0
+#: selection:sale.order.leave.close,order_state:0
+#: selection:sale.report,state:0
+#: selection:sale.order.line,sale_order_state:0
+#: selection:stock.forecast.line,state:0
+msgid "Validated-p"
+msgstr "Validé-p"
+
+#. modules: purchase, purchase_override
+#: selection:purchase.order.line,state:0
+#: selection:purchase.order.merged.line,state:0
+msgid "Validated-n"
+msgstr "Validé-n"
+
+#. modules: purchase, purchase_override, sale
+#: selection:purchase.order.line,state:0
+#: selection:purchase.order.merged.line,state:0
+#: selection:sale.order.line,state:0
+msgid "Sourced-v"
+msgstr "Sourcé-v"
+
+#. modules: msf_order_date, purchase, documents_done, sale, purchase_override, stock_forecast, purchase_allocation_report, sourcing
+#: selection:documents.done.wizard,display_state:0
+#: selection:sale.order.line,so_state_stored:0
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,order_state_purchase_order_line:0
+#: selection:purchase.order.line,po_state_stored:0
+#: selection:purchase.order.line.allocation.report,state:0
+#: selection:purchase.order.merged.line,order_state_purchase_order_line:0
+#: selection:purchase.order.merged.line,po_state_stored:0
+#: selection:sale.order,state:0
+#: selection:sale.order,state_hidden_sale_order:0
+#: selection:sale.order.leave.close,order_state:0
+#: selection:sale.report,state:0
+#: selection:sale.order.line,sale_order_state:0
+#: selection:stock.forecast.line,state:0
+msgid "Sourced-p"
+msgstr "Sourcé-p"
+
+#. modules: purchase, purchase_override, sale
+#: selection:purchase.order.line,state:0
+#: selection:purchase.order.merged.line,state:0
+#: selection:sale.order.line,state:0
+msgid "Sourced-n"
+msgstr "Sourcé-n"
+
+#. module: sale
+#: field:sale.order.line,set_as_sourced_n:0
+msgid "Sourced-n line"
+msgstr "Ligne sourcée-n"
+
+#. modules: purchase, purchase_override, sale
+#: selection:purchase.order.line,state:0
+#: selection:purchase.order.merged.line,state:0
+#: selection:sale.order.line,state:0
+msgid "Sourced-sy"
+msgstr "Sourcé-sy"
+
+#. modules: msf_order_date, purchase, documents_done, sale, purchase_override, stock_forecast, purchase_allocation_report, sourcing
+#: selection:documents.done.wizard,display_state:0
+#: selection:sale.order.line,so_state_stored:0
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,order_state_purchase_order_line:0
+#: selection:purchase.order.line,po_state_stored:0
+#: selection:purchase.order.line.allocation.report,state:0
+#: selection:purchase.order.merged.line,order_state_purchase_order_line:0
+#: selection:purchase.order.merged.line,po_state_stored:0
+#: selection:sale.order,state:0
+#: selection:sale.order,state_hidden_sale_order:0
+#: selection:sale.order.leave.close,order_state:0
+#: selection:sale.report,state:0
+#: selection:sale.order.line,sale_order_state:0
+#: selection:stock.forecast.line,state:0
+msgid "Confirmed-p"
+msgstr "Confirmé-p"
+
 #. module: account_mcdb
 #: field:account.mcdb,display_mcdb_load_button:0
 msgid "Display the Load button"
@@ -107673,3 +107799,16 @@
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in booking currency!"
 msgstr "Valeur de crédit ou débit erronée en devise d'enregistrement !"
+
+#. module: sales_followup
+#: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:281
+#: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:230
+msgid "Doc. Status"
+msgstr "Statut du Doc."
+
+#. modules: msf_supply_doc_export, sales_followup
+#: report:po.follow.up_rml:0
+#: report:ir.follow.up.location.report_pdf:0
+#: report:sales.follow.up.multi.report_pdf:0
+msgid "Doc. Status:"
+msgstr "Statut du Doc.:"
 
=== 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-04-19 07:36:42 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2018-05-17 08:41:16 +0000
@@ -485,6 +485,7 @@
             report_line['order_ref'] = ''
             report_line['order_created'] = ''
             report_line['order_confirmed_date'] = ''
+            report_line['raw_state'] = analytic_line.get('raw_state')
             report_line['line_status'] = ''
             report_line['state'] = ''
             report_line['order_status'] = ''
@@ -542,6 +543,7 @@
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
                     'order_confirmed_date': order.delivery_confirmed_date or '',
+                    '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 '',
                     'order_status': self._get_states().get(order.state, ''),
@@ -567,6 +569,7 @@
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
                     'order_confirmed_date': order.delivery_confirmed_date or '',
+                    '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 '',
@@ -598,6 +601,7 @@
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
                     'order_confirmed_date': order.delivery_confirmed_date or '',
+                    '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 '',
@@ -629,6 +633,7 @@
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
                     'order_confirmed_date': order.delivery_confirmed_date or '',
+                    '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 '',
                     'state': line.state_to_display or '',
@@ -657,7 +662,7 @@
             dist_id = po_line.order_id.analytic_distribution_id.id  # get it from the header
         ccdl_ids = ccdl_obj.search(self.cr, self.uid, [('distribution_id','=',dist_id)])
         ccdl_rows = ccdl_obj.browse(self.cr, self.uid, ccdl_ids)
-        dist_lines = [{'cost_center': ccdl.analytic_id.code,'destination': ccdl.destination_id.code} for ccdl in ccdl_rows]
+        dist_lines = [{'cost_center': ccdl.analytic_id.code,'destination': ccdl.destination_id.code, 'raw_state': po_line.state} for ccdl in ccdl_rows]
         if not dist_lines:
             dist_lines = [{'cost_center': '','destination': ''}]
         return dist_lines
@@ -690,7 +695,7 @@
         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', 'Line State', 'Order State', 'Destination','Cost Center']
+        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']
 
 
 
 
=== modified file 'bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml'
--- bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml	2018-04-19 07:36:42 +0000
+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml	2018-05-17 08:41:16 +0000
@@ -34,8 +34,11 @@
     <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P4Grey" textColor="#747474" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
     <paraStyle name="P4Center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P4CenterGrey" textColor="#747474" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
     <paraStyle name="P4Left" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P4LeftGrey" textColor="#747474" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -60,7 +63,7 @@
         <td><para style="P2">Report Run Date: [[getRunParmsRML('run_date')]]</para></td>
         <td><para style="P2">PO Date From: [[getRunParmsRML('date_from')]]</para></td>
         <td><para style="P2">PO Date To: [[getRunParmsRML('date_thru')]]</para></td>
-        <td><para style="P2">PO State: [[getRunParmsRML('state')]]</para></td>
+        <td><para style="P2">Doc. Status: [[getRunParmsRML('state')]]</para></td>
         <td><para style="P2">Supplier: [[getRunParmsRML('supplier')]]</para></td>	      		
       </tr>    
     </blockTable>
@@ -119,49 +122,62 @@
           <para style="P3">Cost Center</para>
         </td>
         <td>
-          <para style="P3">State</para>
+          <para style="P3">Line Status</para>
         </td>
       </tr>
       <tr>
          <para style="P4">[[ repeatIn(getPOLines(o.id), 'line') ]]</para>
         <td>
-          <para style="P4Center">[[ line['item'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Left">[[ line['code'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Left">[[ line['description'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['qty_ordered'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['uom'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['qty_received'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['in'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['qty_backordered'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['unit_price'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['in_unit_price'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['destination'] ]]</para>
-        </td>
-        <td>
-          <para style="P4Center">[[ line['cost_centre'] ]]</para>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['item'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['item'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Left">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['code'] or removeParentNode('para') ]]</para>
+          <para style="P4LeftGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['code'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Left">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['description'] or removeParentNode('para') ]]</para>
+          <para style="P4LeftGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['description'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['qty_ordered'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['qty_ordered'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['uom'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['uom'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['qty_received'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['qty_received'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['in'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['in'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['qty_backordered'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['qty_backordered'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['unit_price'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['unit_price'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['in_unit_price'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['in_unit_price'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['destination'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['destination'] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['cost_centre'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['cost_centre'] or removeParentNode('para') ]]</para>
        </td>
         <td>
-          <para style="P4Center">[[ line['state'] ]]</para>
+          <para style="P4Center">[[ line['raw_state'] not in ['cancel', 'cancel_r'] and line['state'] or removeParentNode('para') ]]</para>
+          <para style="P4CenterGrey">[[ line['raw_state'] in ['cancel', 'cancel_r'] and line['state'] or removeParentNode('para') ]]</para>
        </td>
      </tr>
     
 
=== 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-04-19 07:36:42 +0000
+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako	2018-05-17 08:41:16 +0000
@@ -64,6 +64,17 @@
           <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
         </Borders>
     </Style>
+
+    <Style ss:ID="line_grey">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Borders>
+          <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+        <Font ss:Color="#747474"/>
+    </Style>
     
   <Style ss:ID="short_date">
    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
@@ -137,23 +148,43 @@
     
     % for line in getPOLines(o.id):
     <Row ss:AutoFitHeight="1">
-        <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['state'])|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['destination'])|x}</Data></Cell>
-        <Cell ss:StyleID="line"><Data ss:Type="String">${(line['cost_centre'])|x}</Data></Cell>
+        % 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>
+        % 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>
+        %endif
     </Row>
     % endfor
  % endfor   
 
=== modified file 'bin/addons/sales_followup/report/ir_follow_up_location_report.py'
--- bin/addons/sales_followup/report/ir_follow_up_location_report.py	2017-09-08 15:57:28 +0000
+++ bin/addons/sales_followup/report/ir_follow_up_location_report.py	2018-05-17 08:41:16 +0000
@@ -177,27 +177,15 @@
             cdd = False
             from_stock = line.type == 'make_to_stock'
             cancel_in_moves = []
-            if line.procurement_id and line.procurement_id.purchase_id:
-                po_name = line.procurement_id.purchase_id.name
-                cdd = line.procurement_id.purchase_id.delivery_confirmed_date
-                cancel_in_moves = self.cancel_in_line(line.procurement_id.purchase_id.id, line.product_id.id)
+            linked_pol = self.pool.get('purchase.order.line').search(self.cr, self.uid, [('linked_sol_id', '=', line.id)])
+            if linked_pol:
+                linked_pol = self.pool.get('purchase.order.line').browse(self.cr, self.uid, linked_pol)[0]
+                po_name = linked_pol.order_id.name
+                cdd = linked_pol.order_id.delivery_confirmed_date
+                cancel_in_moves = self.cancel_in_line(linked_pol.order_id.id, line.product_id.id)
             if not cdd and line.order_id.delivery_confirmed_date:
                 cdd = line.order_id.delivery_confirmed_date
 
-
-            # fetch the move in case the line doesn't have move_ids
-            # if no move found for this line, it's set to False
-            # to display a grayed line when it is cancelled
-            current_line_state = line.state
-            if line.order_id.state == 'cancel':
-                current_line_state = 'cancel'
-            elif line.procurement_id.purchase_id and line.procurement_id.purchase_id.state == 'cancel':
-                current_line_state = 'cancel'
-            elif line.procurement_id.move_id and \
-                    (line.procurement_id.move_id.state == 'cancel' or line.procurement_id.move_id.picking_id.state == 'cancel'):
-                current_line_state = 'cancel'
-
-
             # cancel IN at line level: qty on IR line is adjusted
             # cancel all IN: qty on IR is untouched
             for cancel_in in cancel_in_moves:
@@ -213,13 +201,14 @@
             if len(line.move_ids) == 0:
                 line_moves, int_name = self._get_move_from_line(line, line.product_id.id, line.order_id.name)
 
+            data = {
+                'state': line.state,
+                'state_display': line.state_to_display,
+            }
+
             if len(line.move_ids) > 0:
                 for move in sorted(line.move_ids, cmp=lambda x, y: cmp(sort_state.get(x.state, 0), sort_state.get(y.state, 0)) or cmp(x.id, y.id)):
-                    current_move_line_state = current_line_state
-                    if move.state == 'cancel' or move.picking_id.state == 'cancel':
-                        current_move_line_state = 'cancel'
-
-                    m_type = current_move_line_state == 'cancel' or move.product_qty != 0.00 and move.picking_id.type == 'out'
+                    m_type = move.state in ('cancel', 'cancel_r') or move.product_qty != 0.00 and move.picking_id.type == 'out'
                     ppl = move.picking_id.subtype == 'packing' and move.picking_id.shipment_id and not self._is_returned(move)
                     ppl_not_shipped = move.picking_id.subtype == 'ppl' and move.picking_id.state not in ('cancel', 'done')
                     s_out = move.picking_id.subtype == 'standard' and move.location_dest_id.usage == 'customer'
@@ -238,7 +227,7 @@
                         delivery_order = move.picking_id.name
                         if move.picking_id.state != 'done':
                             delivery_order = '-'
-                        data = {
+                        data.update({
                             'po_name': po_name,
                             'cdd': cdd,
                             'line_number': line.line_number,
@@ -247,10 +236,9 @@
                             'product_code': line.product_id.code or '-',
                             'is_delivered': False,
                             'delivery_order': delivery_order,
-                            'current_line_state': current_move_line_state,
                             'packing': '-',
                             'shipment': '-',
-                        }
+                        })
                         if first_line:
                             data.update({
                                 'uom_id': line.product_uom.name,
@@ -346,9 +334,6 @@
                             m_index += 1
             elif line_moves and (len(line.move_ids) == 0 and line.procurement_id.move_id):
                 for line_move in line_moves:
-                    if line_move.state == 'cancel' or line_move.picking_id.state == 'cancel':
-                        current_line_state = 'cancel'
-
                     m_type = line_move.product_qty != 0.00
 
                     if m_type:
@@ -363,7 +348,7 @@
                         delivery_order = int_name.get(line_move.id) or line_move.picking_id.name
                         if 'INT' in line_move.picking_id.name and line_move.picking_id.state != 'done':
                             delivery_order = '-'
-                        data = {
+                        data.update({
                             'po_name': po_name,
                             'cdd': cdd,
                             'line_number': line.line_number,
@@ -372,8 +357,7 @@
                             'product_code': line.product_id.code or '-',
                             'is_delivered': False,
                             'delivery_order': delivery_order,
-                            'current_line_state': current_line_state,
-                        }
+                        })
                         if first_line:
                             data.update({
                                 'uom_id': line.product_uom.name,
@@ -408,7 +392,7 @@
                             m_index += 1
             else:  # No move found
                 if first_line:
-                    data = {
+                    data.update({
                         'line_number': line.line_number,
                         'line_comment': line.comment or '-',
                         'po_name': po_name,
@@ -420,10 +404,9 @@
                         'delivered_qty': 0.00,
                         'delivered_uom': '-',
                         'delivery_order': '-',
-                        'current_line_state': current_line_state,
                         'backordered_qty': line.product_uom_qty if line.order_id.state != 'cancel' else 0.00,
                         'cdd': cdd,
-                    }
+                    })
                     lines.append(data)
 
             # Put the backorderd qty on the first line
@@ -444,7 +427,7 @@
                 lines[fl_index]['extra_qty'] = abs(bo_qty) if line.order_id.state != 'cancel' else 0.00
 
             for ln in lines:
-                if only_bo and (ln.get('backordered_qty', 0.00) <= 0.00 or ln.get('current_line_state') == 'cancel'):
+                if only_bo and (ln.get('backordered_qty', 0.00) <= 0.00 or line.state in ('cancel', 'cancel_r')):
                     continue
                 yield ln
 
 
=== modified file 'bin/addons/sales_followup/report/ir_follow_up_location_report.rml'
--- bin/addons/sales_followup/report/ir_follow_up_location_report.rml	2017-09-07 10:21:05 +0000
+++ bin/addons/sales_followup/report/ir_follow_up_location_report.rml	2018-05-17 08:41:16 +0000
@@ -182,7 +182,7 @@
 
     <section>
             [[ repeatIn(getOrders(r, only_bo=r.only_bo), 'o', 'section') ]]
-        <blockTable colWidths="32.0,80.0,130.0,110.0,45.0,45.0,45.0,45.0,45.0,75.0,60.0,60.0" style="LinesTable" repeatRows="2">
+        <blockTable colWidths="32.0,80.0,130.0,110.0,45.0,40.0,45.0,40.0,45.0,70.0,41.0,47.0,47.0" style="LinesTable" repeatRows="2">
 	    	<tr>
 	    		<td colspan="2">
                     <para style="Lines">Order ref:</para>
@@ -191,7 +191,7 @@
                     <para style="Lines">[[ o.name ]]</para>
                 </td>
                 <td>
-                    <para style="Lines">Status: [[ getSel(o, 'state') ]]       Requestor: [[ o.requestor or '' ]]</para>
+                    <para style="Lines">Doc. Status: [[ getSel(o, 'state') ]]       Requestor: [[ o.requestor or '' ]]</para>
                 </td>
                 <td>
                     <para style="Lines">Location Requestor: [[ o.location_requestor_id.name ]]</para>
@@ -220,6 +220,9 @@
                 <td>
                     <para style="Lines"></para>
                 </td>
+                <td>
+                    <para style="Lines"></para>
+                </td>
             </tr>
 	    	<tr>
 	    		<td>
@@ -253,6 +256,9 @@
                     <para style="Lines"><i>Delivery Order</i></para>
                 </td>
 	    		<td>
+                    <para style="Lines"><i>Line Status</i></para>
+	    		</td>
+	    		<td>
                     <para style="Lines"><i>CDD</i></para>
 	    		</td>
                 <td>
@@ -262,53 +268,57 @@
             <tr>
                 [[ repeatIn(getLines(o, only_bo=r.only_bo), 'line') ]]
 	    		<td>
-                    <para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('line_number', '-') or removeParentNode('para') ]]</para>
-                    <para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('line_number', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('product_code', '-') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('product_code', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('product_name', '-') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('product_name', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('line_comment', '-') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('line_comment', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and (line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and (line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('uom_id', '-') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('uom_id', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-                    <para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and formatLang(line.get('delivered_qty', 0.00)) or removeParentNode('para') ]]</para>
-                    <para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and formatLang(line.get('delivered_qty', 0.00)) or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('delivered_uom', '-') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('delivered_uom', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-                    <para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and (line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]]</para>
-                    <para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and (line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])</para>
-                    <para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and '-' or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and line.get('delivery_order', '-') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and line.get('delivery_order', '-') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and (line.get('cdd', '') and formatLang(line['cdd'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and (line.get('cdd', '') and formatLang(line['cdd'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('line_number', '-') or removeParentNode('para') ]]</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('line_number', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('product_code', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('product_code', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('product_name', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('product_name', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('line_comment', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('line_comment', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('uom_id', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('uom_id', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and formatLang(line.get('delivered_qty', 0.00)) or removeParentNode('para') ]]</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and formatLang(line.get('delivered_qty', 0.00)) or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('delivered_uom', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('delivered_uom', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]]</para>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and '-' or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('delivery_order', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('delivery_order', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('cdd', '') and formatLang(line['cdd'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('cdd', '') and formatLang(line['cdd'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
 	    		</td>
                 <td>
-	    			<para style="LinesBlue">[[ line.get('current_line_state') != 'cancel' and (line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGrey">[[ line.get('current_line_state') == 'cancel' and (line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
 	    		</td>
 	    	</tr>
         </blockTable>
 
=== modified file 'bin/addons/sales_followup/report/ir_follow_up_location_report_xls.mako'
--- bin/addons/sales_followup/report/ir_follow_up_location_report_xls.mako	2017-09-07 10:21:05 +0000
+++ bin/addons/sales_followup/report/ir_follow_up_location_report_xls.mako	2018-05-17 08:41:16 +0000
@@ -176,7 +176,9 @@
         <Column ss:AutoFitWidth="1" ss:Width="100.0" />
         ## PO ref
         <Column ss:AutoFitWidth="1" ss:Width="150.0" />
-        ## Status
+        ## Doc. Status
+        <Column ss:AutoFitWidth="1" ss:Width="60.75" />
+        ## Line Status
         <Column ss:AutoFitWidth="1" ss:Width="60.75" />
         ## Received
         <Column ss:AutoFitWidth="1" ss:Width="54.75" />
@@ -276,7 +278,8 @@
                 _('Requestor'),
                 _('Origin'),
                 _('PO ref'),
-                _('Status'),
+                _('Doc. Status'),
+                _('Line Status'),
                 _('Received'),
                 _('RDD'),
                 _('Item'),
@@ -303,13 +306,14 @@
         % for o in getOrders(r):
             % for line in getLines(o):
             <Row ss:Height="11.25">
-                %if line.get('current_line_state', '') == 'cancel':
+                %if line.get('state', '') in ['cancel', 'cancel_r']:
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.name|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.location_requestor_id.name|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.requestor or ''|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.origin or ''|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('po_name', '')|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${getSel(o, 'state')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('state_display', '-')|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${saleUstr(formatLang(o.date_order, date=True))|x}</Data></Cell>
                     <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.delivery_requested_date and saleUstr(formatLang(o.delivery_requested_date, date=True)) or ''|x}</Data></Cell>
                     <Cell ss:StyleID="line_center_grey"><Data ss:Type="String">${line.get('line_number', '-')|x}</Data></Cell>
@@ -339,6 +343,7 @@
                     <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.origin or ''|x}</Data></Cell>
                     <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('po_name', '')|x}</Data></Cell>
                     <Cell ss:StyleID="line_left"><Data ss:Type="String">${getSel(o, 'state')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('state_display', '-')|x}</Data></Cell>
                     <Cell ss:StyleID="line_left"><Data ss:Type="String">${saleUstr(formatLang(o.date_order, date=True))|x}</Data></Cell>
                     <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.delivery_requested_date and saleUstr(formatLang(o.delivery_requested_date, date=True)) or ''|x}</Data></Cell>
                     <Cell ss:StyleID="line_center"><Data ss:Type="String">${line.get('line_number', '-')|x}</Data></Cell>
 
=== modified file 'bin/addons/sales_followup/report/sale_follow_up_multi_report.rml'
--- bin/addons/sales_followup/report/sale_follow_up_multi_report.rml	2017-09-22 15:31:55 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_multi_report.rml	2018-05-17 08:41:16 +0000
@@ -66,6 +66,7 @@
         <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
         <paraStyle name="UnderLines" fontName="Helvetica-Bold" fontSize="6.0" alignment="LEFT" leading="7.0" />
         <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
+        <paraStyle name="LinesGrey" textColor="#747474" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
         <paraStyle name="LinesGreen" textColor="green" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
         
     </stylesheet>
@@ -169,16 +170,16 @@
 
     <section>
             [[ repeatIn(getOrders(r, grouped=True, only_bo=r.only_bo), 'o', 'section') ]]
-        <blockTable colWidths="32.0,90.0,150.0,50.0,30.0,50.0,50.0,50.0,50.0,60.0,60.0,50.0,50.0" style="LinesTable" repeatRows="2">
+        <blockTable colWidths="32.0,80.0,135.0,45.0,30.0,50.0,50.0,50.0,50.0,41.0,55.0,60.0,47.0,47.0" style="LinesTable" repeatRows="2">
 	    	<tr>
 	    		<td colspan="2">
                     <para style="Lines">Order ref:</para>
                 </td>
                 <td>
-                    <para style="Lines">[[ o.name ]]       Status: [[ getSel(o, 'state') ]]</para>
+                    <para style="Lines">[[ o.name ]]       </para>
                 </td>
                 <td>
-                    <para style="Lines"></para>
+                    <para style="Lines">Doc. Status: [[ getSel(o, 'state') ]]</para>
                 </td>
                 <td>
                     <para style="Lines">Received: [[ formatLang(o.date_order, date=True) ]]</para>
@@ -199,6 +200,9 @@
                     <para style="Lines"></para>
                 </td>
                 <td>
+                    <para style="Lines"></para>
+                </td>
+                <td>
                     <para style="Lines"># Items: [[ getProducts(o) ]]</para>
                 </td>
                 <td>
@@ -237,6 +241,9 @@
                     <para style="Lines"><i>Qty to deliver</i></para>
                 </td>
                 <td>
+                    <para style="Lines"><i>Line Status</i></para>
+                </td>
+                <td>
                     <para style="Lines"><i>Transport</i></para>
                 </td>
                 <td>
@@ -252,45 +259,64 @@
             <tr>
                 [[ repeatIn(getLines(o, grouped=True, only_bo=r.only_bo), 'line') ]]
 	    		<td>
-                    <para style="LinesBlue">[[ line.get('line_number', '-') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('product_code', '-') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('product_name', '-') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A' ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('uom_id', '-') ]]</para>
-	    		</td>
-	    		<td>
-                    <para style="LinesBlue">[[ formatLang(line.get('delivered_qty', 0.00)) ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('delivered_uom', '') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('packing', '') ]]</para>
-	    		</td>
-	    		<td>
-                    <para style="LinesBlue">[[ line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para') ]]</para>
-                    <para style="LinesBlue">[[ line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])</para>
-	    		</td>
-                <td>
-	    			<para style="LinesBlue">[[ line.get('transport', '') and getSel(line['transport'], 'transport_type') or '' ]]</para>
-	    		</td>
-                <td>
-                    <para style="LinesBlue">[[ not line.get('is_delivered') and line.get('shipment', '') or removeParentNode('para') ]]</para>
-	    			<para style="LinesGreen">[[ line.get('is_delivered') and line.get('shipment', '') or removeParentNode('para') ]]</para>
-	    		</td>
-	    		<td>
-	    			<para style="LinesBlue">[[ line.get('eta', '') and formatLang(line['eta'], date=True) or 'N/A' ]]</para>
-	    		</td>
-                <td>
-	    			<para style="LinesBlue">[[ line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A' ]]</para>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('line_number', '-') or removeParentNode('para') ]]</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('line_number', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('product_code', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('product_code', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('product_name', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('product_name', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('ordered_qty') and formatLang(line['ordered_qty']) or 'N/A') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('uom_id', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('uom_id', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and formatLang(line.get('delivered_qty', 0.00)) or removeParentNode('para') ]]</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and formatLang(line.get('delivered_qty', 0.00)) or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('delivered_uom', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('delivered_uom', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('packing', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('packing', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]]</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]]</para>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])</para>
+	    		</td>
+                <td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('transport', '') and getSel(line['transport'], 'transport_type') or '-') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('transport', '') and getSel(line['transport'], 'transport_type') or '-') or removeParentNode('para') ]]</para>
+	    		</td>
+                <td>
+                    <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (not line.get('is_delivered') and line.get('shipment', '') or removeParentNode('para')) or removeParentNode('para') ]]</para>
+                    <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (not line.get('is_delivered') and line.get('shipment', '') or removeParentNode('para')) or removeParentNode('para') ]]</para>
+	    			<para style="LinesGreen">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('is_delivered') and line.get('shipment', '') or removeParentNode('para')) or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('is_delivered') and line.get('shipment', '') or removeParentNode('para')) or removeParentNode('para') ]]</para>
+	    		</td>
+	    		<td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('eta', '') and formatLang(line['eta'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('eta', '') and formatLang(line['eta'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+	    		</td>
+                <td>
+	    			<para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
+	    			<para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('rts', '') and formatLang(line['rts'], date=True) or 'N/A') or removeParentNode('para') ]]</para>
 	    		</td>
 	    	</tr>
         </blockTable>
 
=== modified file 'bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako'
--- bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako	2017-06-07 10:13:18 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako	2018-05-17 08:41:16 +0000
@@ -111,6 +111,56 @@
         <NumberFormat ss:Format="Short Date" />
         <Font ss:Color="#0000FF" />
     </Style>
+
+    <Style ss:ID="line_left_grey">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+    </Style>
+    <Style ss:ID="line_right_grey">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+     <Style ss:ID="line_center_grey">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="line_left_date_grey">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="Short Date" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+    </Style>
+
+    <Style ss:ID="short_date_grey">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+        <NumberFormat ss:Format="Short Date" />
+        <Font ss:Color="#747474" />
+    </Style>
 </Styles>
 
 
@@ -123,7 +173,9 @@
         <Column ss:AutoFitWidth="1" ss:Width="170.0" />
         ## PO ref
         <Column ss:AutoFitWidth="1" ss:Width="150.0" />
-        ## Status
+        ## Doc. Status
+        <Column ss:AutoFitWidth="1" ss:Width="60.75" />
+        ## Line Status
         <Column ss:AutoFitWidth="1" ss:Width="60.75" />
         ## Received
         <Column ss:AutoFitWidth="1" ss:Width="54.75" />
@@ -225,7 +277,8 @@
                 _('Order ref'),
                 _('Customer ref'),
                 _('PO ref'),
-                _('Status'),
+                _('Doc. Status'),
+                _('Line Status'),
                 _('Received'),
                 _('RDD'),
                 _('Item'),
@@ -254,46 +307,91 @@
         % for o in getOrders(r):
             % for line in getLines(o, grouped=True):
             <Row ss:Height="11.25">
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.name|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.client_order_ref or ''|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('po_name', '')|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${getSel(o, 'state')|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${saleUstr(formatLang(o.date_order, date=True))|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.delivery_requested_date and saleUstr(formatLang(o.delivery_requested_date, date=True)) or ''|x}</Data></Cell>
-                <Cell ss:StyleID="line_center"><Data ss:Type="String">${line.get('line_number', '-')|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('product_code', '-') or ''|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('product_name', '-') or ''|x}</Data></Cell>
-                % if line.get('ordered_qty'):
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line.get('ordered_qty')}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">N/A</Data></Cell>
-                % endif
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('uom_id', '-')|x}</Data></Cell>
-                % if line.get('delivered_qty'):
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line.get('delivered_qty')}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">N/A</Data></Cell>
-                % endif
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('delivered_uom', '')|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('packing', '')|x}</Data></Cell>
-                % if line.get('extra_qty', False):
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('backordered_qty', 0.00)} (+${line.get('extra_qty', 0.00)|x})</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line.get('backordered_qty')}</Data></Cell>
-                % endif
-                % if o.transport_type and o.transport_type not in (False, 'False', ''):
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${getSel(o, 'transport_type')|x}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_left"><Data ss:Type="String"></Data></Cell>
-                % endif
-                % if line.get('is_delivered'):
-                <Cell ss:StyleID="line_left_green"><Data ss:Type="String">${line.get('shipment', '')|x}</Data></Cell>
-                % else:
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('shipment', '')|x}</Data></Cell>
-                % endif
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('cdd', False) not in (False, 'False') and saleUstr(formatLang(line.get('cdd'), date=True)) or ''|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('eta', False) not in (False, 'False') and saleUstr(formatLang(line.get('eta'), date=True)) or ''|x}</Data></Cell>
-                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('rts', False) not in (False, 'False') and saleUstr(formatLang(line.get('rts'), date=True)) or ''|x}</Data></Cell>
+                %if line.get('state', '') in ['cancel', 'cancel_r']:
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.name|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.client_order_ref or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('po_name', '')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${getSel(o, 'state')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('state_display', '-')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${saleUstr(formatLang(o.date_order, date=True))|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${o.delivery_requested_date and saleUstr(formatLang(o.delivery_requested_date, date=True)) or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_center_grey"><Data ss:Type="String">${line.get('line_number', '-')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('product_code', '-') or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('product_name', '-') or ''|x}</Data></Cell>
+                    % if line.get('ordered_qty'):
+                    <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">${line.get('ordered_qty')}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">N/A</Data></Cell>
+                    % endif
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('uom_id', '-')|x}</Data></Cell>
+                    % if line.get('delivered_qty'):
+                    <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">${line.get('delivered_qty')}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">N/A</Data></Cell>
+                    % endif
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('delivered_uom', '')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('packing', '')|x}</Data></Cell>
+                    % if line.get('extra_qty', False):
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('backordered_qty', 0.00)} (+${line.get('extra_qty', 0.00)|x})</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">${line.get('backordered_qty')}</Data></Cell>
+                    % endif
+                    % if o.transport_type and o.transport_type not in (False, 'False', ''):
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${getSel(o, 'transport_type')|x}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String"></Data></Cell>
+                    % endif
+                    % if line.get('is_delivered'):
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('shipment', '')|x}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('shipment', '')|x}</Data></Cell>
+                    % endif
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('cdd', False) not in (False, 'False') and saleUstr(formatLang(line.get('cdd'), date=True)) or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('eta', False) not in (False, 'False') and saleUstr(formatLang(line.get('eta'), date=True)) or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('rts', False) not in (False, 'False') and saleUstr(formatLang(line.get('rts'), date=True)) or ''|x}</Data></Cell>
+                % else:
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.name|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.client_order_ref or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('po_name', '')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${getSel(o, 'state')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('state_display', '-')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${saleUstr(formatLang(o.date_order, date=True))|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.delivery_requested_date and saleUstr(formatLang(o.delivery_requested_date, date=True)) or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_center"><Data ss:Type="String">${line.get('line_number', '-')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('product_code', '-') or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('product_name', '-') or ''|x}</Data></Cell>
+                    % if line.get('ordered_qty'):
+                    <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line.get('ordered_qty')}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">N/A</Data></Cell>
+                    % endif
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('uom_id', '-')|x}</Data></Cell>
+                    % if line.get('delivered_qty'):
+                    <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line.get('delivered_qty')}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">N/A</Data></Cell>
+                    % endif
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('delivered_uom', '')|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('packing', '')|x}</Data></Cell>
+                    % if line.get('extra_qty', False):
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('backordered_qty', 0.00)} (+${line.get('extra_qty', 0.00)|x})</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line.get('backordered_qty')}</Data></Cell>
+                    % endif
+                    % if o.transport_type and o.transport_type not in (False, 'False', ''):
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${getSel(o, 'transport_type')|x}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String"></Data></Cell>
+                    % endif
+                    % if line.get('is_delivered'):
+                    <Cell ss:StyleID="line_left_green"><Data ss:Type="String">${line.get('shipment', '')|x}</Data></Cell>
+                    % else:
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('shipment', '')|x}</Data></Cell>
+                    % endif
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('cdd', False) not in (False, 'False') and saleUstr(formatLang(line.get('cdd'), date=True)) or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('eta', False) not in (False, 'False') and saleUstr(formatLang(line.get('eta'), date=True)) or ''|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.get('rts', False) not in (False, 'False') and saleUstr(formatLang(line.get('rts'), date=True)) or ''|x}</Data></Cell>
+                % endif
             </Row>
             % endfor
 
 
=== modified file 'bin/addons/sales_followup/report/sale_follow_up_report_multi.py'
--- bin/addons/sales_followup/report/sale_follow_up_report_multi.py	2017-09-14 08:41:12 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_report_multi.py	2018-05-17 08:41:16 +0000
@@ -121,7 +121,7 @@
             fl_index = 0
             m_index = 0
             bo_qty = line.product_uom_qty
-            po_name = ''
+            po_name = '-'
             cdd = False
             linked_pol = self.pool.get('purchase.order.line').search(self.cr, self.uid, [('linked_sol_id', '=', line.id)])
             if linked_pol:
@@ -131,12 +131,16 @@
             if not cdd and line.order_id.delivery_confirmed_date:
                 cdd = line.order_id.delivery_confirmed_date
 
+            data = {
+                'state': line.state,
+                'state_display': line.state_to_display,
+            }
+
             for move in line.move_ids:
                 m_type = move.product_qty != 0.00 and move.picking_id.type == 'out'
                 ppl = move.picking_id.subtype == 'packing' and move.picking_id.shipment_id and not self._is_returned(move)
                 ppl_not_shipped = move.picking_id.subtype == 'ppl' and move.picking_id.state not in ('cancel', 'done')
                 s_out = move.picking_id.subtype == 'standard' and move.state == 'done' and move.location_dest_id.usage == 'customer'
-
                 if m_type and (ppl or s_out or ppl_not_shipped):
                     # bo_qty < 0 if we receipt (IN) more quantities then expected (FO):
                     bo_qty -= self.pool.get('product.uom')._compute_qty(
@@ -146,7 +150,7 @@
                         move.product_qty,
                         line.product_uom.id,
                     )
-                    data = {
+                    data.update({
                         'po_name': po_name,
                         'cdd': cdd,
                         'line_number': line.line_number,
@@ -154,7 +158,7 @@
                         'product_code': line.product_id.code,
                         'is_delivered': False,
                         'backordered_qty': 0.00,
-                    }
+                    })
                     if first_line:
                         data.update({
                             'uom_id': line.product_uom.name,
@@ -169,15 +173,15 @@
                         is_delivered = False
                         is_shipment_done = False
                         if ppl:
-                            packing = move.picking_id.previous_step_id.name or ''
-                            shipment = move.picking_id.shipment_id and move.picking_id.shipment_id.name or ''
+                            packing = move.picking_id.previous_step_id.name or '-'
+                            shipment = move.picking_id.shipment_id and move.picking_id.shipment_id.name or '-'
                             eta = datetime.strptime(move.picking_id.shipment_id.shipment_actual_date[0:10], '%Y-%m-%d')
                             eta += timedelta(days=line.order_id.partner_id.supplier_lt or 0.00)
                             is_delivered = move.picking_id.shipment_id.state == 'delivered' or False
                             is_shipment_done = move.picking_id.shipment_id.state == 'done' or False
                         else:
-                            packing = move.picking_id.name or ''
-                            shipment = ''
+                            packing = move.picking_id.name or '-'
+                            shipment = '-'
 
                         if not grouped:
                             key = (packing, shipment, move.product_uom.name)
@@ -188,21 +192,21 @@
                             'shipment': shipment,
                             'is_delivered': is_delivered,
                             'delivered_qty': not only_bo and (is_shipment_done or is_delivered) and move.product_qty or 0.00,
-                            'delivered_uom': not only_bo and (is_shipment_done or is_delivered) and move.product_uom.name or '',
+                            'delivered_uom': not only_bo and (is_shipment_done or is_delivered) and move.product_uom.name or '-',
                             'backordered_qty': not is_shipment_done and not is_delivered and line.order_id.state != 'cancel' and move.product_qty or 0.00,
                             'rts': not only_bo and move.picking_id.shipment_id and move.picking_id.shipment_id.shipment_expected_date[0:10] or '',
                             'eta': not only_bo and eta and eta.strftime('%Y-%m-%d'),
-                            'transport': not only_bo and move.picking_id.shipment_id and move.picking_id.shipment_id.transport_type or '',
+                            'transport': not only_bo and move.picking_id.shipment_id and move.picking_id.shipment_id.transport_type,
                         })
                     else:
                         if move.picking_id.type == 'out' and move.picking_id.subtype == 'packing':
                             packing = move.picking_id.previous_step_id.name
-                            shipment = move.picking_id.shipment_id.name or ''
+                            shipment = move.picking_id.shipment_id.name or '-'
                             is_shipment_done = move.picking_id.shipment_id.state == 'done'
                         else:
-                            shipment = move.picking_id.name or ''
+                            shipment = move.picking_id.name or '-'
                             is_shipment_done = move.picking_id.state == 'done'
-                            packing = ''
+                            packing = '-'
                         if not grouped:
                             key = (packing, False, move.product_uom.name)
                         else:
@@ -211,18 +215,24 @@
                             data.update({
                                 'packing': packing,
                                 'delivered_qty': is_shipment_done and move.product_qty or 0.00,
-                                'delivered_uom': is_shipment_done and move.product_uom.name or '',
+                                'delivered_uom': is_shipment_done and move.product_uom.name or '-',
                                 'rts': line.order_id.ready_to_ship_date,
                                 'shipment': shipment,
                             })
 
-                    if key in keys:
+                    if key in keys and lines:
                         for rline in lines:
                             if rline['packing'] == key[0] and rline['shipment'] == key[1] and rline['delivered_uom'] == key[2]:
                                 if not grouped or (grouped and line.line_number == key[3]):
                                     rline.update({
                                         'delivered_qty': rline['delivered_qty'] + data['delivered_qty'],
                                     })
+                            if rline['packing'] == key[0] and rline['shipment'] == key[1] and move.product_uom.name == key[2]\
+                                    and (ppl_not_shipped or not is_shipment_done):
+                                if not grouped or (grouped and line.line_number == key[3]):
+                                    rline.update({
+                                        'backordered_qty': rline['backordered_qty'] + data['backordered_qty'],
+                                    })
                     else:
                         keys.append(key)
                         lines.append(data)
@@ -230,23 +240,25 @@
                             fl_index = m_index
                         m_index += 1
 
+                    # reset the data to prevent delivered_qty problem when line is split in PICK
+                    data = {}
+
             # No move found
             if first_line:
-                data = {
+                data.update({
                     'line_number': line.line_number,
                     'po_name': po_name,
                     'product_code': line.product_id.default_code,
                     'product_name': line.product_id.name,
                     'uom_id': line.product_uom.name,
                     'ordered_qty': line.product_uom_qty,
-                    'rts': line.order_id.state not in ('draft', 'validated', 'cancel') and line.order_id.ready_to_ship_date or '',
+                    'rts': line.order_id.state not in ('draft', 'validated', 'cancel') and line.order_id.ready_to_ship_date,
                     'delivered_qty': 0.00,
-                    'delivered_uom': '',
+                    'delivered_uom': '-',
                     'backordered_qty': line.product_uom_qty if line.order_id.state != 'cancel' else 0.00,
                     'cdd': cdd,
-                }
+                })
                 lines.append(data)
-
             # Put the backorderd qty on the first line
             if not lines:
                 continue
@@ -266,8 +278,8 @@
                 })
                 if not first_line:
                     lines[fl_index].update({
-                        'shipment': '',
-                        'packing': '',
+                        'shipment': '-',
+                        'packing': '-',
                     })
 
             elif bo_qty < 0:
 
=== modified file 'bin/addons/sales_followup/wizard/ir_followup_location_wizard.py'
--- bin/addons/sales_followup/wizard/ir_followup_location_wizard.py	2017-08-22 12:23:43 +0000
+++ bin/addons/sales_followup/wizard/ir_followup_location_wizard.py	2018-05-17 08:41:16 +0000
@@ -81,14 +81,11 @@
         'confirmed_ok': fields.boolean(
             string='Confirmed',
         ),
-        'exception_ok': fields.boolean(
-            string='Exception',
-        ),
         'closed_ok': fields.boolean(
             string='Closed',
         ),
         'cancel_ok': fields.boolean(
-            string='Cancel',
+            string='Cancelled',
         ),
         'only_bo': fields.boolean(
             string='Pending order lines only (PDF)',
@@ -115,19 +112,16 @@
         state_domain = []
 
         if wizard.draft_ok:
-            state_domain.append('draft')
+            state_domain.extend(['draft', 'draft_p'])
 
         if wizard.validated_ok:
-            state_domain.extend(['validated', 'waiting_date'])
+            state_domain.extend(['validated', 'validated_p'])
 
         if wizard.sourced_ok:
-            state_domain.append('sourced')
+            state_domain.extend(['sourced', 'sourced_p'])
 
         if wizard.confirmed_ok:
-            state_domain.extend(['manual', 'progress'])
-
-        if wizard.exception_ok:
-            state_domain.extend(['shipping_except', 'invoice_except'])
+            state_domain.extend(['confirmed', 'confirmed_p'])
 
         if wizard.closed_ok:
             state_domain.append('done')
 
=== modified file 'bin/addons/sales_followup/wizard/ir_followup_location_wizard_view.xml'
--- bin/addons/sales_followup/wizard/ir_followup_location_wizard_view.xml	2017-08-22 15:47:17 +0000
+++ bin/addons/sales_followup/wizard/ir_followup_location_wizard_view.xml	2018-05-17 08:41:16 +0000
@@ -20,7 +20,6 @@
                         <field name="validated_ok" />
                         <field name="sourced_ok" />
                         <field name="confirmed_ok" />
-                        <field name="exception_ok" />
                         <field name="closed_ok" />
                         <field name="cancel_ok" />
                     </group>
 
=== modified file 'bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py'
--- bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py	2016-04-20 14:10:30 +0000
+++ bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py	2018-05-17 08:41:16 +0000
@@ -88,14 +88,11 @@
         'confirmed_ok': fields.boolean(
             string='Confirmed',
         ),
-        'exception_ok': fields.boolean(
-            string='Exception',
-        ),
         'closed_ok': fields.boolean(
             string='Closed',
         ),
         'cancel_ok': fields.boolean(
-            string='Cancel',
+            string='Cancelled',
         ),
         'only_bo': fields.boolean(
             string='Pending order lines only (PDF)',
@@ -122,19 +119,16 @@
         state_domain = []
 
         if wizard.draft_ok:
-            state_domain.append('draft')
+            state_domain.extend(['draft', 'draft_p'])
 
         if wizard.validated_ok:
-            state_domain.extend(['validated', 'waiting_date'])
+            state_domain.extend(['validated', 'validated_p'])
 
         if wizard.sourced_ok:
-            state_domain.append('sourced')
+            state_domain.extend(['sourced', 'sourced_p'])
 
         if wizard.confirmed_ok:
-            state_domain.extend(['manual', 'progress'])
-
-        if wizard.exception_ok:
-            state_domain.extend(['shipping_except', 'invoice_except'])
+            state_domain.extend(['confirmed', 'confirmed_p'])
 
         if wizard.closed_ok:
             state_domain.append('done')
 
=== modified file 'bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml'
--- bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml	2016-04-20 14:10:30 +0000
+++ bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml	2018-05-17 08:41:16 +0000
@@ -20,7 +20,6 @@
                         <field name="validated_ok" />
                         <field name="sourced_ok" />
                         <field name="confirmed_ok" />
-                        <field name="exception_ok" />
                         <field name="closed_ok" />
                         <field name="cancel_ok" />
                     </group>
 
=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2017-11-13 08:37:20 +0000
+++ bin/addons/stock_override/stock.py	2018-05-17 08:41:16 +0000
@@ -1721,6 +1721,7 @@
                                                                         ('product_uom', '=', loc['uom_id']),
                                                                         ('line_number', '=', move['line_number']),
                                                                         ('location_id', '=', loc['location_id']),
+                                                                        ('sale_line_id', '=', move['sale_line_id'] and move['sale_line_id'][0] or False),
                                                                         ('location_dest_id', '=', move['location_dest_id'][0]),
                                                                         ('prodlot_id', '=', loc['prodlot_id'])],
                                                                     context=context)