diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index b374ad86af1..7dc0689d128 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -57,7 +57,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Order_Pur_line_Content">
       <blockAlignment value="LEFT"/>
@@ -142,32 +141,32 @@
         <td>
           <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ addr.title or '' ]][[ addr.name  ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ addr.title or '' ]] [[ addr.name ]]</para>
           <para style="terp_default_9">[[ addr.street ]]</para>
           <para style="terp_default_9">[[ addr.street2 or '' ]]</para>
-          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font>[[ addr.city or ''  ]]</para>
-          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or ''  ]]</para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font> [[ addr.city or '' ]]</para>
+          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para>
           <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.zip or ''  ]][[ o.partner_address_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or ''  ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
           <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
-          <para style="terp_default_9">TVA :[[ o.partner_id.vat or ''  ]]</para>
+          <para style="terp_default_9">TVA :[[ o.partner_id.vat or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and ''  ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
+    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
     <blockTable colWidths="136.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
@@ -190,24 +189,21 @@
           <para style="terp_default_Centre_9">[[ o.ref or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.partner_ref or ''  ]]</para>
+          <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or ''  ]]</para>
+          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="44.0,210.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="253.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
-        <td>
-          <para style="terp_tblheader_Details">Product</para>
-        </td>
         <td>
           <para style="terp_tblheader_Details">Description</para>
         </td>
@@ -230,7 +226,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
-      <blockTable colWidths="44.0,211.0,52.0,57.0,24.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="43.0,211.0,52.0,57.0,24.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para>
@@ -245,7 +241,7 @@
             <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]]</para>
+            <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
@@ -254,7 +250,7 @@
             <para style="terp_default_Right_9">[[ '%.2f' % line.price_unit ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal  ]]</para>
+            <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal ]]</para>
           </td>
         </tr>
         <tr>
@@ -308,10 +304,10 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed  ]]</para>
+          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
@@ -324,10 +320,10 @@
           <para style="P1">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax  ]]</para>
+          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
@@ -357,8 +353,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_9"/>
   </story>
 </document>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index b22a6b65af2..02304a589cf 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="23.0" y1="42.0" width="530" height="758"/>
+      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -28,12 +28,10 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Product_line_notes">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -67,6 +65,8 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -113,7 +113,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="408.0,49.0,73.0" repeatRows="1" style="Table_Product_Header_Title">
+    <blockTable colWidths="424.0,62.0,45.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -128,7 +128,7 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
-      <blockTable colWidths="406.0,52.0,59.0,13.0" style="Table_Product_Line">
+      <blockTable colWidths="425.0,60.0,33.0,13.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
@@ -143,19 +143,32 @@
             <para style="terp_default_Centre_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
-      </blockTable>
-      <blockTable colWidths="52.0,476.0" style="Table_Product_line_notes">
         <tr>
           <td>
-            <para style="terp_default_9">[[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]] </para>
+            <para style="terp_default_2">[[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]]</para>
+            <para style="terp_default_8_italic">[[ l or removeParentNode('table') ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ l or removeParentNode('table') ]]</para>
+            <para style="terp_default_2">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_2">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_2">
+              <font color="white"> </font>
+            </para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_9"/>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">[[ order.notes or '' ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 28422047abc..9744bd69e91 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -69,20 +69,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Order_notes_Table">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Total_Table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -111,6 +97,7 @@
     <paraStyle name="P4" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P6" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="13.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -142,6 +129,7 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -187,8 +175,8 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation 1 : [[ o.name ]]</para>
-    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order 1 : [[ o.name ]]</para>
+    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]]</para>
+    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -275,20 +263,38 @@
             <para style="terp_default_Right_9">[[ line.price_subtotal ]]</para>
           </td>
         </tr>
-      </blockTable>
-      <blockTable colWidths="74.0,249.0,214.0" style="Order_notes_Table">
         <tr>
           <td>
