diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index c6ff4015ea6..9e0782c1805 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -126,6 +126,7 @@
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica"/>
+    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -139,7 +140,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_8">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
@@ -205,13 +206,13 @@
           <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_Details_Right">Unit Price </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -229,7 +230,7 @@
             <para style="terp_default_Right_9">[[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
@@ -281,7 +282,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -307,21 +308,23 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Text body"/>
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Tax</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Base</para>
+          <para style="terp_tblheader_Details_Right">Base </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
+          <para style="terp_tblheader_Details_Right">Amount </para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -341,7 +344,7 @@
             <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_8">
@@ -362,7 +365,7 @@
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Position: </para>
+          <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
         </td>
         <td>
           <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
@@ -373,4 +376,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index d3d2c77e47a..81a9f072b51 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Overdue Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Overdue Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
     </pageTemplate>
@@ -97,7 +97,7 @@
           <para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.name ]]</para>
+          <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
           <para style="terp_default_9">[[ addr['street'] ]]</para>
           <para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
@@ -138,7 +138,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
+    <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -168,7 +168,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
-      <blockTable colWidths="56.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
+      <blockTable colWidths="57.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
@@ -197,7 +197,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="244.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
+    <blockTable colWidths="245.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 3cd64a08b02..cd23fc1f4ac 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -185,7 +185,7 @@
           </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_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
@@ -232,7 +232,7 @@
     <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ o.name ]]<font color="white"> </font></para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(o.date_invoice,date=True) ]]</para>
@@ -297,7 +297,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'] or '')) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'])) or removeParentNode('tr') ]]</para>
             <para style="terp_default_Note">
               <font color="white"> </font>
             </para>
@@ -337,7 +337,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['type']=='text' and format(a['name'] or '') or removeParentNode('blockTable') ]]</para>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
@@ -434,9 +434,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
       <blockTable colWidths="105.0,51.0,63.0,320.0" style="Table8">
@@ -461,13 +458,10 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
       <tr>
         <td>
