Merge lp:~unifield-team/unifield-wm/uftp-315 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/uftp-315]

2322. By Quentin THEURET @Amaris on 2014-11-07

UFTP-315 [FIX] Top line for report (see attachment) shows RFQ ref. This report is only for POs.

2323. By Quentin THEURET @Amaris on 2014-11-07

UFTP-315 [FIX] The References of the POs are hidden in the excel, please can this be formatted so they are displayed

2324. By Quentin THEURET @Amaris on 2014-11-07

UFTP-315 [FIX] When I have a PO (PO006) and receive 2 partial receptions (in both I change the unit price at reception) The unit price displayed is not correctly displayed in the report)

2325. By Quentin THEURET @Amaris on 2014-11-07

UFTP-315 [FIX] Display the backordered quantity on the remaining stock move

2326. By Quentin THEURET @Amaris on 2014-11-07

UFTP-315 [FIX] Filter the PO only on states that are displayed on Unifield

=== modified file 'msf_outgoing/report/invoice.rml'
--- msf_outgoing/report/invoice.rml	2014-09-26 08:44:15 +0000
+++ msf_outgoing/report/invoice.rml	2014-11-07 15:09:49 +0000
@@ -96,7 +96,7 @@
     </para>
     
     <!-- header: ref fields -->
-    <blockTable colWidths="120.0,120.0,150,150,292" style="HeaderInfos">
+    <blockTable colWidths="100.0,220.0,170,170,172" style="HeaderInfos">
         <tr>
             <td>
                 <para style="HeaderInfosTitle">Our ref:</para>

=== modified file 'msf_supply_doc_export/msf_supply_doc_export.py'
--- msf_supply_doc_export/msf_supply_doc_export.py	2014-08-04 09:27:34 +0000
+++ msf_supply_doc_export/msf_supply_doc_export.py	2014-11-07 15:09:49 +0000
@@ -27,6 +27,7 @@
 from report_webkit.webkit_report import WebKitParser as OldWebKitParser
 from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
 from tools.translate import _
+from purchase_override import PURCHASE_ORDER_STATE_SELECTION
 
 import pooler
 import time
@@ -339,33 +340,31 @@
 
 
 class po_follow_up_mixin(object):
+
+    def _get_states(self):
+        states = {}
+        for state_val, state_string in PURCHASE_ORDER_STATE_SELECTION:
+            states[state_val] = state_string
+        return states
      
     def getHeaderLine(self,obj):
         ''' format the header line for each PO object '''
-        states = {'sourced': 'Sourced', 'confirmed': 'Validated', 'confirmed_wait': 'Confirmed (waiting)', 'approved': 'Confirmed' }
         po_header = []
         po_header.append('Order ref: ' + obj.name)
-        po_header.append('Status: ' + states[obj.state])
+        po_header.append('Status: ' + self._get_states().get(obj.state, ''))
         po_header.append('Created: ' + obj.date_order)
-        po_header.append('Confirmed del date: ' + obj.delivery_confirmed_date)
+        po_header.append('Confirmed delivery date: ' + obj.delivery_confirmed_date)
         po_header.append('Nb items: ' + str(len(obj.order_line)))
         po_header.append('Estimated amount: ' + str(obj.amount_total))
-        po_header.append('')
-        po_header.append('')
-        po_header.append('')
-        po_header.append('')
-        po_header.append('')
-        po_header.append('')
         return po_header
 
     def getHeaderLine2(self,obj):
         ''' format the header line for each PO object '''
-        states = {'sourced': 'Sourced', 'confirmed': 'Validated', 'confirmed_wait': 'Confirmed (waiting)', 'approved': 'Confirmed' }
         po_header = {}
         po_header['ref'] = 'Order ref: ' + obj.name
-        po_header['status'] = 'Status: ' + states[obj.state]
+        po_header['status'] = 'Status: ' + self._get_states().get(obj.state, '')
         po_header['created'] = 'Created: ' + obj.date_order
-        po_header['deldate'] = 'Confirmed del date: ' + obj.delivery_confirmed_date
+        po_header['deldate'] = 'Confirmed delivery date: ' + obj.delivery_confirmed_date
         po_header['items'] = 'Nb items: ' + str(len(obj.order_line))
         po_header['amount'] = 'Estimated amount: ' + str(obj.amount_total)
         line = po_header['ref'] + po_header['status'] + po_header['created'] + po_header['deldate'] + po_header['items'] + po_header['amount'] 
