From f14feff3b2de05a1b98ca798ed124eb625ba5bf9 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Fri, 8 Oct 2010 17:28:01 +0530
Subject: [PATCH] [IMP]Improved reports of point of sale

bzr revid: azaz.201186@gmail.com-20101008115801-sh5n8v5jckxp3sf1
---
 addons/point_of_sale/pos_demo.xml             | 135 +++++++++++-
 .../report/account_statement.rml              |  21 +-
 .../report/all_closed_cashbox_of_the_day.rml  |   9 +-
 addons/point_of_sale/report/pos_details.rml   | 196 +++++++++---------
 .../report/pos_details_summary.py             |  17 +-
 .../report/pos_details_summary.rml            |  64 +++---
 addons/point_of_sale/report/pos_lines.rml     |  15 +-
 .../report/pos_payment_report.rml             |  20 +-
 .../report/pos_payment_report_date.rml        |   2 +-
 .../report/pos_payment_report_user.rml        |  13 +-
 .../point_of_sale/report/pos_sales_user.rml   |   3 -
 .../report/pos_sales_user_today.rml           |   3 -
 .../pos_sales_user_today_current_user.rml     |  11 +-
 13 files changed, 326 insertions(+), 183 deletions(-)

diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 80ba3d24397..913a2907e03 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,7 +1,140 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+    	 <record id="account_invoice_invoicefrompospos0" model="account.invoice">
+			<field name="origin">POS/019</field>
+			<field name="reference">POS/019</field>
+			<field name="number">SAJ/2010/010</field>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="currency_id" ref="base.EUR"/>
+			<field name="address_invoice_id" ref="base.res_partner_address_8invoice"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="address_contact_id" ref="base.res_partner_address_8"/>
+			<field name="reference_type">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="state">open</field>
+			<field name="type">out_invoice</field>
+			<field name="internal_number">SAJ/2010/010</field>
+			<field name="account_id" ref="account.a_recv"/>
+			<field eval="0" name="reconciled"/>
+			<field eval="450.0" name="residual"/>
+			<field name="move_name">/</field>
+			<field name="date_invoice">2010-10-07</field>
+			<field name="period_id" ref="account.period_10"/>
+			<field eval="450.0" name="amount_untaxed"/>
+			<field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
+			<field eval="450.0" name="amount_total"/>
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="name">Invoice from POS: POS/019</field>
+		</record>
+		<record id="account_invoice_line_pcbasicpc0" model="account.invoice.line">
+			<field name="uos_id" ref="product.product_uom_unit"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="name">[PC1] Basic PC</field>
+			<field model="account.invoice" name="invoice_id" search="[('name', '=', 'Invoice from POS: POS/019')]"/>
+			<field eval="450.0" name="price_unit"/>
+			<field eval="450.0" name="price_subtotal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
+			<field eval="1.0" name="quantity"/>
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="product_id" ref="product.product_product_pc1"/>
+		</record>
+    	<record id="pos_order_pos11" model="pos.order">
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="0" name="journal_entry"/>
+			<field name="date_validity">2011-04-07</field>
+			<field name="shop_id" ref="sale.shop"/>
+			<field name="user_salesman_id" ref="base.user_root"/>
+			<field name="date_order">2010-10-07 16:53:11</field>
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field eval="1" name="nb_print"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="1" name="invoice_wanted"/>
+			<field name="state">paid</field>
+			<field name="sale_manager" ref="base.user_root"/>
+			<field name="pricelist_id" ref="product.list0"/>
+			<field name="date_validation">2010-10-07</field>
+			<field name="name">POS/019</field>
+			<field name="price_type">tax_excluded</field>
+			<field model="account.invoice" name="invoice_id" search="[('name', '=', u'Invoice from POS: POS/019')]"/>
+			<field eval="0" name="remboursed"/>
+			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
+		</record>
+		<record id="account_bank_statement_0" model="account.bank.statement">
+			<field name="user_id" ref="base.user_root"/>
+			<field name="name">10</field>
+			<field name="state">open</field>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="period_id" ref="account.period_10"/>
+			<field name="date">2010-10-07</field>
+		</record>
+		<record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field model="account.bank.statement" name="statement_id" search="[('name', '=', u'10')]"/>
+			<field name="type">general</field>
+			<field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="journal_id">Cash Journal - (test)</field>
+			<field eval="[(6,0,[])]" name="move_ids"/>
+			<field name="date">2010-10-07</field>
+			<field eval="450.0" name="amount"/>
+			<field eval="0" name="is_acc"/>
+			<field eval="0" name="am_out"/>
+			<field name="name">Payment POS/019</field>
+			
+		</record>
+	
+		<record id="stock_picking_out0" model="stock.picking">
+			<field name="origin">POS/019</field>
+			<field model="pos.order" name="pos_order" search="[('name', '=', u'POS/019')]"/>
+			<field name="date_done">2010-10-07 16:53:46</field>
+			<field eval="1" name="auto_picking"/>
+			<field name="move_type">direct</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="note">POS notes </field>
+			<field name="state">done</field>
+			<field name="type">out</field>
+			<field name="min_date">2010-10-07 16:53:46</field>
+			<field name="date">2010-10-07 16:33:30</field>
+			<field name="name">OUT/00019</field>
+			<field name="invoice_state">none</field>
+			<field name="max_date">2010-10-07 16:53:46</field>
+		</record>
+		<record id="stock_move_stockmovepos0" model="stock.move">
+			<field name="origin">POS/019</field>
+			<field eval="1.0" name="product_uos_qty"/>
+			<field name="product_uom" ref="product.product_uom_unit"/>
+			<field eval="1.0" name="product_qty"/>
+			<field name="product_uos" ref="product.product_uom_unit"/>
+			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field name="priority">1</field>
+			<field eval="0" name="auto_validate"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="state">done</field>
+			<field eval="[(6,0,[])]" name="move_history_ids"/>
+			<field name="date_expected">2010-10-07 16:33:30</field>
+			<field name="date">2010-10-07 16:33:30</field>
+			<field name="name">Stock move (POS 12)</field>
+			<field eval="[(6,0,[])]" name="move_history_ids2"/>
+			<field name="product_id" ref="product.product_product_pc1"/>
+			<field name="date_planned">2010-10-07 16:53:46</field>
+			<field name="location_dest_id" ref="stock.stock_location_customers"/>
+			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
+		</record>
+		<record id="pos_order_line_orderline0" model="pos.order.line">
+			<field name="notice">No Discount</field>
+			<field name="product_id" ref="product.product_product_pc1"/>
+			<field model="pos.order" name="order_id" search="[('name', '=', u'POS/019')]"/>
+			<field eval="450.0" name="price_unit"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="1.0" name="qty"/>
+			<field name="name">Order Line/07</field>
+		</record>
+	
      <!--Resource: pos.order-->
      
     	<record id="order_pos1" model="pos.order">
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index c576828cac1..66579ca6eaa 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -101,6 +101,7 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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"/>
@@ -140,17 +141,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="P3">Statement</para>
-    <para style="P3">
+    <para style="P4">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
+    <para style="P4">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table1">
@@ -213,7 +208,7 @@
           <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=True) or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]</para>