-          <para style="terp_default_9">[[ format(o.comment or '') or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -477,7 +471,7 @@
     <blockTable colWidths="539.0" style="Table_Payment_Terms">
       <tr>
         <td>
-          <para style="terp_default_9">[[ o.payment_term and o.payment_term.name  + " :\n" + format(o.payment_term.note or '') or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9"><font face="Helvetica" size="10.0">[[ o.payment_term and o.payment_term.name ]] </font>: <font face="Helvetica" size="10.0">[[ (o.payment_term and o.payment_term.note and format(o.payment_term.note)) or removeParentNode('blockTable') ]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -485,4 +479,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 8bea44a67f7..dafde3d34a6 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -189,7 +189,7 @@
           </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_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para')]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
@@ -236,7 +236,7 @@
     <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
       <tr>
         <td>
-          <para style="terp_default_Centre_9">[[ o.name ]]<font color="white"> </font></para>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
@@ -438,9 +438,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
       <blockTable colWidths="120.0,49.0,60.0,310.0" style="Table8">
@@ -500,4 +497,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 908b3523af0..79e548e53c9 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -214,11 +214,8 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para>
+      <para style="terp_default_2">[[repeatIn(o.line_ids, 'line') ]]</para>
       <blockTable colWidths="112.0,86.0,106.0,64.0,85.0,75.0" style="Table4">
         <tr>
           <td>
@@ -237,12 +234,12 @@
             <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[get_company_currency_symbol()]]  </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="304.0,64.0,85.0,75.0" style="Table5">
+    <blockTable colWidths="335.0,32.0,85.0,75.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -256,7 +253,7 @@
           <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]]  </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index bfd0de77f49..dbc3c09d9c6 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="HR Expenses" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Expenses" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="16.0" y1="57.0" width="522" height="728"/>
     </pageTemplate>
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index e01e4df6d2e..62003478c4c 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -80,20 +80,19 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P13" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -112,30 +111,30 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
+    <para style="P15">[[repeatIn(objects,'o')]]</para>
     <section>
-      <para style="P5">[[repeatIn(objects,'o')]]</para>
-      <blockTable colWidths="262.0,5.0,260.0" style="Table5">
+      <para style="P15">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="262.0,6.0,260.0" style="Table5">
         <tr>
           <td>
-            <para style="P10">
+            <para style="P15">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P10">
+            <para style="P9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P6">[[ o.user_id.address_id.title or '' ]] [[ o.user_id.address_id.name ]]</para>
-            <para style="P6">[[ o.user_id.address_id.street ]]</para>
-            <para style="P6">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
-            <para style="P6">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
-            <para style="P6">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
-            <para style="P6">
+            <para style="P14">[[ o.user_id.address_id.partner_id.title.name or '' ]] [[ o.user_id.address_id.partner_id.name ]]</para>
+            <para style="P14">[[ o.user_id.address_id.street ]]</para>
+            <para style="P14">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
+            <para style="P14">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
+            <para style="P14">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
+            <para style="P14">
               <font color="white"> </font>
             </para>
           </td>
@@ -150,7 +149,7 @@
       <blockTable colWidths="527.0" style="Table4">
         <tr>
           <td>
-            <para style="P4">Lunch Order</para>
+            <para style="P11">Lunch Order</para>
           </td>
         </tr>
       </blockTable>
@@ -163,16 +162,16 @@
       <blockTable colWidths="132.0,153.0,141.0,101.0" style="Table3">
         <tr>
           <td>
-            <para style="P7">Name</para>
+            <para style="P10">Name</para>
           </td>
           <td>
-            <para style="P11">Order</para>
+            <para style="P3">Order</para>
           </td>
           <td>
-            <para style="P11">Description</para>
+            <para style="P3">Description</para>
           </td>
           <td>
-            <para style="P12">Unit Price([[company.currency_id.code]])</para>
+            <para style="P4">Unit Price</para>
           </td>
         </tr>
       </blockTable>
@@ -180,37 +179,36 @@
     <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table1">
       <tr>
         <td>
-          <para style="P14">[[repeatIn(objects, 'o') ]]</para>
-          <para style="P14">[[ o.user_id.name ]]</para>
+          <para style="P5">[[ o.user_id.name ]]</para>
         </td>
         <td>
-          <para style="P16">[[o.product.name ]]</para>
+          <para style="P7">[[o.product.name ]]</para>
         </td>
         <td>
-          <para style="P8">[[ o.descript ]]</para>
+          <para style="P12">[[ o.descript ]]</para>
         </td>
         <td>
-          <para style="P15">[[formatLang(o.price) ]] [[company.currency_id.symbol]]</para>
+          <para style="P6">[[formatLang(o.price) ]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table2">
       <tr>
         <td>
-          <para style="P3">
+          <para style="P8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P11">Total:</para>
+          <para style="P3">Total:</para>
         </td>
         <td>
-          <para style="P9">[[ formatLang(sum_price(objects)) ]] <font face="Helvetica">[[company.currency_id.symbol]]</font></para>
+          <para style="P13">[[ formatLang(sum_price(objects)) ]] <font face="Helvetica">[[company.currency_id.symbol]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -218,4 +216,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 328b5e931ee..cafadca5aa2 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -277,7 +277,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price<font size="8.0">([[ o.pricelist_id.currency_id. name ]])</font></para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 26d427a3036..69a691a14f9 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -36,12 +36,12 @@ class pos_details(report_sxw.rml_parse):
 
     def _pos_sales_details(self,form,user):
         data={}
-        self.cr.execute ("select po.name as pos_name,po.date_order,pt.name ,pol.qty,pol.price_unit,pol.discount,po.invoice_id,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
-                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,res_users as ru,res_company as rc " \
-                         "where  pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('done','paid','invoiced') " \
+        self.cr.execute ("select po.name as pos_name,po.date_order,pt.name ,pp.default_code as code,pol.qty,pu.name as uom,pol.price_unit,pol.discount,po.invoice_id,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu,res_users as ru,res_company as rc " \
+                         "where  pt.id=pp.product_tmpl_id and pu.id=pt.uom_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('done','paid','invoiced') " \
                          "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
                          "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
-                         "group by po.name,pol.qty,po.date_order,pt.name,pol.price_unit,pol.discount,po.invoice_id " \
+                         "group by po.name,pol.qty,po.date_order,pt.name,pp.default_code,pu.name,pol.price_unit,pol.discount,po.invoice_id " \
                              ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
         data=self.cr.dictfetchall()
         if data:
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index c10b8049356..388c30a42ce 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -199,7 +199,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="67.0,65.0,143.0,59.0,40.0,47.0,88.0" style="Table4">
+    <blockTable colWidths="53.0,44.0,158.0,54.0,76.0,37.0,88.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -214,7 +214,7 @@
           <para style="terp_tblheader_Details_Right">Price </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Disc(%) </para>
@@ -226,7 +226,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
-      <blockTable colWidths="67.0,66.0,142.0,59.0,41.0,46.0,89.0" style="Table6">
+      <blockTable colWidths="54.0,44.0,159.0,54.0,75.0,36.0,89.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -235,13 +235,13 @@
             <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(line_ids['discount']) ]]</para>
@@ -275,7 +275,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -383,4 +383,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index d17eb2f33dc..30cfdd7063c 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+from datetime import datetime
 from report import report_sxw
 
 
@@ -38,7 +39,8 @@ class pos_details_summary(report_sxw.rml_parse):
             'getsuminvoice': self._sum_invoice,
             'gettaxamount': self._get_tax_amount,
             'getsalestotal': self._get_sales_total,
-            'getperiod': self._get_period,
+            'getstartperiod': self._get_start_period,
+            'getendperiod': self._get_end_period,
             'getcompany':self.get_company
         })
 