@@ -393,39 +392,47 @@
         # TODO it probably should be 1
         multiplier = 1.0000100000000001 
         pol_obj = self.pool.get('purchase.order.line')
-        po_line_ids = pol_obj.search(self.cr, self.uid, [('order_id','=',po_id)])
+        prod_obj = self.pool.get('product.product')
+        po_line_ids = pol_obj.search(self.cr, self.uid, [('order_id','=',po_id)], order='line_number')
         po_lines = pol_obj.browse(self.cr, self.uid, po_line_ids)
         report_lines = []
         for line in po_lines:
+            sort_key = float(line.line_number*1000)
             report_line = {}
             inline_in = self.getInlineIN(line.id)
             analytic_lines = self.getAnalyticLines(line)
-            report_line['sort_key'] = float(line.line_number)
+            other_ins = []
+            if inline_in:
+                other_ins = self.getOtherINs(line.id, inline_in.get('id')) 
+            report_line['sort_key'] = sort_key
             report_line['item'] = line.line_number or ''
             report_line['code'] = line.product_id.default_code or ''
             report_line['description'] = line.product_id.name or ''
             report_line['qty_ordered'] = line.product_qty or ''
             report_line['uom'] = line.product_uom.name or ''
-            report_line['qty_received'] = inline_in.get('product_qty','')
+            report_line['qty_received'] = inline_in.get('state') == 'done' and inline_in.get('product_qty','') or '0.00'
             report_line['in'] = inline_in.get('name','') or ''
-            if report_line['in'] == '':
-                report_line['qty_backordered'] = report_line['qty_ordered']
+            if inline_in.get('backorder_id') and inline_in.get('state') != 'done':
+                report_line['qty_backordered'] = inline_in.get('product_qty', '')
             else:
                 report_line['qty_backordered'] = ''
             report_line['unit_price'] = line.price_unit or ''
             if inline_in.get('price_unit') and inline_in.get('price_unit') <> multiplier:
-                report_line['in_unit_price'] = inline_in.get('price_unit') * line.price_unit
+                report_line['in_unit_price'] = inline_in.get('price_unit')
             else:
                 report_line['in_unit_price'] = ''
-            report_line['in_unit_price'] = ''
+#            report_line['in_unit_price'] = ''
             report_line['destination'] = analytic_lines[0].get('destination')
             report_line['cost_centre'] = analytic_lines[0].get('cost_center')
             report_lines.append(report_line)
+            if inline_in.get('state') != 'done':
+                report_line['in_unit_price'] = ''
               
             # if additional analytic lines print them here.
             for (index, analytic_line) in list(enumerate(analytic_lines))[1:]:
                 report_line = {}
-                report_line['sort_key'] = line.line_number + (float(index) / 10)
+                sort_key += 1
+                report_line['sort_key'] = sort_key
                 report_line['item'] = ''
                 report_line['code'] = ''
                 report_line['description'] = ''
@@ -441,33 +448,41 @@
                 report_lines.append(report_line)
 
             # check if there are additional INs for this line
-            if inline_in:
-                other_ins = self.getOtherINs(line.id, inline_in.get('id')) 
+            if other_ins:
                 for other_in in other_ins:
                     report_line = {}
-                    backorder = other_in.get('backorder_id')
-                    report_line['sort_key'] = line.line_number + (float(other_in.get('id')) / 100)
+                    backorder = inline_in.get('backorder_id') and other_in.get('picking_id') == inline_in.get('backorder_id')
+                    sort_key += 1
+                    report_line['sort_key'] = sort_key
+
+                    # Product is changed
+                    if other_in.get('product_id') and other_in.get('product_id') != line.product_id.id:
+                        prod_brw = prod_obj.browse(self.cr, self.uid, other_in.get('product_id'))
+                        report_line['code'] = prod_brw.default_code
+                        report_line['description'] = prod_brw.name
+                    else:
+                        report_line['code'] = ''
+                        report_line['description'] = ''
+
                     report_line['item'] = ''
-                    report_line['code'] = ''
-                    report_line['description'] = ''
                     report_line['qty_ordered'] = ''
                     report_line['uom'] = ''
-                    if backorder:
-                        report_line['qty_received'] = ''
-                    else:
-                        report_line['qty_received'] = other_in.get('product_qty','')
+#                    if backorder and inline_in.get('state') != 'done':
+#                        report_line['qty_received'] = other_in.get('product_qty', '')
+#                        report_line['qty_backordered'] = inline_in.get('product_qty', '')
+#                    else:
+                    report_line['qty_received'] = other_in.get('product_qty','')
+                    report_line['qty_backordered'] = ''
                     report_line['in'] = other_in.get('name','')