-            <para style="terp_default_9">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
+            <para style="terp_default_1">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
+            <para style="P7">[[ l or removeParentNode('table') ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ l or removeParentNode('table') ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_1">
+            <para style="terp_default_Centre_9">
               <font color="white"> </font>
             </para>
-            <para style="terp_default_1">
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
               <font color="white"> </font>
             </para>
           </td>
diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml
index ab4cb0b585f..dc9d04efec5 100644
--- a/addons/sale/report/shipping.rml
+++ b/addons/sale/report/shipping.rml
@@ -69,8 +69,6 @@
     </initialize>
     <paraStyle name="P1" rightIndent="0.0" leftIndent="-5.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Footer" fontName="Times-Roman"/>
@@ -183,7 +181,7 @@
           <para style="terp_tblheader_Details">Designation</para>
         </td>
         <td>
-          <para style="P3">Quantity</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">S.U.</para>
@@ -192,7 +190,7 @@
     </blockTable>
     <section>
       <para style="P2">[[ repeatIn(o.move_lines, 'line') ]]</para>
-      <blockTable colWidths="77.0,345.0,90.0,23.0" style="Table1">
+      <blockTable colWidths="78.0,345.0,90.0,23.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_9">[[line.product_id.code ]]</para>
@@ -201,7 +199,7 @@
             <para style="terp_default_9">[[ line.product_id and line.product_id.name or '']]</para>
           </td>
           <td>
-            <para style="P4">[[ line.product_qty ]]</para>
+            <para style="terp_default_Centre_9">[[ line.product_qty ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ line.product_uom and line.product_uom.name ]]</para>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index d4b4e63129a..ad11683150a 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -10,11 +10,11 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau3">
+    <blockTableStyle id="Shipping_Address_tbl">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Header_Order_Reference_Tbl">
+    <blockTableStyle id="packing_ref_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -24,14 +24,11 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Content_Order_Reference_Table">
+    <blockTableStyle id="packing_ref_content_table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -41,12 +38,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Move_Line_Header">
       <blockAlignment value="LEFT"/>
@@ -105,11 +99,11 @@
   <images/>
   <story>
     <para style="Standard">[[ repeatIn(objects,'picking') ]]</para>
-    <para style="terp_header_Centre"/>
+    <para style="terp_header_Centre">Packing List </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="269.0,269.0" style="Tableau3">
+    <blockTable colWidths="269.0,269.0" style="Shipping_Address_tbl">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -118,59 +112,64 @@
         </td>
         <td>
           <para style="terp_default_Bold_9">Shipping Address:</para>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
-          <para style="terp_default_8">[[ (picking.sale_id and picking.sale_id_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
-          <para style="terp_default_8">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]][[ picking.address_id.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]][[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]][[ (picking.address_id.state_id and picking.address_id.state_id.name) or '' ]][[ (picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Packing List</para>
     <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_Bold_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9"><font face="Helvetica">Recipient</font><font face="Helvetica">:</font><font face="Times-Roman"/>[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+    <para style="terp_default_9">Concerns: [[ picking.name ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="137.0,133.0,133.0,133.0" style="Header_Order_Reference_Tbl">
+    <blockTable colWidths="202.0,202.0,124.0" style="packing_ref_header">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Customer Ref.</para>
         </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Recipient</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Concerns</para>
-        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Packing Date</para>
         </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Shipping Date</para>
+        </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="137.0,133.0,133.0,134.0" style="Content_Order_Reference_Table">
+    <blockTable colWidths="202.0,201.0,124.0" style="packing_ref_content_table">
       <tr>
         <td>
-          <para style="terp_default_Centre_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.id) or '' ]]</para>
+          <para style="terp_default_Centre_8">[[ (picking.address_id.partner_id.id) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ picking.date ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ picking.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_9">[[ picking.date]]</para>
+          <para style="terp_default_Centre_9">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
     <para style="Standard">
       <font color="white"> </font>
     </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="43.0,296.0,53.0,59.0,77.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
@@ -204,7 +203,7 @@
             <para style="terp_default_Centre_9">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
+            <para style="terp_default_Right_9">[[ move_lines.product_qty ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>