@@ -68,27 +70,26 @@ class pos_details_summary(report_sxw.rml_parse):
                                     objects,
                                     0.0 )
 
-    def _get_payments(self, objects, ignore_gift=False):
-        gift_journal_id = None
-        if ignore_gift:
-            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
-            if len(config_journal_ids):
-                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
-                gift_journal_id = config_journal.journal_id.id
+    def _get_payments(self, objects):
+#        gift_journal_id = None
+#        if ignore_gift:
+#            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
+#            if len(config_journal_ids):
+#                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
+#                gift_journal_id = config_journal.journal_id.id
 
         result = {}
         for obj in objects:
-            for payment in obj.statement_ids:
-                if gift_journal_id and gift_journal_id == payment.statement_id.journal_id.id:
-                    continue
-                result[payment.statement_id.journal_id.name] = result.get(payment.statement_id.journal_id.name, 0.0) + payment.amount
+            for statement in obj.statement_ids:
+                if statement.journal_id:
+                    result[statement.journal_id] = result.get(statement.journal_id, 0.0) + statement.amount
         return result
 
     def _paid_total(self, objects):
-        return sum(self._get_payments(objects, True).values(), 0.0)
+        return sum(self._get_payments(objects).values(), 0.0)
 
     def _total_of_the_day(self, objects):
-        total_paid = sum(self._get_payments(objects, True).values(), 0.0)
+        total_paid = self._paid_total(objects)
         total_invoiced = self._sum_invoice(objects)
         return total_paid - total_invoiced
 
@@ -119,16 +120,17 @@ class pos_details_summary(report_sxw.rml_parse):
     def _get_sales_total(self, objects):
         return reduce(lambda x, o: x + len(o.lines), objects, 0)
 