-                    if backorder:
-                        report_line['qty_backordered'] = other_in.get('product_qty','')
-                    else:
-                        report_line['qty_backordered'] = ''
                     report_line['unit_price'] = line.price_unit or ''
-                    if inline_in.get('price_unit') and inline_in.get('price_unit') <> multiplier:
-                        report_line['in_unit_price'] = inline_in.get('price_unit') * line.price_unit
+                    if other_in.get('price_unit') and other_in.get('price_unit') <> multiplier:
+                        report_line['in_unit_price'] = other_in.get('price_unit')
                     else:
                         report_line['in_unit_price'] = ''
-                    report_line['destination'] = ''
-                    report_line['cost_centre'] = ''
+                    report_line['destination'] = analytic_lines[0].get('destination')
+                    report_line['cost_centre'] = analytic_lines[0].get('cost_center')
+                    if other_in.get('state') != 'done':
+                        report_line['in_unit_price'] = ''
                     report_lines.append(report_line)
                        
         # sort the list for presentation in excel
@@ -489,12 +504,12 @@
              
     def getInlineIN(self,po_line_id):
         sm_obj = self.pool.get('stock.move')        
-        self.cr.execute(''' select sm.id, sp.name, sm.product_qty, sm.product_uom, sm.price_unit, sm.state 
+        self.cr.execute(''' select sm.id, sp.name, sm.product_qty, sm.product_uom, sm.price_unit, sm.state, sp.backorder_id
                             from stock_move sm, stock_picking sp
                             where sm.purchase_line_id = %s 
                             and sm.type = 'in' 
                             and sm.picking_id = sp.id
-                            order by sm.id asc limit 1''' % (po_line_id))
+                            order by sp.name, sm.id asc limit 1''' % (po_line_id))
         row = self.cr.dictfetchall()                
         if row:
             return row[0]
@@ -504,13 +519,13 @@
     
     def getOtherINs(self,po_line_id,exclude_id):
         sm_obj = self.pool.get('stock.move')        
-        self.cr.execute(''' select sm.id, sp.name, sm.product_qty, sm.product_uom, sm.price_unit, sm.state, sp.backorder_id 
+        self.cr.execute(''' select sm.id, sp.name, sm.product_qty, sm.product_id, sm.product_uom, sm.price_unit, sm.state, sm.picking_id
                             from stock_move sm, stock_picking sp
                             where sm.purchase_line_id  = %s 
                             and sm.type = 'in' 
                             and sm.picking_id = sp.id
                             and sm.id <> %s 
-                            order by sm.id asc''' % (po_line_id,exclude_id))
+                            order by sp.name, sm.id asc''' % (po_line_id,exclude_id))
         rows = self.cr.dictfetchall()   
         if rows:
             return rows

=== modified file 'msf_supply_doc_export/po_follow_up_menu.xml'
--- msf_supply_doc_export/po_follow_up_menu.xml	2014-05-23 13:22:27 +0000
+++ msf_supply_doc_export/po_follow_up_menu.xml	2014-11-07 15:09:49 +0000
@@ -3,7 +3,7 @@
     <data>
   
       <record id="po_follow_up_menu" model="ir.actions.act_window">
-         <field name="name">PO Follow Up</field>
+         <field name="name">PO Follow Up per Supplier</field>
          <field name="res_model">po.follow.up</field>
          <field name="view_type">form</field>
          <field name="view_mode">tree,graph</field>

=== modified file 'msf_supply_doc_export/report/report_po_follow_up.rml'
--- msf_supply_doc_export/report/report_po_follow_up.rml	2014-06-26 15:11:30 +0000
+++ msf_supply_doc_export/report/report_po_follow_up.rml	2014-11-07 15:09:49 +0000
@@ -17,6 +17,7 @@
       <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,0"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau3">
       <blockAlignment value="LEFT"/>
@@ -29,10 +30,12 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" backColor="#e6e6e6"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" />
     <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="P4Center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P4Left" 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"/>
@@ -77,7 +80,7 @@
          <td><para style="P2">[[ getHeaderLine(o)[5] ]]</para></td>
     </tr>     	  
      </blockTable>
-    <blockTable colWidths="25.0,175.0,160.0,40.0,50.0,50.0,100.0,100.0,50.0,50.0,50.0,50.0" style="Tableau3" >
+    <blockTable colWidths="25.0,80.0,185.0,40.0,50.0,50.0,85.0,100.0,70.0,70.0,60.0,85.0" style="Tableau3" >
       <tr>
         <td>
           <para style="P3">Item</para>