@@ -229,7 +224,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="122.0,256.0,104.0" style="Table5">
+    <blockTable colWidths="122.0,270.0,90.0" style="Table5">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -242,7 +237,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="122.0,256.0,104.0" style="Table6">
+    <blockTable colWidths="122.0,270.0,90.0" style="Table6">
       <tr>
         <td>
           <para style="P2">[[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
@@ -257,7 +252,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="326.0,52.0,104.0" style="Table7">
+    <blockTable colWidths="347.0,45.0,90.0" style="Table7">
       <tr>
         <td>
           <para style="P1">
@@ -268,7 +263,7 @@
           <para style="terp_default_Right_9_Bold">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index 658e7e958b9..f8381c76741 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -71,6 +71,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" 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"/>
@@ -146,7 +147,7 @@
           <para style="terp_tblheader_General">St.Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Journal</para>
+          <para style="terp_tblheader_General">Journal</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Opening Date</para>
@@ -201,10 +202,10 @@
             <para style="terp_default_Bold_8">[[ statement['journal'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8">[[ statement['date'] ]]</para>
+            <para style="P2">[[ statement['date'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
+            <para style="P2">[[ statement['closing_date'] ]]</para>
           </td>
           <td>
             <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 045adf0763c..f99835a3bff 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -66,72 +66,64 @@
       <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="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <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="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <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="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <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="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="LINEABOVE" colorName="#b3b3b3" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,3" stop="0,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,3" stop="1,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,4" stop="0,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,4" stop="1,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,5" stop="0,5"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" 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"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,5" stop="0,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,5" stop="1,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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"/>
@@ -167,14 +159,14 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_header_Centre">
+    <para style="P2">
       <font color="white"> </font>
     </para>
     <para style="terp_header_Centre">Details of Sales</para>
-    <para style="P1">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table1">
+    <blockTable colWidths="161.0,161.0,80.0,81.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -206,10 +198,10 @@
         </td>
       </tr>
     </blockTable>
-    <para style="Text body">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table4">
+    <blockTable colWidths="76.0,82.0,91.0,51.0,40.0,45.0,96.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -227,95 +219,97 @@
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc </para>
+          <para style="terp_tblheader_Details_Right">Disc(%) </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Invoiced </para>
+          <para style="P6">Invoiced </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table6">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ pos_sales_details(data['form'],user) and '' or removeParentNode('blockTable') ]]</para>
-          <para style="terp_default_9">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]] [[ formatLang(line_ids['date_order'],date = True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ 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>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]][[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_header">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="241.0,241.0" style="Table3">
+    <section>
+      <para style="terp_default_1">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
+      <blockTable colWidths="77.0,82.0,91.0,52.0,41.0,44.0,96.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P3">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line_ids['pos_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ 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="P5">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="241.0,241.0" style="Table5">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
         <td>
-          <para style="terp_default_Bold_8">
+          <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table12">
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</font><font face="Helvetica" size="6.0"/>[[ p['name'] or removeParentNode('tr') ]]</para>
+          <para style="terp_default_9">[[ repeatIn(gettaxamount(data['form'],user), 'p')]]</para>
+          <para style="terp_default_9"><font face="Helvetica" size="6.0"/>[[ p['name'] or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(p['amount']) or removeParentNode('font') ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('font') ]][[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table5">
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Payment</para>
         </td>
         <td>
-          <para style="terp_default_9">
+          <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table10">
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(getpayments(data['form'],user), 'p') ]] </font>[[ p['name'] or removeParentNode('tr') ]]</para>
+          <para style="terp_default_9">[[ repeatIn(getpayments(data['form'],user), 'p') ]]</para>
+          <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
     <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>
     <blockTable colWidths="241.0,241.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
           <para style="terp_default_9">
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a629929e204..e15238f96f9 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -38,7 +38,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
         })
 
@@ -119,14 +120,24 @@ 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):
+    def _get_start_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)
+            return '%s' % (min_date)
+
+    def _get_end_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' % max_date
+        else:
+            return '%s' % (max_date)
+            
 
 
 
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 5f68c7869f0..f525bdb2346 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
 <?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="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -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,9 +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"/>
+      <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"/>
@@ -108,7 +114,8 @@
     <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" 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="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" 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"/>
@@ -147,14 +154,14 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P4">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <para style="P4">Details of Sales</para>
-    <para style="P5">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -163,24 +170,30 @@
           <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="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
+          <para style="P5">[[ '%s' % getcompany(objects)]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P5">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getperiod(objects) ]]</para>
+          <para style="P5">[[ '%s' % getstartperiod(objects) ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ '%s' % getendperiod(objects) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="241.0,241.0" style="Table3">
@@ -196,13 +209,10 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9">
-            <font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(objects).items(),'p') ]] </font>
-            <font face="Helvetica" size="8.0">[[ p[0] ]]</font>
-          </para>
+          <para style="P6">[[ repeatIn(gettaxamount(objects).items(),'p') ]] [[ p[0] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ p[1] ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -219,32 +229,20 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9">
-            <font face="Helvetica" size="6.0">[[ repeatIn(getpayments(objects).items(),'t') ]]</font>
-            <font face="Helvetica" size="9.0">[[ t[0] ]]</font>
-          </para>
+          <para style="P6">[[ repeatIn(getpayments(objects).items(),'t') ]] <font face="Helvetica">[[ t[0] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % (t[1],) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
         </td>
       </tr>
     </blockTable>
     <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_default_9">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="241.0,241.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
           <para style="P2">
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 7f2d97f1c18..9a9292b7869 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="SalesLines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
     </pageTemplate>
@@ -118,6 +118,9 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="179.0,179.0,179.0" style="Table3">
       <tr>
         <td>
@@ -177,16 +180,16 @@
       <blockTable colWidths="178.0,61.0,71.0,77.0,73.0,76.0" style="Tableau7">
         <tr>
           <td>
-            <para style="terp_default_9">[[l.product_id.code]] [[l.product_id.name]]</para>
+            <para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[taxes(l)]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]] [[o.pricelist_id.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) ]]</para>
@@ -276,10 +279,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Total</para>
+          <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 01fcdf355e1..be7b5c1bf72 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -110,6 +110,7 @@
   </stylesheet>
   <images/>
   <story>
+	  <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>  
   	<para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -169,32 +170,31 @@
      </tr>
     </blockTable>
     <section>
-	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
 	<section>
-      <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
+<!--      <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">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+	          <para style="terp_default_8">[[ repeatIn(o.lines,'l') ]]</para>	      		          
+            <para style="terp_default_9">[ [[l.product_id.code]] ] [[ l.product_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.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(l.price_unit) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal_incl)]] [[ company.currency_id.symbol ]]</para>
           </td>
-
         </tr>
       </blockTable>
        </section>
        </section>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <blockTable colWidths="228.0,81.0,87.0,70.0,70.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(o.amount_total+o.amount_tax) 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 35e605d0bff..c994e53d933 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="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 4779fad9e6b..815638d165b 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment By User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -61,6 +61,7 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" 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"/>
@@ -104,7 +105,13 @@
       <font color="white"> </font>
     </para>
     <para style="P2">Payment By User </para>
-    <para style="P2">
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="241.0,241.0" style="Table1">
@@ -195,7 +202,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 5a98c092a3a..e61287ea8c5 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -168,9 +168,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
     </section>
     <para style="Standard">
       <font color="white"> </font>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 9f1bc6eb14b..103bd9f3b61 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -169,9 +169,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
     </section>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index c4d046ad9f8..14152609c42 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Todays Sales By Current User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -67,6 +67,7 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" 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"/>
@@ -110,6 +111,12 @@
       <font color="white"> </font>
     </para>
     <para style="P3">Today's Sales By Current User</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -194,7 +201,7 @@
           <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>