-    def _get_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        if min_date == max_date:
-            return '%s' % min_date
-        else:
-            return '%s - %s' % (min_date, max_date)
+    def _get_start_period(self, objects):
+        date_orders = sorted([obj.date_order for obj in objects])
+        min_date = date_orders[0]
+        return '%s' % min_date
 
 
+    def _get_end_period(self, objects):
+        date_orders = sorted([obj.date_order for obj in objects])
+        max_date = date_orders[-1]
+        return '%s' % max_date
+
 
 report_sxw.report_sxw('report.pos.details_summary',
                                             'pos.order',
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 4c538f3b15e..2c119c103f1 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Detail of sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
+      <frame id="first" x1="28.0" y1="57.0" width="511" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -20,9 +20,12 @@
       <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="Table2">
       <blockAlignment value="LEFT"/>
@@ -34,26 +37,12 @@
       <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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-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="Table3">
       <blockAlignment value="LEFT"/>
@@ -61,33 +50,38 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table9">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table8">
+    <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
@@ -106,12 +100,8 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -150,14 +140,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">
+    <para style="terp_header_Centre">Details of Sales</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Details of Sales</para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
+    <blockTable colWidths="149.0,124.0,119.0,120.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -166,33 +153,44 @@
           <para style="terp_tblheader_General_Centre">Print Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Period</para>
+          <para style="terp_tblheader_General_Centre">Start Period</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">End Period</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
+    <blockTable colWidths="148.0,124.0,119.0,119.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getperiod(objects) ]]</para>
+          <para style="terp_default_Centre_8">[[ '%s' % getstartperiod(objects) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ '%s' % getendperiod(objects) ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,256.0" style="Table4">
+    <section>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="256.0,256.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
         <td>
-          <para style="P2">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -200,13 +198,13 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(gettaxamount(objects).items(),'p') ]]</para>
-      <blockTable colWidths="256.0,256.0" style="Table6">
+      <blockTable colWidths="256.0,256.0" style="Table5">
         <tr>
           <td>
-            <para style="P6">[[ p[0] ]]</para>
+            <para style="P1">[[ p[0] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
@@ -217,13 +215,13 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,256.0" style="Table3">
+    <blockTable colWidths="257.0,255.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Payment</para>
         </td>
         <td>
-          <para style="P2">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -231,13 +229,13 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(getpayments(objects).items(),'t') ]]</para>
-      <blockTable colWidths="256.0,256.0" style="Table9">
+      <blockTable colWidths="255.0,255.0" style="Table11">
         <tr>
           <td>
-            <para style="P5">[[ t[0] ]]</para>
+            <para style="P2">[[ t[0] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
@@ -248,25 +246,25 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,256.0" style="Table8">
+    <blockTable colWidths="257.0,255.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
-          <para style="P1">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="256.0,256.0" style="Table7">
+    <blockTable colWidths="257.0,254.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]]</para>
         </td>
       </tr>
       <tr>
@@ -310,7 +308,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 2d25c740d77..5201de274ca 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -149,16 +149,16 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau6">
+    <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -172,7 +172,7 @@
 	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
 	<section>
       <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
+      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -184,7 +184,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
@@ -194,7 +194,7 @@
       </blockTable>
        </section>
        </section>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -215,7 +215,7 @@
           <para style="terp_tblheader_Details">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 23c3f950d81..5abda34f54e 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -128,13 +128,13 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table3">
+    <blockTable colWidths="301.0,57.0,35.0,57.0,61.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Qty</para>
+          <para style="terp_tblheader_General_Centre">Qty</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Right">Disc(%)</para>
@@ -149,7 +149,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table6">
+      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -161,7 +161,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
@@ -169,7 +169,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table5">
+    <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
@@ -190,7 +190,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 83a02d49832..a147c03d113 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -25,8 +25,7 @@ from report import report_sxw
 class pos_user_product(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_user_product, self).__init__(cr, uid, name, context=context)
-        self.total = 0.0
+        super(pos_user_product, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
             'get_data':self._get_data,
@@ -35,6 +34,7 @@ class pos_user_product(report_sxw.rml_parse):
 
         })
     def _get_data(self,o):
+        self.total = 0.0        
         data={}
         sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where  i.order_id=o.id and o.state='paid' and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
         self.cr.execute(sql1)
@@ -43,7 +43,7 @@ class pos_user_product(report_sxw.rml_parse):
         for r in data:
             a_l.append(r['id'])
         if len(a_l):
-            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id IN %s and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit""",(tuple(a_l),)
+            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name, p.default_code as code, pu.name as uom from product_product p, product_template t,product_uom pu,pos_order_line l where order_id = %d and p.product_tmpl_id=t.id and l.product_id=p.id and pu.id=t.uom_id group by t.name,p.default_code,pu.name,l.price_unit"""%(o.id)
             self.cr.execute(sql2)
             data = self.cr.dictfetchall()
         for d in data:
@@ -58,7 +58,7 @@ class pos_user_product(report_sxw.rml_parse):
             self.cr.execute(sql)
             data = self.cr.fetchone()
             return data[0]
-    def _get_total(self):
+    def _get_total(self,o):
         return self.total
 
 report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product,header='internal')
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index ae15e6478e7..9e58423ba7d 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="User's Product" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="User's Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="36.0" y1="57.0" width="520" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -60,15 +60,8 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
@@ -82,7 +75,6 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -125,9 +117,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="P2">User's Product</para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -135,10 +124,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="96.0,96.0,96.0,96.0,96.0" style="Table1">
+    <blockTable colWidths="104.0,104.0,104.0,104.0,104.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">User</para>
@@ -157,7 +143,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="96.0,96.0,96.0,96.0,96.0" style="Table2">
+    <blockTable colWidths="104.0,104.0,104.0,104.0,104.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ get_user(objects) ]]</para>
@@ -172,14 +158,14 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.date,date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time = True) ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table3">
+    <blockTable colWidths="356.0,68.0,95.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -196,22 +182,22 @@
       <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-        <blockTable colWidths="161.0,161.0,161.0" style="Table6">