@@ -119,40 +122,40 @@
       <tr>
          <para style="P4">[[ repeatIn(getPOLines(o.id), 'line') ]]</para>
         <td>
-          <para style="P4">[[ line['item'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['code'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['description'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['qty_ordered'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['uom'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['qty_received'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['in'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['qty_backordered'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['unit_price'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['in_unit_price'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['destination'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['cost_centre'] ]]</para>
+          <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>
        </td>
      </tr>
     

=== modified file 'msf_supply_doc_export/report/report_po_follow_up_xls.mako'
--- msf_supply_doc_export/report/report_po_follow_up_xls.mako	2014-06-26 15:11:30 +0000
+++ msf_supply_doc_export/report/report_po_follow_up_xls.mako	2014-11-07 15:09:49 +0000
@@ -81,46 +81,60 @@
 ## definition of the columns' size
 <% nb_of_columns = 12 %>
 <Table x:FullColumns="1" x:FullRows="1">
-<Column ss:AutoFitWidth="1" ss:Width="120" />
-<Column ss:AutoFitWidth="1" ss:Width="120" />
-<Column ss:AutoFitWidth="1" ss:Width="300" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
-<Column ss:AutoFitWidth="1" ss:Width="80" />
+    # Item
+    <Column ss:AutoFitWidth="1" ss:Width="40" />
+    # Code
+    <Column ss:AutoFitWidth="1" ss:Width="81" />
+    # Description
+    <Column ss:AutoFitWidth="1" ss:Width="161" />
+    # Qty ordered
+    <Column ss:AutoFitWidth="1" ss:Width="57" />
+    # UoM
+    <Column ss:AutoFitWidth="1" ss:Width="65" />
+    # Qty received
+    <Column ss:AutoFitWidth="1" ss:Width="80" />
+    # 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" />
+    # IN Unit Price
+    <Column ss:AutoFitWidth="1" ss:Width="95" />
+    # Destination
+    <Column ss:AutoFitWidth="1" ss:Width="95" />
+    # Cost Center
+    <Column ss:AutoFitWidth="1" ss:Width="95" />
 
 <Row>
-   <Cell ss:StyleID="mainheader"><Data ss:Type="String">${getRunParms()['title'] or '' |x}</Data></Cell>
-   <Cell ss:StyleID="mainheader"><Data ss:Type="String">Report run date: ${getRunParms()['run_date'] or '' |x}</Data></Cell>
-   <Cell ss:StyleID="mainheader"><Data ss:Type="String">PO date from: ${getRunParms()['date_from'] or ''|x}</Data></Cell>
-   <Cell ss:StyleID="mainheader"><Data ss:Type="String">PO date to: ${getRunParms()['date_thru'] or '' |x}</Data></Cell>
-   <Cell ss:StyleID="mainheader"><Data ss:Type="String">Supplier: ${getRunParms()['supplier'] or '' |x}</Data></Cell>
-   <Cell ss:StyleID="mainheader"><Data ss:Type="String">PO State: ${getRunParms()['state'] or '' | x}</Data></Cell>
+    <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>
 </Row>
 <Row></Row>
 <Row></Row>
 
 % for o in objects:
     
-    <Row> 
+    <Row ss:AutoFitHeight="0" ss:Height="36">
        % for header in getHeaderLine(o):
-    	  <Cell ss:StyleID="poheader"><Data ss:Type="String">${header |x}</Data></Cell>
+    	  <Cell ss:MergeAcross="1" ss:StyleID="poheader"><Data ss:Type="String">${header |x}</Data></Cell>
        % endfor
     </Row>
 
-    <Row>
+    <Row ss:AutoFitHeight="1" > 
       % for header in getPOLineHeaders():
     	    <Cell ss:StyleID="header"><Data ss:Type="String">${header}</Data></Cell>
        % endfor       
     </Row>
     
     % for line in getPOLines(o.id):
-    <Row>
+    <Row ss:AutoFitHeight="1">
         <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>
@@ -135,14 +149,31 @@
         <Cell ss:StyleID="line"><Data ss:Type="String">${(line['cost_centre'])|x}</Data></Cell>
     </Row>
     % endfor
-     <Row>
-    	<Cell ss:StyleID="line"><Data ss:Type="String"></Data></Cell>
-    	<Cell ss:StyleID="line"><Data ss:Type="String"></Data></Cell>
-    </Row>
  % endfor   
     
 </Table>
-<x:WorksheetOptions/>
+<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:Orientation="Landscape"/>
+    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14${getRunParms()['title'] or '' |x}"/>
+    <Footer x:Data="Page &amp;P of &amp;N"/>
+   </PageSetup>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+   </Print>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>17</ActiveRow>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+</WorksheetOptions>
 </ss:Worksheet>
 
 </Workbook>

=== modified file 'msf_supply_doc_export/wizard/po_follow_up.py'
--- msf_supply_doc_export/wizard/po_follow_up.py	2014-10-06 11:37:02 +0000
+++ msf_supply_doc_export/wizard/po_follow_up.py	2014-11-07 15:09:49 +0000
@@ -27,24 +27,23 @@
 import time
 from datetime import datetime
 
+PURCHASE_ORDER_STATE_SELECTION = [
+    ('draft', 'Draft'),
+    ('sourced', 'Sourced'),
+    ('confirmed', 'Validated'),
+    ('confirmed_wait', 'Confirmed (waiting)'),
+    ('approved', 'Confirmed'),
+    ('done', 'Closed'),
+    ('cancel', 'Cancelled'),
+]
 
 class po_follow_up(osv.osv_memory):
     _name = 'po.follow.up'
     _description = 'PO Follow up report wizard'
-    
-    STATE_SELECTION = [
-         ('sourced', 'Sourced'),
-         ('confirmed', 'Validated'),
-         ('confirmed_wait', 'Confirmed (waiting)'),
-         ('approved', 'Confirmed'),               
-    ]
-
-    STATES = {'sourced': 'Sourced','confirmed': 'Validated','confirmed_wait': 'Confirmed waiting','approved':'Confirmed'}
-
-    
+
     _columns = {
          'po_id':fields.many2one('purchase.order',string="Order Reference", help="Unique number of the Purchase Order. Optional", required=False),
-         'state': fields.selection(STATE_SELECTION, 'State', help="The state of the purchase order. Optional", select=True, required=False),
+         'state': fields.selection(PURCHASE_ORDER_STATE_SELECTION, 'State', help="The state of the purchase order. Optional", select=True, required=False),
          'po_date_from':fields.date("PO date from", required="False"),
          'po_date_thru':fields.date("PO date to", required="False"),
          'partner_id':fields.many2one('res.partner', 'Supplier', required=False),
@@ -53,7 +52,6 @@
          'background_time': fields.integer('Number of second before background processing'),
     }
     
-    
     _defaults = {
         'export_format': lambda *a: 'xls',
         'background_time': lambda *a: 200,
@@ -61,10 +59,19 @@
     
     def button_validate(self, cr, uid, ids, context=None):
         wiz = self.browse(cr,uid,ids)[0]
-        
-        domain = []
-        states = {'sourced': 'Sourced','confirmed': 'Validated','confirmed_wait': 'Confirmed waiting','approved':'Confirmed'}
-        report_parms =  {'title':'MULTIPLE PURCHASE ORDER FOLLOW-UP','run_date': time.strftime("%d/%m/%Y"), 'date_from': '', 'date_thru': '','state': '', 'supplier':'' }
+
+        domain = [('rfq_ok', '=', False)]
+        states = {}
+        for state_val, state_string in PURCHASE_ORDER_STATE_SELECTION:
+            states[state_val] = state_string
+        report_parms =  {
+            'title': 'PO Follow Up per Supplier',
+            'run_date': time.strftime("%d/%m/%Y"),
+            'date_from': '',
+            'date_thru': '',
+            'state': '',
+            'supplier':''
+        }
          
         # PO number
         if wiz.po_id:
@@ -74,8 +81,6 @@
         if wiz.state:
             domain.append(('state','=', wiz.state))
             report_parms['state'] = states[wiz.state]
-        else:
-            domain.append(('state','in',['sourced','confirmed','confirmed_wait','approved']))
             
         # Dates
         if wiz.po_date_from:
@@ -106,7 +111,7 @@
             return True
         
         report_header = []
-        report_header.append('MULTIPLE PURCHASE ORDER FOLLOW-UP')
+        report_header.append(report_parms['title'])
         
         report_header_line2 = ''
         if wiz.partner_id:

=== modified file 'msf_supply_doc_export/wizard/po_follow_up_view.xml'
--- msf_supply_doc_export/wizard/po_follow_up_view.xml	2014-06-25 13:40:47 +0000
+++ msf_supply_doc_export/wizard/po_follow_up_view.xml	2014-11-07 15:09:49 +0000
@@ -8,8 +8,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Purchase Order Follow Up Report">
-				<field name="po_id" colspan="2" />
-				<field name="state" colspan="2" />   <!--  note need to exclude draft  -->
+				<field name="po_id" colspan="2" domain="[('rfq_ok', '=', False)]" />
+				<field name="state" colspan="2" />
 				<field name="po_date_from" colspan="2" />  <!-- need to do from / though on dates  -->
 				<field name="po_date_thru" colspan="2" />
 				<field name="partner_id" colspan="2" />

=== modified file 'sales_followup/report/sale_follow_up_multi_report.rml'
--- sales_followup/report/sale_follow_up_multi_report.rml	2014-09-22 09:18:42 +0000
+++ sales_followup/report/sale_follow_up_multi_report.rml	2014-11-07 15:09:49 +0000
@@ -228,7 +228,7 @@
                     <para style="Lines"><i>Packing</i></para>
 	    		</td>
 	    		<td>
-                    <para style="Lines"><i>Qty backorder</i></para>
+                    <para style="Lines"><i>Qty to deliver</i></para>
                 </td>
                 <td>
                     <para style="Lines"><i>Transport</i></para>

=== modified file 'sales_followup/report/sale_follow_up_multi_report_xls.mako'
--- sales_followup/report/sale_follow_up_multi_report_xls.mako	2014-09-24 10:20:10 +0000
+++ sales_followup/report/sale_follow_up_multi_report_xls.mako	2014-11-07 15:09:49 +0000
@@ -168,7 +168,7 @@
         <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
         ## Packing
         <Column ss:AutoFitWidth="1" ss:Width="60.25" />
-        ## Qty backorder
+        ## Qty to deliver
         <Column ss:AutoFitWidth="1" ss:Width="50.5" />
         ## Transport
         <Column ss:AutoFitWidth="1" ss:Width="53.5" />
@@ -250,7 +250,7 @@
                 _('Qty delivered'),
                 _('UoM delivered'),
                 _('Packing'),
-                _('Qty backorder'),
+                _('Qty to deliver'),
                 _('Transport'),
                 _('Transport file'),
                 _('ETA'),

=== modified file 'stock_override/report/delivery_order.py'
--- stock_override/report/delivery_order.py	2013-09-12 15:10:10 +0000
+++ stock_override/report/delivery_order.py	2014-11-07 15:09:49 +0000
@@ -30,6 +30,7 @@
             'time': time,
             'get_selec': self.get_selection,
             'get_address': self.get_address,
+            'get_state': self.get_state,
         })
 
     def get_selection(self, o, field):
@@ -51,6 +52,21 @@
         '''
         return self.pool.get('res.partner.address').name_get(self.cr, self.uid, [addr_id])[0][1]
 
+    def get_state(self, state):
+        if not state:
+            return ''
+        states = {
+            'draft': 'Draft',
+            'auto': 'Waiting',
+            'confirmed': 'Confirmed',
+            'assigned': 'Available',
+            'shipped': 'Available Shipped',
+            'done': 'Closed',
+            'cancel': 'Cancelled',
+            'import': 'Import in progress',
+        }
+        return states.get(state, '')
+
 report_sxw.report_sxw('report.delivery.order','stock.picking','addons/stock_override/report/delivery_order.rml',parser=delivery_order, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_override/report/delivery_order.rml'
--- stock_override/report/delivery_order.rml	2013-10-09 14:14:28 +0000
+++ stock_override/report/delivery_order.rml	2014-11-07 15:09:49 +0000
@@ -143,12 +143,32 @@
                     <para style="Header">[[ picking.reason_type_id and picking.reason_type_id.name or '' ]]</para>
                 </td>
                 <td>
-                    <para style="HeaderRight">Warehouse : </para>
+                    <para style="HeaderRight">Warehouse :</para>
                 </td>
                 <td>
                     <para style="Header">[[ picking.warehouse_id and picking.warehouse_id.name or '' ]]</para>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <para style="HeaderRight">State :</para>
+                </td>
+                <td>
+                    <para style="Header">[[ get_state(picking.state) ]]</para>
+                </td>
+                <td>
+                    <para style="HeaderRight"></para>
+                </td>
+                <td>
+                    <para style="Header"></para>
+                </td>
+                <td>
+                    <para style="HeaderRight"></para>
+                </td>
+                <td>
+                    <para style="Header"></para>
+                </td>
+            </tr>
         </blockTable>
 
         <para style="Header">