+        <blockTable colWidths="356.0,69.0,95.0" style="Table6">
           <tr>
             <td>
-              <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+              <para style="terp_default_9">[ [[line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ formatLang(line_ids['qty']) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="319.0,80.0,83.0" style="Table5">
+    <blockTable colWidths="357.0,69.0,94.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
@@ -222,7 +208,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 62b31b7732e..ff8bf0801f1 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -126,7 +126,7 @@
             	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
 						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='Remaining Hours Per Project']" position="after">
+            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
 						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
             	</xpath>
             </field>
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 5fbc2cbdcc2..2c565130030 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -149,7 +149,7 @@
               <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">[[ addr.partner_id.title or '' ]] [[ addr.partner_id.name ]]</para>
+                <para style="terp_default_9">[[ addr.partner_id.title.name or '' ]] [[ addr.partner_id.name ]]</para>
                 <para style="terp_default_9">[[ addr.street ]]</para>
                 <para style="terp_default_9">[[ addr.street2 or removeParentNode('para') ]]</para>
                 <para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
@@ -168,7 +168,7 @@
           </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_id.title.name or '' ]] [[ o.partner_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 removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
@@ -186,12 +186,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</para>
     <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</para>
     <para style="terp_default_8">
@@ -250,7 +244,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Net Price([[ o.pricelist_id.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Net Price</para>
         </td>
       </tr>
     </blockTable>
@@ -271,10 +265,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
+            <para style="Standard">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -320,7 +314,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -346,7 +340,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -364,4 +358,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 63e3ca791fc..95de453dca0 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -88,7 +88,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']]</para>
           <para style="terp_default_9">[[ (order.partner_address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
@@ -125,7 +125,7 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[repeatIn(order.order_line,'order_line')]]</para>
-      <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
+      <blockTable colWidths="371.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index a4eab5aa86d..b5f037625e6 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -132,7 +132,7 @@
       <tr>
         <td>
           <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">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
@@ -142,7 +142,7 @@
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.title.name or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]] </para>
           <para style="terp_default_9">[[ (o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2)) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
@@ -155,7 +155,7 @@
           </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_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
@@ -234,7 +234,7 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -243,7 +243,7 @@
       <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,70.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line.name ]]</para>
+            <para style="terp_default_9">[[ line.name ]] </para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) ]]</para>
@@ -258,10 +258,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.discount) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -312,7 +312,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -325,7 +325,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -338,7 +338,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -361,4 +361,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 7d56779a613..58ebdc07cf6 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -83,8 +83,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="attributes">
-	                <attribute name="string">My Sales Pipeline</attribute>
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
 	            </xpath>
             </field>
         </record>
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index b01affd5329..9413ca09901 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -191,7 +191,7 @@
       <tr>
         <td>
           <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">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
@@ -214,7 +214,7 @@
           </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_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
@@ -293,7 +293,7 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -384,7 +384,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -397,7 +397,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -410,7 +410,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index c2b46959e1d..6c6027093a0 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -125,7 +125,7 @@
       <tr>
         <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.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
@@ -134,7 +134,7 @@
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
-          <para style="terp_default_9">[[ picking.address_id and picking.address_id.title or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
@@ -181,7 +181,7 @@
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title.name) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
@@ -214,8 +214,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
-      [[ picking.move_lines or removeParentNode('section')]]
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
+      <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
@@ -238,8 +238,8 @@
     </section>
     <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
-      [[ picking.move_lines or removeParentNode('section')]]
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
+      <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Move_Line_Content_Other_State">
         <tr>
           <td>