From 38fdf845844c8e915314fefad00ede12c927974c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 29 Sep 2010 13:03:34 +0530
Subject: [PATCH 01/43] improved

bzr revid: apa@tinyerp.com-20100929073334-snelmyf56ldzlp1y
---
 .../report/account_aged_partner_balance.rml        | 12 ++++++------
 addons/account/report/account_partner_ledger.rml   |  8 ++++----
 .../report/account_partner_ledger_other.rml        |  8 ++++----
 addons/hr_expense/report/expense.rml               | 14 +++++++-------
 addons/stock/report/lot_overview.rml               |  4 ++--
 addons/stock/report/lot_overview_all.rml           |  4 ++--
 addons/stock/report/stock_inventory_move.rml       | 10 +++++-----
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 7f90ae0983b..ab57db23a27 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -168,22 +168,22 @@
           <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 7de67780056..ec0adbdc400 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -289,7 +289,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -359,7 +359,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
@@ -391,7 +391,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -472,7 +472,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 53cb0d46d83..a49616e4427 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -443,7 +443,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -506,7 +506,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
@@ -536,7 +536,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -611,7 +611,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index fa9e78c68cd..7d7be76ea8e 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -115,9 +115,9 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header_Centre">HR Expenses [[ o.name or '' ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
+    <para style="terp_header_Centre">HR Expenses</para>
+    <para style="terp_tblheader_General_Centre">
+      <font face="Helvetica" size="9.0">[[ o.name or '' ]]</font>
     </para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -166,10 +166,10 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Price([[ o.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Total Price</para>
         </td>
       </tr>
     </blockTable>
@@ -181,7 +181,7 @@
       <blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
         <tr>
           <td>
-            <para style="terp_default_9">[[ formatLang(line.date_value,date = True) ]]</para>
+            <para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
@@ -259,7 +259,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ setTag('para','xpre') ]] [[ o.note or '' ]] </para>
+    <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index f4332455cf9..4b6e02c5b81 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -108,7 +108,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Value([[ company.currency_id.name ]])</para>
+          <para style="terp_tblheader_Details_Right">Value</para>
         </td>
       </tr>
     </blockTable>
@@ -209,4 +209,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index a0e58e8ce7d..13ca75381a1 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -108,7 +108,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Value([[ company.currency_id.name ]])</para>
+          <para style="terp_tblheader_Details_Right">Value</para>
         </td>
       </tr>
     </blockTable>
@@ -209,4 +209,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index 7cb18a4e161..9531c534dec 100755
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -151,7 +151,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="114.0,93.0,194.0,138.0" style="Table4">
+    <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Location</para>
@@ -172,7 +172,7 @@
     </para>
     <section>
       <para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
-      <blockTable colWidths="114.0,93.0,194.0,138.0" style="Table8">
+      <blockTable colWidths="70.0,105.0,255.0,109.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ p.location_id.name ]]</para>
@@ -181,7 +181,7 @@
             <para style="terp_default_Centre_9">[[ p.prod_lot_id and p.prod_lot_id.name or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ p.product_id.name ]]</para>
+            <para style="terp_default_9">[ [[ p.product_id.code ]] ] [[ p.product_id.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(p.product_qty) ]] [[ p.product_uom.name ]]</para>
@@ -189,7 +189,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="402.0,137.0" style="Table7">
+    <blockTable colWidths="430.0,109.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
@@ -203,4 +203,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From 278b1454c0a166fedef40efaab390b7e43eb0213 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Wed, 29 Sep 2010 13:54:37 +0530
Subject: [PATCH 02/43] [IMP]:Change the name of button.

bzr revid: jni@tinyerp.com-20100929082437-knbp6re6k69ii44p
---
 addons/account/wizard/account_vat_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index c8a6645f744..72c6fa768e5 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -16,7 +16,7 @@
                 <field name="periods" nolabel="1" colspan="2"/>
                 <group col="2" colspan="4">
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
-                    <button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+                    <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
                 </group>
             </form>
             </field>

From 9f597d43cecb7a59783dd8a9a3d014f990496b97 Mon Sep 17 00:00:00 2001
From: "SAZ(OpenERP)" <>
Date: Wed, 29 Sep 2010 14:19:36 +0530
Subject: [PATCH 03/43] [IMP]:Changed the title of Tax Report

bzr revid: jni@tinyerp.com-20100929084936-87wfc7rr0xooep2l
---
 addons/account/report/tax_report.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 9ad4ff56112..2434437e803 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -104,7 +104,7 @@
 
   </stylesheet>
   <story>
-	<para style="P2">Taxes</para>
+	<para style="P2">Tax Statement</para>
 	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</para></td>

From 684200414f20bfce1753150317fc50a7377341bd Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 30 Sep 2010 11:05:50 +0530
Subject: [PATCH 04/43] [IMP]: Project Dashboard.

bzr revid: rch_open_erp-20100930053550-hf13ox5pvqrt4itt
---
 addons/project/board_project_view.xml         |  8 ++--
 addons/project/report/project_report_view.xml | 10 ++---
 .../board_project_issue_view.xml              | 44 +++++++++++++++++++
 .../board_project_scrum_view.xml              | 36 +++++++++++++++
 4 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index c3b4b0c8000..75a1dfa478d 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -86,16 +86,16 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4"  name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
-                            <action colspan="4"  name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
+                            <action colspan="4"  height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
+                            <action colspan="4"  height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
                    		</child1>
                         <child2>
                         <vpaned>
                         	<child1>
-                        		<action colspan="4"  name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
+                        		<action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
                         	</child1>
                         	<child2>
-                        		<action colspan="4"  name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned Vs Total Hours" />
+                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
                         	</child2>
                         </vpaned>
                         </child2>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 1ae5adc489a..7f315ce92c9 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -186,13 +186,13 @@
     </record>
 
 	<record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
+            <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
             <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
    </record>
    <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
+            <field eval="1" name="sequence"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
@@ -262,7 +262,7 @@
     </record>
 
     <record id="action_project_vs_planned_total_hours_graph" model="ir.actions.act_window">
-        <field name="name">My projects: Planned Vs Total hours</field>
+        <field name="name">My projects: Planned vs Total hours</field>
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -271,13 +271,13 @@
     </record>
 
 	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
+            <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
             <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
     </record>
     <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
+            <field eval="1" name="sequence"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 30b6815e450..9b5dfeb4d08 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -88,5 +88,49 @@
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
          	icon="terp-graph"
             action="open_board_project_issue"/>
+
+    <!-- For Project Dashboard -->
+        <record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
+            <field name="name">My Project Issues</field>
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
+        </record>
+         <record id="view_my_open_project_issue_graph" model="ir.ui.view">
+            <field name="name">my.open.project.issue.graph</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="vertical" string="My Open Project Issue" type="bar">
+                    <field name="creation_date"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_my_open_project_issue_tree" model="ir.actions.act_window">
+            <field name="name">My Open Project issues</field>
+            <field name="res_model">project.issue.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+           <field name="view_id" ref="view_my_open_project_issue_graph"/>
+        </record>
+       <record id="board_my_project_issue_form" model="ir.ui.view">
+            <field name="name">board.my.project.issue.form.inherit</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.board_project_form"/>
+            <field name="arch" type="xml">
+            	<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">
+						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
+            	</xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 8b22233558b..76094000888 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -60,5 +60,41 @@
             name="Scrum Dashboard" parent="project.next_id_86"
             icon="terp-graph"
             action="open_board_project_scrum"/>
+
+    <!-- For Project Dashboard -->
+       <record id="view_scrum_sprint_project_dashboard_tree" model="ir.ui.view">
+            <field name="name">project.scrum.sprint.project.dashboard.tree</field>
+            <field name="model">project.scrum.sprint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            	 <tree string="Scrum Sprint">
+                    <field name="name"/>
+                    <field name="progress" widget="progressbar"/>
+                    <field name="effective_hours"  widget="float_time"/>
+                    <field name="expected_hours"  widget="float_time"/>
+                	<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
+                                	string="Burndown Chart" type="action" icon="gtk-print"/>
+             	</tree>
+            </field>
+        </record>
+        <record id="action_view_my_scrum_sprint_tree" model="ir.actions.act_window">
+            <field name="name">My Sprint</field>
+            <field name="res_model">project.scrum.sprint</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|',('product_owner_id','=',uid),('scrum_master_id','=',uid)]</field>
+           <field name="view_id" ref="view_scrum_sprint_project_dashboard_tree"/>
+        </record>
+       <record id="board_my_scrum_sprint_form" model="ir.ui.view">
+            <field name="name">board.my.scrum.sprint.form.inherit</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.board_project_form"/>
+            <field name="arch" type="xml">
+            	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
+						<action colspan="4"  height="100" name="%(action_view_my_scrum_sprint_tree)d" string="My Sprint" />
+            	</xpath>
+            </field>
+        </record>
     </data>
 </openerp>

From 310b522ef9f60866a7830d9c2166451ddd37cadf Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Thu, 30 Sep 2010 11:35:51 +0530
Subject: [PATCH 05/43] [IMP]: Sale Manager Dashboard.

bzr revid: rch_open_erp-20100930060551-88qeytiivw3xjk61
---
 addons/sale/board_sale_view.xml         | 12 ++++++------
 addons/sale/report/sale_report_view.xml | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 6da7f9e312b..79bdf5d76b6 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -10,16 +10,16 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager board">
+                <form string="Sales Manager Dashboard">
                     <hpaned position="100">
                         <child1>
-                            <action  name="%(sale.action_quotation_for_sale)d" string="Top Quotations"/>
-                            <action width="510" name="%(sale.action_view_sales_by_month)d" string="Total Sales By Month"/>
+                            <action  name="%(sale.action_quotation_for_sale)d" string="Quotations"/>
+                            <action width="510" name="%(sale.action_view_sales_by_month)d" string="Sales By Month"/>
                         </child1>
                         <child2>
-                            <action  name="%(sale.action_sales_product_total_price)d" string="Sold products and Total Price"/>
-                            <action  name="%(sale.action_sales_by_partner)d" string="Sales By Partner"/>
                             <action  name="%(sale.action_sales_by_salesman)d" string="Sales By Salesman"/>
+                            <action  name="%(sale.action_sales_by_partner)d" string="Sales By Customer"/>
+                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product Category"/>
                         </child2>
                     </hpaned>
                 </form>
@@ -27,7 +27,7 @@
         </record>
 
         <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Dashboard</field>
+            <field name="name">Sales Manager Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index d796edd2d2c..ccdeabb1e17 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -226,7 +226,7 @@
         <field name="model">sale.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Sales by Products">
+            <tree string="Sales by Product Category">
                 <field name="product_id"/>
                 <field name="price_total"/>
             </tree>
@@ -238,15 +238,15 @@
          <field name="model">sale.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Sales by Products" type="bar">
-                 <field name="product_id" />
+             <graph string="Sales by Product Category" type="bar">
+                 <field name="categ_id" />
                  <field name="price_total" operator="+"/>
              </graph>
          </field>
     </record>
 
    <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Products</field>
+        <field name="name">Sales by Product Category</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -293,7 +293,7 @@
             <field name="model">sale.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Top Quotations">
+                <tree string="Quotations">
                     <field name="date_order"/>
                     <field name="name"/>
                     <field name="partner_id"/>
@@ -305,7 +305,7 @@
         </record>
 
     <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">Top Quotations</field>
+        <field name="name">Quotations</field>
         <field name="res_model">sale.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>

From ac94e1a34d52e7b872a9e17dcc6e956ff425489b Mon Sep 17 00:00:00 2001
From: SAz <>
Date: Thu, 30 Sep 2010 12:28:27 +0530
Subject: [PATCH 06/43] [IMP]:improved

bzr revid: apa@tinyerp.com-20100930065827-l4a3ak55gd1wu6nf
---
 addons/account/test/account_report.yml                |  1 +
 addons/account/test/account_validate_account_move.yml | 10 ++++++++++
 addons/stock/test/stock_report.yml                    |  4 ++--
 addons/stock/test/stock_test.yml                      |  6 +++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 7e4295da45b..98d3aa591b3 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -30,6 +30,7 @@
 -
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
+    sign : 1.00
 -
  Print Tax Code entries report
 - 
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 37d64ead528..9a733d8ad5f 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -1,3 +1,12 @@
+-
+  Demo data for Account tax code
+-
+  !record {model: account.tax.code, id: account_tax_code_0}:
+    name : Tax Code Test
+    sign : 1.00
+-
+
+
 -
   In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
 
@@ -20,6 +29,7 @@
       - journal_id: account.bank_journal
         period_id: account.period_6
         ref: '2010010'
+        tax_code_id: account_tax_code_0      
         tax_amount: 0.0
         account_id: account.a_recv
         amount_currency: 0.0
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index 491fd7fa9d7..3d31977f123 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -35,7 +35,7 @@
 - 
   !python {model: stock.picking}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-picking_list'+format), 'wb+').write(data)
 -
@@ -45,4 +45,4 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product.product_product_pc1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-product_stock_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'stock-product_stock_report.'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 442cc8735b9..841f2750ca3 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -288,7 +288,7 @@
 - 
   !record {model: stock.picking, id: stock_picking_0}:
     name: test_picking
-    address_id: res_partner_address_0
+    address_id: base.res_partner_address_4
     company_id: base.main_company
     date: '2010-05-11 15:18:52'
     invoice_state: none
@@ -298,7 +298,7 @@
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers
-        product_id: stock.product_product_hpcdwriters0
+        product_id: product.product_product_pc1
         product_qty: 3.0
         product_uom: product.product_uom_unit
         date: '2010-05-11 15:18:57'
@@ -343,4 +343,4 @@
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
       } 
-   self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas)
\ No newline at end of file
+   self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas)

From 07d236876aee7ad60d82bbe4cb6f098ac37357cc Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Thu, 30 Sep 2010 13:49:08 +0530
Subject: [PATCH 07/43] [IMP]: Sales Dashboard.

bzr revid: rch_open_erp-20100930081908-62fhwt7et55shj85
---
 addons/crm/board_crm_view.xml           | 16 +++++++--------
 addons/sale_crm/board_sale_crm_view.xml | 26 ++++++++++++-------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 8aa1d96d403..c299741280a 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -17,7 +17,7 @@
                     </graph>
                </field>
           </record>
-          
+
         <record id="view_report_crm_oppor_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -29,7 +29,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="crm_case_my_open_oppor">
             <field name="name">Opportunities</field>
             <field name="model">crm.lead</field>
@@ -71,7 +71,7 @@
                <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
           </record>
-        
+
         <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
           <field name="sequence" eval="1"/>
           <field name="view_mode">tree</field>
@@ -111,11 +111,11 @@
           </record>
 
           <record model="ir.ui.view" id="board_crm_form">
-               <field name="name">CRM - Dashboard Form</field>
+               <field name="name">Sales Dashboard Form</field>
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
-                    <form string="Connecting Dashboard">
+                    <form string="Sales Dashboard">
                          <hpaned>
                               <child1>
                                    <action
@@ -145,7 +145,7 @@
             </field>
         </record>
         <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">CRM Dashboard</field>
+            <field name="name">Sales Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -154,10 +154,10 @@
         </record>
          <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
-            name="Connecting Dashboard" parent="board.menu_dasboard"
+            name="Sales Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
             sequence="1"
             id="menu_board_crm" icon="terp-graph"/>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
     </data>
-</openerp>
+</openerp>
\ 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 83fa1ea583a..7d56779a613 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -16,7 +16,7 @@
 	        <field name="model">account.invoice.report</field>
 	        <field name="type">tree</field>
 	        <field name="arch" type="xml">
-	            <tree string="Turnover By Months">
+	            <tree string="Monthly Turnover">
 	                <field name="month"/>
 	                <field name="price_total"/>
 	            </tree>
@@ -28,7 +28,7 @@
 	        <field name="model">account.invoice.report</field>
 	        <field name="type">graph</field>
 	        <field name="arch" type="xml">
-	            <graph string="Turnover By Months" type="bar">
+	            <graph string="Monthly Turnover" type="bar">
 	                <field name="month"/>
 	                <field name="price_total" operator="+"/>
 	            </graph>
@@ -51,17 +51,17 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child1/action[@name='%(crm.act_my_meetings)d']" position="after">
+	            <xpath expr="/form/hpaned/child1/action[@name='%(crm.act_my_oppor)d']" position="after">
 		            <action
 		                string="My Quotations"
 		                name="%(action_quotation_for_sale_crm)d"
 		                colspan="4"
 		                height="150"
 		                width="510"/>
-	            </xpath>        
+	            </xpath>
             </field>
         </record>
-        
+
          <record model="ir.ui.view" id="board_crm_form_inherit_child2">
             <field name="name">board.crm.form.inherit.child2</field>
             <field name="model">board.board</field>
@@ -70,36 +70,36 @@
             <field name="arch" type="xml">
 	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="after">
 		            <action
-		                string="Turnover By Months"
+		                string="Monthly Turnover"
 		                name="%(action_turnover_by_month)d"
 		                colspan="4"/>
-	            </xpath>  
+	            </xpath>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
             <field name="name">board.crm.form.inherit.replace1</field>
             <field name="model">board.board</field>
             <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">          
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="attributes">
 	                <attribute name="string">My Sales Pipeline</attribute>
 	            </xpath>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
             <field name="name">board.crm.form.inherit.replace2</field>
             <field name="model">board.board</field>
             <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_my_oppor_stage)d']" position="attributes">          
-	                <attribute name="string">Revenue by stage</attribute>
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_my_oppor_stage)d']" position="attributes">
+	                <attribute name="string">Opportunities by Stage</attribute>
 	            </xpath>
             </field>
         </record>
-        
+
     </data>
 </openerp>
\ No newline at end of file

From a8afde1945a730a275ddb45f7683ebdddb6fc358 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 30 Sep 2010 13:54:01 +0530
Subject: [PATCH 08/43] [IMP]: Project dashboard - chang label.

bzr revid: rch_open_erp-20100930082401-tixi8q0c3eqw892m
---
 addons/project/board_project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 75a1dfa478d..275a969cbe9 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -95,7 +95,7 @@
                         		<action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
                         	</child1>
                         	<child2>
-                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
+                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
                         	</child2>
                         </vpaned>
                         </child2>

From 0cdeb89a5ed15b9f917ca03023afa96eba66622b Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 1 Oct 2010 13:06:35 +0530
Subject: [PATCH 09/43] [IMP]: Warehouse Dashboard.

bzr revid: rch_open_erp-20101001073635-ezt9nb1tkzwxpz1a
---
 addons/project/report/project_report_view.xml |  4 ++--
 addons/stock/board_warehouse_view.xml         |  4 ++--
 addons/stock/stock_view.xml                   | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 7f315ce92c9..b7caea037a0 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -240,7 +240,7 @@
         <field name="model">project.vs.hours</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Project Vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+            <tree string="Project vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
                 <field name="project"/>
                 <field name="planned_hours"/>
                 <field name="total_hours"/>
@@ -253,7 +253,7 @@
          <field name="model">project.vs.hours</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Project Vs Planned and Total Hours" type="bar">
+             <graph string="Project vs Planned and Total Hours" type="bar">
                  <field name="project"/>
                  <field name="planned_hours" operator="+"/>
                  <field name="total_hours" operator="+"/>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 5704df7685b..8467688d994 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -27,8 +27,8 @@
                         </child1>
 
                         <child2>
-					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
-					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
+					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive vs planned" width="510"/>
+					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products vs Planned" width="510"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a7ef71c9acd..c4d10369ec4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -562,14 +562,14 @@
                </field>
         </record>
 
-      <act_window name="Unreceived Products"            
+      <act_window name="Unreceived Products"
             res_model="stock.picking.move.wizard"
             src_model="stock.picking"
             view_mode="form"
-            target="new"        
+            target="new"
             key2="client_action_multi"
-            id="act_stock_picking_move_wizard"/>        
-                
+            id="act_stock_picking_move_wizard"/>
+
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
             <field name="model">stock.picking</field>
@@ -633,7 +633,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" 
+                                        states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="picking_id"/>
@@ -819,7 +819,7 @@
                                    <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" 
+                                        states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
@@ -983,7 +983,7 @@
         </record>
         <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="7"/>
 
-        <!-- 
+        <!--
         #
         # Sending Products
         #
@@ -1123,7 +1123,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1250,7 +1250,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" 
+                                        states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
@@ -1334,7 +1334,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1919,7 +1919,7 @@
         </record>
 
         <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-            <field name="name">Number of Products to receive Vs planned</field>
+            <field name="name">Number of Products to receive vs planned</field>
             <field name="res_model">report.products.to.received.planned</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1955,7 +1955,7 @@
         </record>
 
         <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-            <field name="name">Delivery Products Vs Planned</field>
+            <field name="name">Delivery Products vs Planned</field>
             <field name="res_model">report.delivery.products.planned</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From 45a9b6b703e44455099ef26f4b3e375833157909 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Fri, 1 Oct 2010 16:22:09 +0530
Subject: [PATCH 10/43] [IMP:] Put the Product Code alongwith the name in
 stock_lot_location

bzr revid: jni@tinyerp.com-20101001105209-th2h65t59y2l9q8d
---
 addons/stock/report/lot_location.rml | 32 ++++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
index ecbe9fec9fa..76da9ec0480 100644
--- a/addons/stock/report/lot_location.rml
+++ b/addons/stock/report/lot_location.rml
@@ -52,16 +52,16 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -81,9 +81,9 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Times-Roman" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <section>
       <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
@@ -142,7 +142,7 @@
                 </para>
               </td>
               <td>
-                <para style="terp_default_9">[[ p['prod_name'] ]]</para>
+                <para style="terp_default_9">[ [[p['code'] ]] ] [[ p['prod_name'] ]]</para>
               </td>
               <td>
                 <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
@@ -171,7 +171,9 @@
               <para style="terp_tblheader_Details_Right">[[ ob['total'] ]]</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details">Units</para>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
             </td>
           </tr>
         </blockTable>
@@ -197,7 +199,9 @@
           <para style="terp_tblheader_Details_Right">[[ qty_total() ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Units</para>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>

From 77bc7579d3c60b9cd212a4ccd579380408866abe Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 1 Oct 2010 16:24:32 +0530
Subject: [PATCH 11/43] [IMP]: Accounting Dashboard.

bzr revid: rch_open_erp-20101001105432-ltkaq52n6clhq88b
---
 addons/account/account_view.xml               | 11 ++++++++++
 addons/account/board_account_view.xml         | 21 +++++++++++++++++--
 .../report/account_entries_report_view.xml    | 13 ++++++++++++
 .../board_account_report_view.xml             |  8 +++----
 .../board_hr_timesheet_invoice.xml            |  8 +++----
 5 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4aaac87a25b..af8d219d8e5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -236,6 +236,17 @@
                 </tree>
             </field>
         </record>
+        <record id="view_treasory_graph" model="ir.ui.view">
+         	<field name="name">account.treasory.graph</field>
+         	<field name="model">account.account</field>
+         	<field name="type">tree</field>
+         	<field name="arch" type="xml">
+             	<graph string="Treasory Analysis" type="bar">
+                	<field name="name"/>
+                	<field name="balance" operator="+"/>
+             	</graph>
+         </field>
+    	</record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index e8aecb2033c..581c3576894 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -20,7 +20,22 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
-
+    	<record id="action_company_analysis_tree" model="ir.actions.act_window">
+        	<field name="name">Company Analysis</field>
+        	<field name="res_model">account.entries.report</field>
+        	<field name="view_type">form</field>
+        	<field name="view_mode">tree,graph</field>
+        	<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="account.view_company_analysis_tree"/>
+    	</record>
+    	<record id="action_treasory_graph" model="ir.actions.act_window">
+        	<field name="name">Treasory Analysis</field>
+        	<field name="res_model">account.account</field>
+        	<field name="view_type">form</field>
+        	<field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','liquidity')]</field>
+            <field name="view_id" ref="account.view_treasory_graph"/>
+    	</record>
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -30,10 +45,12 @@
                     <hpaned>
                         <child1>
                             <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
                             <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
-                            <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
+                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
+                            <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 081328d89fb..45131718db9 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -48,6 +48,19 @@
              </graph>
          </field>
     </record>
+    <record id="view_company_analysis_tree" model="ir.ui.view">
+         <field name="name">account.company.analysis.tree</field>
+         <field name="model">account.entries.report</field>
+         <field name="type">tree</field>
+         <field name="arch" type="xml">
+             <tree string="Company Analysis" >
+                <field name="user_type"/>
+                <field name="debit" />
+                <field name="credit" />
+                <field name="balance" />
+             </tree>
+         </field>
+    </record>
     <record id="view_account_entries_report_search" model="ir.ui.view">
         <field name="name">account.entries.report.search</field>
         <field name="model">account.entries.report</field>
diff --git a/addons/account_report/board_account_report_view.xml b/addons/account_report/board_account_report_view.xml
index 0467db65cf1..633f4274f44 100644
--- a/addons/account_report/board_account_report_view.xml
+++ b/addons/account_report/board_account_report_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="board_account_report_form" model="ir.ui.view">
+        <!--  <record id="board_account_report_form" model="ir.ui.view">
             <field name="name">board.account.report.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="account.board_account_form"/>              
+            <field name="inherit_id" ref="account.board_account_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before"> 
+                <xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before">
                     <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
                 </xpath>
             </field>
-        </record>
+        </record>-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index ff61617661c..792ea34ae53 100644
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -11,7 +11,7 @@
             <field name="view_mode">graph,tree</field>
         </record>
 
-        <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
+       <!--  <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
              <field name="type">form</field>
@@ -22,10 +22,10 @@
                     <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
                 </xpath>
             </field>
-        </record>
+        </record> -->
 
         <!-- Need to merge in above view -->
-        <record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
+        <!--<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
@@ -35,7 +35,7 @@
                     <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
                 </xpath>
             </field>
-        </record>
+        </record> -->
 
         <record id="view_timesheet_uninvoiced_line_tree" model="ir.ui.view">
             <field name="name">timesheet.uninvoiced.line.tree</field>

From 898705b2a36409798d5ca640ff8150d1d54129cd Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 1 Oct 2010 17:14:52 +0530
Subject: [PATCH 12/43] [IMP]: change string.

bzr revid: rch_open_erp-20101001114452-vy2wpa7e3c7cbgzn
---
 addons/account/account_view.xml         | 2 +-
 addons/account/board_account_view.xml   | 2 +-
 addons/sale/board_sale_view.xml         | 2 +-
 addons/sale/report/sale_report_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index af8d219d8e5..a643bd8ca89 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -239,7 +239,7 @@
         <record id="view_treasory_graph" model="ir.ui.view">
          	<field name="name">account.treasory.graph</field>
          	<field name="model">account.account</field>
-         	<field name="type">tree</field>
+         	<field name="type">graph</field>
          	<field name="arch" type="xml">
              	<graph string="Treasory Analysis" type="bar">
                 	<field name="name"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 581c3576894..cc6c6187a83 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -29,7 +29,7 @@
             <field name="view_id" ref="account.view_company_analysis_tree"/>
     	</record>
     	<record id="action_treasory_graph" model="ir.actions.act_window">
-        	<field name="name">Treasory Analysis</field>
+        	<field name="name">Treasory</field>
         	<field name="res_model">account.account</field>
         	<field name="view_type">form</field>
         	<field name="view_mode">graph,tree</field>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 79bdf5d76b6..a7c51d3acde 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -19,7 +19,7 @@
                         <child2>
                             <action  name="%(sale.action_sales_by_salesman)d" string="Sales By Salesman"/>
                             <action  name="%(sale.action_sales_by_partner)d" string="Sales By Customer"/>
-                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product Category"/>
+                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index ccdeabb1e17..183a034f1d2 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -246,7 +246,7 @@
     </record>
 
    <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Product Category</field>
+        <field name="name">Sales by Product's Category</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>

From ad114aa4bea3516c026f26693ef4f517ff7159eb Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Fri, 1 Oct 2010 17:51:35 +0530
Subject: [PATCH 13/43] [IMP]: Purchase Dashboard.

bzr revid: rch_open_erp-20101001122135-gt5spyszlo18tttp
---
 addons/account/board_account_view.xml     |  2 +-
 addons/purchase/board_purchase_view.xml   | 99 ++++++++++++++++++++++-
 addons/purchase/report/purchase_report.py |  3 +
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index cc6c6187a83..9823960b0e2 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -48,8 +48,8 @@
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index f5b131a69f5..6bbbe0e73e7 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -8,7 +8,7 @@
             parent="base.next_id_73" sequence="0"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
-            <field name="name">Draft Purchases</field>
+            <field name="name">Request for Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -17,7 +17,7 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Quotation Request</field>
+            <field name="name">Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -26,6 +26,92 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
 
+		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
+            <field name="name">purchase.order.monthly.categ.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Monthly Purchase by Category">
+                    <field name="month"/>
+                    <field name="price_total"/>
+                    <field name="category_id"/>
+                </tree>
+            </field>
+        </record>
+    	<record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
+            <field name="name">purchase.order.monthly.categ.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Monthly Purchase by Category" type="bar">
+                    <field name="month"/>
+                    <field name="price_total" operator="+"/>
+                    <field name="category_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+	    <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
+	        <field name="name">Monthly Purchase by Category</field>
+	        <field name="res_model">purchase.report</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
+	    </record>
+	    <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
+            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+	    </record>
+	    <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
+	            <field eval="1" name="sequence"/>
+	            <field name="view_mode">graph</field>
+	            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
+	            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+	    </record>
+
+        <record model="ir.ui.view" id="view_negotiation_by_supplier_tree">
+            <field name="name">negotiation.by.supplier.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Negotiation by Supplier">
+                    <field name="partner_id"/>
+                    <field name="negociation"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_negotiation_by_supplier_graph">
+            <field name="name">negotiation.by.supplier.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Negotiation by Supplier" type="bar">
+                    <field name="partner_id"/>
+                    <field name="negociation"/>
+                </graph>
+            </field>
+        </record>
+		<record id="action_negotiation_by_supplier" model="ir.actions.act_window">
+	        <field name="name">Negotiation by Supplier</field>
+	        <field name="res_model">purchase.report</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
+	    </record>
+	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_negotiation_by_supplier_tree"/>
+            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
+	    </record>
+	    <record id="open_view_negotiation_by_supplier_graph" model="ir.actions.act_window.view">
+	            <field eval="1" name="sequence"/>
+	            <field name="view_mode">graph</field>
+	            <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
+	            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
+	    </record>
+
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
@@ -34,13 +120,22 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
+                        <!--
                             <action colspan="4" height="220" name="%(purchase.action_current_purchases)d" string="Current purchases"  width="510"/>
                             <action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"  width="510"/>
+                        -->
+                        	<action colspan="4" height="220" name="%(purchase_draft)d" string="Request for Quotations"  width="510"/>
+                        	<action colspan="4" height="220" name="%(purchase_waiting)d" string="Waiting Approval"  width="510"/>
                         </child1>
                         <child2>
+                        	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />
+                            <action colspan="4" height="220" name="%(action_negotiation_by_supplier)d" string="Negotiation by Supplier"  />
+                        <!--
                             <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
                             <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />
                             <action colspan="4" height="220" name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"  />
+                        -->
+
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 612ea134b4e..f30d65d8f28 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -65,6 +65,7 @@ class purchase_report(osv.osv):
         'nbr': fields.integer('# of Lines', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'category_id': fields.many2one('product.category', 'Category', readonly=True)
 
     }
     _order = 'name desc,price_total desc'
@@ -90,6 +91,7 @@ class purchase_report(osv.osv):
                     s.create_uid as user_id,
                     s.company_id as company_id,
                     l.product_id,
+                    t.categ_id as category_id,
                     l.product_uom as product_uom,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
@@ -123,6 +125,7 @@ class purchase_report(osv.osv):
                     s.validator,
                     s.dest_address_id,
                     l.product_id,
+                    t.categ_id,
                     s.date_order,
                     to_char(s.date_order, 'YYYY'),
                     to_char(s.date_order, 'MM'),

From 810351b16ad5cbb482b01d1c8f1f3eb3e38add7c Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Mon, 4 Oct 2010 14:19:09 +0530
Subject: [PATCH 14/43] [IMP]:Changes in Account and hr_holidays reports

bzr revid: jni@tinyerp.com-20101004084909-anda3v1tymjkh5v1
---
 addons/account/account_unit_test.xml            |  9 ++++++++-
 addons/account/test/account_report.yml          |  5 +++--
 .../test/account_budget_report.yml              |  6 +++---
 .../1.5/post-01-convert-limits-into-requests.py | 17 +++++++++--------
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 97fba380214..e4178517361 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -14,6 +14,13 @@
             <field name="name">Test invoice 1</field>
             <field name="address_contact_id" ref="base.res_partner_address_tang"/>
         </record>
+        <record id="test_tax_line" model="account.invoice.tax">
+            <field name="name">Test Tax</field>
+            <field name="base">5.00</field>
+            <field name="amount">100.00</field>
+            <field name="account_id" ref="account.ova"/>
+            <field name="invoice_id" ref="test_invoice_1"/>            
+        </record>            
         <record id="test_invoice_1_line_1" model="account.invoice.line">
             <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
             <field name="invoice_id" ref="test_invoice_1"/>
@@ -27,7 +34,7 @@
             <field name="price_unit">800</field>
             <field name="quantity">2</field>
             <field name="account_id" ref="account.a_sale"/>
-        </record>
+        </record>        
         
         <assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
             <test expr="currency_id.code">EUR</test>
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 98d3aa591b3..79fa915d8d6 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -30,7 +30,7 @@
 -
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
-    sign : 1.00
+    sign : 10.00
 -
  Print Tax Code entries report
 - 
@@ -40,13 +40,14 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
 
+
 -
   Print Vat Declaration Report
 -
    !python {model: account.tax.code}: |
     import netsvc, tools, os
     data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
-    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_tax_code_0")], data_dict, {})
+    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_move_0")], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 
diff --git a/addons/account_budget/test/account_budget_report.yml b/addons/account_budget/test/account_budget_report.yml
index 2115341c1a1..d0766e31196 100644
--- a/addons/account_budget/test/account_budget_report.yml
+++ b/addons/account_budget/test/account_budget_report.yml
@@ -3,7 +3,7 @@
 -
   !python {model: account.analytic.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
+    data_dict = {'model': 'account.analytic.account', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
     (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account_budget-analytic_budget_report.'+format), 'wb+').write(data)
@@ -12,7 +12,7 @@
 -
   !python {model: account.budget.post}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.budget.post', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
+    data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
     (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account_budget.account_budget_post_sales0')], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account_budget-budget_report.'+format), 'wb+').write(data)
@@ -24,4 +24,4 @@
     data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'report':'analytic-full','id':ref('account_budget.crossovered_budget_budgetoptimistic0'),'context':{}}}
     (data, format) = netsvc.LocalService('report.crossovered.budget.report').create(cr, uid, [ref('account_budget.crossovered_budget_budgetoptimistic0')], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
diff --git a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
index 5ee6e894cf5..a59dbbf85eb 100644
--- a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
+++ b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
@@ -21,14 +21,15 @@
 __name__ = "Convert the Holidays Per User limits into positive leave request"
 
 def migrate(cr, version):
-    cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
-                    FROM hr_holidays_per_user;""")
-    for record in cr.fetchall():
-        cr.execute("""INSERT INTO hr_holidays 
-            (employee_id, type, allocation_type, name, holiday_status_id, 
-            state, number_of_days, notes, manager_id) VALUES
-            (%s, 'add', 'company', 'imported holiday_per_user', %s,
-            'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+#    cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
+#                    FROM hr_holidays_per_user;""")
+#    for record in cr.fetchall():
+#        cr.execute("""INSERT INTO hr_holidays 
+#            (employee_id, type, allocation_type, name, holiday_status_id, 
+#            state, number_of_days, notes, manager_id) VALUES
+#            (%s, 'add', 'company', 'imported holiday_per_user', %s,
+#            'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+    return {}
         
 
 

From c8afabf6fdc579974e8f7d39b8aa28db7f358ccb Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 5 Oct 2010 14:06:26 +0530
Subject: [PATCH 15/43] improved

bzr revid: apa@tinyerp.com-20101005083626-8km5a3kb8hexmi8d
---
 addons/hr_attendance/report/hr_custom_default.xsl | 4 ----
 addons/hr_holidays/report/hr_custom_default.xsl   | 4 ----
 addons/hr_timesheet/report/custom_default.xsl     | 4 ----
 addons/mrp/report/custom_default.xsl              | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/addons/hr_attendance/report/hr_custom_default.xsl b/addons/hr_attendance/report/hr_custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_attendance/report/hr_custom_default.xsl
+++ b/addons/hr_attendance/report/hr_custom_default.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
@@ -23,8 +21,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
  </xsl:template>
diff --git a/addons/hr_holidays/report/hr_custom_default.xsl b/addons/hr_holidays/report/hr_custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_holidays/report/hr_custom_default.xsl
+++ b/addons/hr_holidays/report/hr_custom_default.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
@@ -23,8 +21,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
  </xsl:template>
diff --git a/addons/hr_timesheet/report/custom_default.xsl b/addons/hr_timesheet/report/custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_timesheet/report/custom_default.xsl
+++ b/addons/hr_timesheet/report/custom_default.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
@@ -23,8 +21,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
  </xsl:template>
diff --git a/addons/mrp/report/custom_default.xsl b/addons/mrp/report/custom_default.xsl
index 103128eb9f4..aa5eb22d8e0 100644
--- a/addons/mrp/report/custom_default.xsl
+++ b/addons/mrp/report/custom_default.xsl
@@ -19,8 +19,6 @@
         <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
 
@@ -35,8 +33,6 @@
         <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
  </xsl:template>

From 6b4820d9baa99634ea6e611afaa3e20db4386a70 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Tue, 5 Oct 2010 15:02:44 +0530
Subject: [PATCH 16/43] [IMP]:Partner_Balance report

bzr revid: jni@tinyerp.com-20101005093244-59nlh8yp253s9ii2
---
 addons/account/test/account_report.yml | 63 +++++++++++++-------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 79fa915d8d6..4bc3b807d28 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -1,6 +1,6 @@
 -
   In order to test the PDF reports defined on an invoice, we will print an Invoice Report
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
@@ -9,7 +9,7 @@
 
 -
   In order to test the PDF reports defined on a partner, we will print the Overdue Report
-- 
+-
   !python {model: res.partner}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
@@ -18,7 +18,7 @@
 
 -
   In order to test the PDF reports defined on Account Move, we will print the Voucher Report
-- 
+-
   !python {model: account.move}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
@@ -33,7 +33,7 @@
     sign : 10.00
 -
  Print Tax Code entries report
-- 
+-
   !python {model: account.tax.code}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {})
@@ -53,7 +53,7 @@
 
 -
   In order to test the PDF reports defined on an invoice, we will print an invoice
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
@@ -86,9 +86,9 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': period_list,'journal_ids':journal_ids, 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : query_line, 'result_selection': 'customer','direction_selection': 'past','fiscalyear_id':fy_id}}
     data_dict['form'].update(res)
     (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
@@ -124,10 +124,10 @@
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
-    
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':[ref('account.bal'),ref('account.gpf')]})
-    
+
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal-menu.'+format), 'wb+').write(data)
@@ -147,16 +147,16 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
-       
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':journal_period_ids})
-    
+
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal-menu.'+format), 'wb+').write(data)
@@ -169,13 +169,13 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
     (data, format) = netsvc.LocalService('report.account.general.journal').create(cr, uid, journal_period_ids, data_dict, {})
@@ -191,15 +191,15 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query': query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
@@ -219,15 +219,15 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
@@ -254,17 +254,17 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal.'+format), 'wb+').write(data)
-       
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':journal_period_ids})
-    
+
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal-menu.'+format), 'wb+').write(data)
@@ -277,16 +277,17 @@
     fy_id = ref('account.data_fiscalyear')
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-
+    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
-    (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
+
+    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'active_ids':journal_period_ids,'display_partner': 'all','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
+    (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
 
@@ -304,9 +305,9 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
@@ -326,7 +327,7 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger_other').create(cr, uid, [], data_dict, {})

From f5d26f67a5e6ddbdce7e0d7113fad38e21de122d Mon Sep 17 00:00:00 2001
From: "SAZ(OpenERP)" <>
Date: Tue, 5 Oct 2010 15:33:00 +0530
Subject: [PATCH 17/43] [IMP]: Balance_Sheet and Profit and Loss report

bzr revid: jni@tinyerp.com-20101005100300-14sob7ga4csootz4
---
 addons/account/report/account_balance_sheet_horizontal.rml | 2 +-
 addons/account/report/account_profit_horizontal.rml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index a1f7b25d379..5edd2ffe021 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -233,7 +233,7 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
         </td>
      </tr>
      </blockTable>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index d55b2e93a43..203c6c9f02c 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -240,7 +240,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
           </td>
         </tr>
       </blockTable>

From 073af37be1ee3467931d050fe00ab5c2f93ac2d9 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Tue, 5 Oct 2010 19:34:22 +0530
Subject: [PATCH 18/43] [IMP] Improve the reports of point of sale module

bzr revid: azaz.201186@gmail.com-20101005140422-b9p1og6n8sqlpfbl
---
 .../report/account_statement.rml              |  10 +-
 addons/point_of_sale/report/pos_details.rml   |  79 ++++----
 .../report/pos_details_summary.rml            |  39 ++--
 .../report/pos_payment_report.rml             |   6 +-
 .../report/pos_payment_report_date.rml        |  12 +-
 .../report/pos_payment_report_user.rml        | 141 +++++++--------
 .../report/pos_receipt_with_remboursment.rml  |   2 +-
 .../pos_receipt_without_remboursment.rml      |  14 +-
 .../point_of_sale/report/pos_sales_user.rml   | 137 +++++++-------
 .../report/pos_sales_user_today.rml           | 130 ++++++--------
 .../pos_sales_user_today_current_user.rml     | 169 +++++++++---------
 .../report/pos_users_product.rml              |  16 +-
 12 files changed, 378 insertions(+), 377 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index e4c3b99b6ee..a7f2a397d8b 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Statement" 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>
@@ -238,7 +238,7 @@
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Amount </para>
         </td>
       </tr>
     </blockTable>
@@ -253,7 +253,7 @@
           <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -268,7 +268,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">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -282,4 +282,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.rml b/addons/point_of_sale/report/pos_details.rml
index f3bebade402..c86120779f6 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>
@@ -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="Table4">
       <blockAlignment value="LEFT"/>
@@ -102,19 +108,26 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <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="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -162,7 +175,7 @@
     <para style="P1">
       <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>
@@ -171,11 +184,14 @@
           <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">[[ company.name ]]</para>
@@ -184,7 +200,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]] </para>
+          <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(getperiod2(data['form']),date = True) ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -203,16 +222,16 @@
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Price </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Disc </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Invoiced ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Centre">Invoiced </para>
         </td>
       </tr>
     </blockTable>
@@ -306,13 +325,13 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table7">
+    <blockTable colWidths="241.0,240.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getsalestotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -320,7 +339,7 @@
           <para style="terp_default_Bold_9">Qty of product</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para>
         </td>
       </tr>
       <tr>
@@ -328,7 +347,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getsuminvoice2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -336,7 +355,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getsumdisc(objects)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(objects)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -344,7 +363,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getpaidtotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -352,7 +371,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(gettotalofthaday(data['form'])) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form'])) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -360,4 +379,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.rml b/addons/point_of_sale/report/pos_details_summary.rml
index aa559eb9961..dea0789b7be 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="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>
@@ -80,18 +80,24 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
+      <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>
@@ -100,6 +106,8 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="19" alignment="LEFT"/>
     <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="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"/>
@@ -138,8 +146,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Details of Sales</para>
-    <para style="terp_header">
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">Details of Sales</para>
+    <para style="P5">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="161.0,161.0,161.0" style="Table1">
@@ -247,7 +258,7 @@
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%d' % getsalestotal(objects) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -255,7 +266,7 @@
           <para style="terp_default_Bold_9">Qty of product</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%d' % getqtytotal(objects) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getqtytotal(objects) ]]</para>
         </td>
       </tr>
       <tr>
@@ -263,7 +274,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % getsuminvoice(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -271,7 +282,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % getsumdisc(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -279,7 +290,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % getpaidtotal(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -287,7 +298,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % gettotalofthaday(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -295,4 +306,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index e62b4bd1290..01fcdf355e1 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -161,10 +161,10 @@
           <para style="terp_tblheader_Details_Right">Disc. (%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Total</para>
         </td>
      </tr>
     </blockTable>
@@ -212,7 +212,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Net Total </para>
+          <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>
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 846eaf1f861..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>
@@ -98,7 +98,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header_Centre">Payment</para>
+    <para style="terp_header_Centre">Sales Lines</para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
@@ -140,10 +140,10 @@
           <para style="terp_tblheader_General_Right">Disc(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Unit Price ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_General_Right">Unit Price </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Total ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_General_Right">Total </para>
         </td>
       </tr>
     </blockTable>
@@ -187,7 +187,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Total</para>
+          <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>
@@ -198,4 +198,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
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 fc874e52dac..a88813fac1f 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,8 +1,8 @@
 <?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="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,35 +10,29 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <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"/>
+    </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="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="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="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="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -46,9 +40,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -56,31 +49,26 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <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="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -90,8 +78,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -105,17 +93,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <para style="P2">Payment By User </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -125,7 +117,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="268.0,268.0" style="Table4">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -138,32 +130,31 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau6">
+    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          <para style="terp_tblheader_General_Right">Disc(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total</para>
+          <para style="terp_tblheader_General_Right">Total</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
     <section>
-
-      <para style="terp_default_8">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+      <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
+      <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -180,36 +171,36 @@
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
           </td>
-
         </tr>
       </blockTable>
-       </section>
-      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Table1">
+    </section>
+    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_default_9">
+          <para style="Table Contents">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_9">
+          <para style="Table Contents">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_9">
+          <para style="Table Contents">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total : </para>
+          <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')]]</para>
         </td>
       </tr>
-      </blockTable>
-
-
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
index 32dea8dcd48..9c25d5f4a89 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -125,7 +125,7 @@
         </td>
       </tr>
     </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
   </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 4e3b8ec64e1..44fa3bf60cc 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -125,14 +125,14 @@
         </td>
       </tr>
     </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
 
-	<section>
-		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]
-		<para style="P31">
-			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].
-		</para>
-	</section>
+<!--	<section>-->
+<!--		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]-->
+<!--		<para style="P31">-->
+<!--			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].-->
+<!--		</para>-->
+<!--	</section>-->
   </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index cb817035a46..9566957b4fa 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales 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="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,35 +10,29 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <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"/>
+    </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="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="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="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="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -46,9 +40,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -56,32 +49,21 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-	<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <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="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -91,8 +73,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -106,17 +88,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <para style="P3">Sales Report</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -126,7 +112,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="268.0,268.0" style="Table4">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -139,10 +125,10 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -151,23 +137,22 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">User</para>
+          <para style="P1">User</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">State</para>
+          <para style="terp_tblheader_General_Right">State</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Company</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
-     <section>
-
-      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+    <section>
+      <para style="P2">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+            <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -176,13 +161,19 @@
             <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
           </td>
         </tr>
       </blockTable>
-       </section>
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
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 39f6ddacb4c..16c8f6f0b38 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Today's sales with users" 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="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,35 +10,29 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <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"/>
+    </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="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="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="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="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -46,9 +40,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -56,31 +49,21 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <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="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" 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="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -90,8 +73,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -105,17 +88,18 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <para style="P3">Todays Sales By User</para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -125,7 +109,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="268.0,268.0" style="Table4">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -138,10 +122,10 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -150,23 +134,22 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">User</para>
+          <para style="P2">User</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">State</para>
+          <para style="terp_tblheader_General_Right">State</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Company</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
-     <section>
-
-      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+    <section>
+      <para style="P1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="141.0,111.0,92.0,60.0,78.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+            <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -175,13 +158,16 @@
             <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
           </td>
         </tr>
       </blockTable>
-       </section>
+      <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 475d045252b..c483fa80a65 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,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Today's sales with 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="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,76 +10,71 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <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="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="Table2">
+      <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="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="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="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="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="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="Tableau6">
       <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"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="2,0"/>
-
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <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="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -89,8 +84,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -104,17 +99,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+    <para style="P3">Sales By Current User(Todays)</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -127,7 +126,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="178.0,178.0,178.0" style="Table4">
+    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -136,17 +135,17 @@
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
         </td>
         <td>
-        	<para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
+          <para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau6">
+    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -160,12 +159,11 @@
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
-     <section>
-
-      <para style="terp_default_8">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
-      <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau7">
+    <section>
+      <para style="P2">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
+      <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -181,22 +179,27 @@
           </td>
         </tr>
       </blockTable>
-       </section>
-       <blockTable colWidths="338.0,52.0,72.0,72.0" style="Table1">
-        <tr>
-          <td>
-            <para style="terp_default_9"></para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Total : </para>
-          </td>
-          <td>
-            <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))) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
+    </section>
+    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <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')]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 24059dcbb0b..60bf67f19af 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Product 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>
@@ -175,7 +175,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="320.0,79.0,83.0" style="Table3">
+    <blockTable colWidths="239.0,80.0,163.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -184,11 +184,11 @@
           <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Amount ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_General_Right">Amount </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="320.0,79.0,83.0" style="Table4">
+    <blockTable colWidths="239.0,80.0,163.0" style="Table4">
       <tr>
         <td>
           <para style="P2">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
@@ -199,11 +199,11 @@
           <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ 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>
-    <blockTable colWidths="320.0,79.0,83.0" style="Table5">
+    <blockTable colWidths="319.0,80.0,83.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
@@ -214,7 +214,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">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -222,4 +222,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From d7b4d43bca151dec78674ade4b00fa4e784a0788 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Wed, 6 Oct 2010 10:57:56 +0530
Subject: [PATCH 19/43] [IMP] Improved the page nos. in header of reports

bzr revid: vro@tinyerp.com-20101006052756-8ma3nosmwzaitsoz
---
 addons/point_of_sale/report/account_statement.py          | 2 +-
 .../point_of_sale/report/all_closed_cashbox_of_the_day.py | 2 +-
 addons/point_of_sale/report/pos_details.py                | 2 +-
 addons/point_of_sale/report/pos_details_summary.py        | 2 +-
 addons/point_of_sale/report/pos_invoice.py                | 8 ++++----
 addons/point_of_sale/report/pos_lines.py                  | 2 +-
 addons/point_of_sale/report/pos_payment_report.py         | 2 +-
 addons/point_of_sale/report/pos_payment_report_date.py    | 2 +-
 addons/point_of_sale/report/pos_payment_report_user.py    | 2 +-
 addons/point_of_sale/report/pos_receipt.py                | 6 +++---
 .../point_of_sale/report/pos_receipt_with_remboursment.py | 6 +++---
 .../report/pos_receipt_without_remboursment.py            | 6 +++---
 addons/point_of_sale/report/pos_sales_user.py             | 2 +-
 addons/point_of_sale/report/pos_sales_user_today.py       | 2 +-
 .../report/pos_sales_user_today_current_user.py           | 2 +-
 addons/point_of_sale/report/pos_users_product.py          | 2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
index dc492651bb2..79f86151198 100644
--- a/addons/point_of_sale/report/account_statement.py
+++ b/addons/point_of_sale/report/account_statement.py
@@ -26,7 +26,7 @@ from report import report_sxw
 class account_statement(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(account_statement, self).__init__(cr, uid, name, context)
+        super(account_statement, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 28b96f7aebe..337a121bd41 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -26,7 +26,7 @@ from report import report_sxw
 class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
     #TOFIX: sql injection problem: SQL Request must be pass from sql injection...
     def __init__(self, cr, uid, name, context):
-        super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context)
+        super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
                 'time': time,
                 'get_data':self._get_data,
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index d1e881befac..26d427a3036 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -177,7 +177,7 @@ class pos_details(report_sxw.rml_parse):
         return form['date_end']
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details, self).__init__(cr, uid, name, context)
+        super(pos_details, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.qty = 0.0
         self.invoice_id = ''
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index ec68585e62b..a629929e204 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class pos_details_summary(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(pos_details_summary, self).__init__(cr, uid, name, context)
+        super(pos_details_summary, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 649eb727f0c..7217b8be553 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,11 +28,11 @@ from tools.translate import _
 class pos_invoice(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_invoice, self).__init__(cr, uid, name, context)
+        super(pos_invoice, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
-        
+
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index ad855087cad..cb45b107931 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -26,7 +26,7 @@ from report import report_sxw
 class pos_lines(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_lines, self).__init__(cr, uid, name, context)
+        super(pos_lines, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index 3d82025da89..dc5653551a2 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_payment_report(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_payment_report, self).__init__(cr, uid, name, context)
+        super(pos_payment_report, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index e492e929b7c..362ff569f72 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_payment_report_date(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_payment_report_date, self).__init__(cr, uid, name, context)
+        super(pos_payment_report_date, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index c7f31ffcd6f..1a982457895 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -24,7 +24,7 @@ from report import report_sxw
 class pos_payment_report_user(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_payment_report_user, self).__init__(cr, uid, name, context)
+        super(pos_payment_report_user, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 51e8e4d0f1b..9be543fb89b 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -33,7 +33,7 @@ def titlize(journal_name):
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
index d96cad52097..3286f40c5b7 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@ import pooler
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
index a84b0588dae..58d7052b287 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@ import pooler
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index 4032f035bdf..a764fa112b9 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_sales_user(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_sales_user, self).__init__(cr, uid, name, context)
+        super(pos_sales_user, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 7c9b9b5a563..3a8b8bb1bba 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_sales_user_today(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_sales_user_today, self).__init__(cr, uid, name, context)
+        super(pos_sales_user_today, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.py b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
index 7f4a8f827f5..ed793b4277e 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.py
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_sales_user_today_current_user(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context)
+        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.qty = 0.0
         self.localcontext.update({
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 141445bcafe..83a02d49832 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -25,7 +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)
+        super(pos_user_product, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,

From 68bd00350401accf0a8bc5a8ca7fcd46197a069b Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Wed, 6 Oct 2010 14:58:41 +0530
Subject: [PATCH 20/43] [IMP]: Internal header in hr_timesheet_invoice's Cost
 Ledger report.

bzr revid: rch_open_erp-20101006092841-j0c50s5883ckqx0t
---
 addons/hr_timesheet_invoice/report/cost_ledger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 8daf40fded6..18de548ad1c 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -167,7 +167,7 @@ report_sxw.report_sxw(
         'report.hr.timesheet.invoice.account.analytic.account.cost_ledger',
         'account.analytic.account',
         'addons/hr_timesheet_invoice/report/cost_ledger.rml',
-        parser=account_analytic_cost_ledger, header=False)
+        parser=account_analytic_cost_ledger, header='internal')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e9f53ca45a18700d39327d54c348a6f6bfa6915d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 15:30:33 +0530
Subject: [PATCH 21/43] improve

bzr revid: apa@tinyerp.com-20101006100033-26milqhu4fpm6ppm
---
 addons/survey/report/survey_analysis_report.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index c95bd33ac32..a5ad7276b00 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -46,9 +46,6 @@ class survey_analysis(report_rml):
                         <drawString x="1.3cm" y="28.3cm"> """+to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True))+"""</drawString>
                         <setFont name="DejaVu Sans Bold" size="10"/>
                         <drawString x="9.8cm" y="28.3cm">"""+ to_xml(company.name) +"""</drawString>
-                        <setFont name="DejaVu Sans" size="8"/>
-                        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> / </drawRightString>
-                        <drawString x="19.8cm" y="28.3cm"></drawString>
                         <stroke color="#000000"/>
                         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
                         </pageGraphics>

From f98f9559956cae0ac26098f3720d7b49a291355b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 18:00:01 +0530
Subject: [PATCH 22/43] improve

bzr revid: apa@tinyerp.com-20101006123001-43cuuw1q39hzq3pn
---
 addons/survey/report/survey_analysis_report.py | 1 +
 addons/survey/report/survey_browse_response.py | 3 ++-
 addons/survey/report/survey_form.py            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index a5ad7276b00..4aa4b099c57 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -423,6 +423,7 @@ class survey_analysis(report_rml):
         rml += """</document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
+        self.pageCount=True
         pdf = create_doc(rml, title=self.title)
 
         return (pdf, report_type)
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index a8bfa906c90..d024e410d0e 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -273,7 +273,7 @@ class survey_browse_response(report_rml):
                                         style = 'tbl_white'
                                     else:
                                         style = 'tbl_gainsboro'
-                                    i +=1 
+                                    i +=1
                                     rml += """<blockTable colWidths=" """ + str(colWidths) + """ " style='"""+style+"""'><tr>"""
                                     table_data = col_heading.browse(cr, uid, col_heading.search(cr, uid, [('response_table_id', '=', answer[0].id), ('name', '=', row)]))
                                     for column in matrix_ans:
@@ -520,6 +520,7 @@ class survey_browse_response(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
+        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
 
         return (pdf, report_type)
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 5a7d5e283e3..5836be2d399 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -389,8 +389,8 @@ class survey_form(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
+        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
-
         return (pdf, report_type)
 
 survey_form('report.survey.form', 'survey','','')

From a32b9d28efd4d4cbcbb71c71ced33e77f1c1502e Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 10:39:37 +0530
Subject: [PATCH 23/43] [IMP]Improve the pos reports and yml files

bzr revid: azaz.201186@gmail.com-20101007050937-8lp2i9qsm5zl5v7n
---
 .../report/account_statement.rml              |  11 +-
 .../report/all_closed_cashbox_of_the_day.rml  | 328 ++++++++----------
 addons/point_of_sale/report/pos_details.rml   |   1 -
 .../report/pos_details_summary.rml            |   9 +-
 addons/point_of_sale/report/pos_lines.rml     |  15 +-
 .../report/pos_payment_report_user.rml        |  12 +-
 .../pos_receipt_without_remboursment.rml      |   2 +-
 .../report/pos_sales_user_today.rml           |  12 +-
 .../pos_sales_user_today_current_user.rml     |   6 +-
 addons/point_of_sale/statement_report.xml     |  13 +-
 addons/point_of_sale/test/pos_report.yml      |  29 +-
 11 files changed, 201 insertions(+), 237 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index 301370ccb59..e777bdfd8f1 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -216,10 +216,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real)]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -247,14 +247,13 @@
         <td>
           <para style="P2">[[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
           <para style="P2">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-          <!--<para style="terp_default_9">[[ line_ids.name ]]</para>-->
-          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          <para style="terp_default_9">[[ line_ids.name ]]</para>
         </td>
         <td>
           <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -269,7 +268,7 @@
           <para style="terp_default_Right_9_Bold">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids), digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ 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 f75c08dbadb..04689e0e059 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>
@@ -10,134 +10,86 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="statement_tbl">
-      <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="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="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="statement_data">
-      <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="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="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="statement_header">
-      <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="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="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="statement_data1">
-      <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="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="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="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Table2_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <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="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="statement_total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8_centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -151,34 +103,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman"/>
-    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-
+    <para style="terp_default_8">[[ repeatIn(objects,'statement') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="258.0,258.0" style="statement_tbl">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header_Centre">Today's Closed Cashbox</para>
+    <para style="terp_header_Centre">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -186,11 +125,9 @@
         <td>
           <para style="terp_tblheader_General_Centre">User</para>
         </td>
-            </tr>
+      </tr>
     </blockTable>
-
-
-    <blockTable colWidths="258.0,258.0" style="statement_data">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -200,10 +137,10 @@
         </td>
       </tr>
     </blockTable>
- <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1">
+    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">St.Name</para>
@@ -224,76 +161,89 @@
           <para style="terp_tblheader_General_Right">Ending Balance</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_General">Total : </para>
+          <para style="terp_tblheader_General">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre"></para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre"></para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre"></para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]]</u></para>
+          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]]</u></para>
+          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
-
- <section>
-<para style="terp_default_8">[[ repeatIn(get_data(user),'statement') ]]</para>
-    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1_detail">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_8_centre">[[ statement['journal'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_8_centre">[[ statement['date'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_8_centre">[[ statement['closing_date'] ]]</para>
-        </td>
-         <td>
-          <para style="terp_default_Bold_8_right"><u> [[ (get_bal(statement)) or '0.00' ]]</u></para>
-        </td>
-        <td>
-        	<para style="terp_default_Bold_8_right"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-
-	<section>
-	<para style="terp_default_9">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
-     <blockTable colWidths="129.0,150.0,83.0,80.0,80.0" style="Table2_detail">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9"><font>[[ get_partner(line_ids) or removeParentNode('font') ]]</font></para>
-        </td>
-		<td>
-		   <para style="terp_default_9"><font>[[ get_user(line_ids) or removeParentNode('font') ]]</font></para>
-		</td>
-		<td></td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]]</para>
-        </td>
-      </tr>
-     </blockTable>
-</section>
+    <section>
+      <para style="terp_default_Bold_8">[[ repeatIn(get_data(user),'statement') ]]</para>
+      <blockTable colWidths="56.0,94.0,71.0,74.0,97.0,90.0" style="Table7">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['journal'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['date'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="Standard">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
+        <blockTable colWidths="94.0,126.0,121.0,3.0,138.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+              <para style="terp_default_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ get_partner(line_ids) or removeParentNode('font') ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ get_user(line_ids) or removeParentNode('font') ]]</para>
+            </td>
+            <td>
+              <para style="Table Contents">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="Standard">
+          <font color="white"> </font>
+        </para>
+      </section>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index c86120779f6..786d2cb0b4d 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -125,7 +125,6 @@
       <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="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 7fc8f0cc42b..309f128d229 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -82,9 +82,10 @@
       <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="#cccccc" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
+      <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="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
       <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"/>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index fd3bbf9c43c..17f722c1c17 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="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
     </pageTemplate>
@@ -73,7 +73,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" 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"/>
@@ -184,16 +183,16 @@
             <para style="terp_default_Right_9">[[taxes(l)]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -221,7 +220,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Net Total :</para>
+          <para style="terp_default_9">Net Total </para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
@@ -249,7 +248,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Taxes :</para>
+          <para style="terp_default_9">Taxes</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
@@ -277,7 +276,7 @@
           </para>
         </td>
         <td>
-          <para style="P1">Total :</para>
+          <para style="terp_default_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>
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 a88813fac1f..3c93c9731a1 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -133,7 +133,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
+    <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -154,7 +154,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
+      <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -169,12 +169,12 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
+    <blockTable colWidths="241.0,56.0,61.0,61.0,64.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
@@ -192,10 +192,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Total</para>
+          <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')]]</para>
+          <para style="terp_default_Right_9">[[ 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_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 44fa3bf60cc..ff6ebc3132c 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -125,7 +125,7 @@
         </td>
       </tr>
     </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
 
 <!--	<section>-->
 <!--		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]-->
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 16c8f6f0b38..52ac1eb6f49 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -54,8 +54,9 @@
       <paraStyle name="all" alignment="justify"/>
     </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="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" 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="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" 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"/>
@@ -98,7 +99,10 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P3">Todays Sales By User</para>
+    <para style="P2">Today's Sales By User</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
@@ -134,7 +138,7 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="P2">User</para>
+          <para style="P3">User</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Right">State</para>
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 c483fa80a65..d0499f1743b 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
@@ -109,7 +109,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Sales By Current User(Todays)</para>
+    <para style="P3">Today's Sales By Current User</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -175,7 +175,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
@@ -194,7 +194,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')]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index fb1be16419e..a81d51a2679 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -25,7 +25,7 @@
 
         <report
             id="all_closed_cashbox_of_the_day"
-            string="All Cloded CashBOx"
+            string="All Closed CashBox"
             model="account.bank.statement"
             name="all.closed.cashbox.of.the.day"
             auto="False"
@@ -54,16 +54,7 @@
             rml="point_of_sale/report/account_statement.rml"
              />
 
-        <report
-            id="all_closed_cashbox_of_the_day"
-            string="All Cloded CashBOx"
-            model="account.bank.statement"
-            name="all.closed.cashbox.of.the.day"
-            auto="False"
-            multi="True"
-            menu = 'False'
-            rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-             />
+
 
     </data>
 </openerp>
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 08052356104..2fe288c2df1 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -7,12 +7,26 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
 
+
+- 
+  I open the register.
+- 
+  !record {model: pos.open.statement, id: pos_open_statement_0}:
+    {}
+- 
+  I open the statement.
+- 
+  !python {model: pos.open.statement}: |
+    self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
+      "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
+      False, "active_id": ref("point_of_sale.menu_open_statement"), })
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
 -
   !python {model: pos.order}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1, 'journal':pos_open_statement_0,}}    
+    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
 
@@ -52,7 +66,7 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report Report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report
 -
   !python {model: ir.ui.menu}: |
     import netsvc, tools, os, time
@@ -84,6 +98,13 @@
     balance_end_real: 0.0
     date: '2010-05-19'
     journal_id: account_journal_cash0
+    line_ids:
+        - name: statement
+          date: "2010-10-13"
+          type: customer
+          account_id: account_account_sales0
+          amount: 100
+          partner_id: base.res_partner_agrolait
     period_id: account.period_5
     state: 'draft'
 -
@@ -133,7 +154,7 @@
 -
   !python {model: pos.order}: |
     import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.pos_order_pos0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data)
 -
@@ -152,4 +173,4 @@
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)

From 7ff6f5b88e3eec3fb3e4f49f3dabb04d9a5565cd Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 11:13:35 +0530
Subject: [PATCH 24/43] [IMP]Changes the rml title and author

bzr revid: azaz.201186@gmail.com-20101007054335-ny5yg41i5xi5b8cq
---
 addons/point_of_sale/report/account_statement.rml |  2 +-
 .../report/all_closed_cashbox_of_the_day.rml      |  2 +-
 addons/point_of_sale/report/pos_details.rml       |  2 +-
 .../point_of_sale/report/pos_details_summary.rml  |  2 +-
 addons/point_of_sale/report/pos_lines.rml         |  2 +-
 .../report/pos_payment_report_date.rml            |  2 +-
 .../report/pos_payment_report_user.rml            |  2 +-
 addons/point_of_sale/report/pos_sales_user.rml    |  2 +-
 .../point_of_sale/report/pos_sales_user_today.rml |  2 +-
 .../report/pos_sales_user_today_current_user.rml  |  2 +-
 addons/point_of_sale/report/pos_users_product.rml |  2 +-
 addons/point_of_sale/test/pos_report.yml          | 15 +--------------
 12 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index e777bdfd8f1..c576828cac1 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Statement" 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"/>
     </pageTemplate>
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 04689e0e059..658e7e958b9 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="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Cashbox of the day" 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"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 786d2cb0b4d..045adf0763c 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="Test" author="Martin Simon" 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="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 309f128d229..5f68c7869f0 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="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Detail of sales" 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"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 17f722c1c17..7f2d97f1c18 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="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sales Lines" 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>
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 c994e53d933..35e605d0bff 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="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payment" 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"/>
     </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 3c93c9731a1..4779fad9e6b 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="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payment By User" 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"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 9566957b4fa..5a98c092a3a 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sales Report" 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"/>
     </pageTemplate>
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 52ac1eb6f49..9f1bc6eb14b 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Todays Sales By User" 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"/>
     </pageTemplate>
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 d0499f1743b..c4d046ad9f8 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="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Todays Sales By Current User" 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"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 60bf67f19af..d5c7d6a9996 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" 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"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 2fe288c2df1..934022f5a4a 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -7,25 +7,12 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
 
-
-- 
-  I open the register.
-- 
-  !record {model: pos.open.statement, id: pos_open_statement_0}:
-    {}
-- 
-  I open the statement.
-- 
-  !python {model: pos.open.statement}: |
-    self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
-      "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
-      False, "active_id": ref("point_of_sale.menu_open_statement"), })
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
 -
   !python {model: pos.order}: |
     import netsvc, tools, os
-    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1, 'journal':pos_open_statement_0,}}    
+    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1}}    
     (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)

From e9753515f723ebd99bafac47678ad56fb7b52032 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Thu, 7 Oct 2010 11:31:44 +0530
Subject: [PATCH 25/43] [IMP]: Improved general_ledger report.

bzr revid: jni@tinyerp.com-20101007060144-0l1wahry000ud1cm
---
 .../account_general_ledger_landscape.rml      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 1321bdea750..9d23454fcbb 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -263,13 +263,13 @@
       	<tr>
         	<td>
           		<blockTable colWidths="404.0,335.0,79,73.5,72.5,79.00" style="Table5">
-	        		<tr>
+	   	     		<tr>
 		    			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
 	    	</td>
@@ -292,9 +292,9 @@
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[  formatLang(line['amount_currency'] or '')]] [[  line['currency_code'] or '' ]]</para></td>
 		</tr>
 	  </blockTable>
@@ -327,9 +327,9 @@
 						<tr>
 			 	 			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 			  				<td><para style="Standard"></para></td>
-						  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-					  		<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp=Account)) ]]</u></para></td>
-			  				<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
+						  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
+					  		<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
+			  				<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
 						</tr>
 					</blockTable>
 		 		</td>

From 85259763d2b1a2f0737e740f423e709ed3b4491d Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 12:59:38 +0530
Subject: [PATCH 26/43] [IMP]Improve the yml file of delivery report

bzr revid: azaz.201186@gmail.com-20101007072938-4k61yk8iizgv2z32
---
 addons/delivery/test/delivery_report.yml | 30 +++++++++++++++++++++++-
 addons/point_of_sale/test/pos_report.yml |  4 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml
index ed3a859f23d..a88b6bd1942 100644
--- a/addons/delivery/test/delivery_report.yml
+++ b/addons/delivery/test/delivery_report.yml
@@ -1,8 +1,36 @@
+
+-
+ 
+  In Order to test the delivery report I create picking with move lines.
+- 
+  !record {model: stock.picking, id: stock_picking_delivery}:
+    name: test_picking
+    origin: SO001
+    address_id: base.res_partner_address_4
+    company_id: base.main_company
+    date: '2010-05-11 15:18:52'
+    invoice_state: none
+    move_lines:
+      - company_id: base.main_company
+        date_planned: '2010-05-11 15:18:57'
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: HP CD writers
+        product_id: product.product_product_pc1
+        product_qty: 3.0
+        product_uom: product.product_uom_unit
+        date: '2010-05-11 15:18:57'
+        product_uos_qty: 3.0
+    move_type: direct
+    type: out
+    
+    
+
 -
   In order to test the PDF reports defined on a Delievry, we will print a Delivery Order report
 - 
   !python {model: stock.picking}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock_picking_delivery')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'delievry-shipping'+format), 'wb+').write(data)
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 934022f5a4a..933635ac499 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -12,8 +12,8 @@
 -
   !python {model: pos.order}: |
     import netsvc, tools, os
-    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1}}    
-    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
+    data_dict = {'model':'ir.ui.menu', 'form':{ 'invoice_wanted':1}}
+    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
 

From 18e684f9240ff0be8d0e104ea01741fd7ec51692 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 15:09:14 +0530
Subject: [PATCH 27/43] improved

bzr revid: apa@tinyerp.com-20101007093914-xkvx66xyl5m89tou
---
 addons/survey/report/survey_analysis_report.py | 3 +--
 addons/survey/report/survey_browse_response.py | 2 --
 addons/survey/report/survey_form.py            | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 4aa4b099c57..0d866368bf2 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -29,7 +29,6 @@ from report import report_sxw
 
 class survey_analysis(report_rml):
     def create(self, cr, uid, ids, datas, context):
-
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         user_obj = pooler.get_pool(cr.dbname).get('res.users')
         rml_obj=report_sxw.rml_parse(cr, uid, surv_obj._name,context)
@@ -423,7 +422,7 @@ class survey_analysis(report_rml):
         rml += """</document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        self.pageCount=True
+        self.internal_header=True
         pdf = create_doc(rml, title=self.title)
 
         return (pdf, report_type)
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index d024e410d0e..2cdb98622a9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -520,9 +520,7 @@ class survey_browse_response(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
-
         return (pdf, report_type)
 
 survey_browse_response('report.survey.browse.response', 'survey','','')
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 5836be2d399..1a623db4211 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -389,7 +389,6 @@ class survey_form(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
         return (pdf, report_type)
 

From fe3f925902d25cd27a0bfde67dbfc4c0a0ca61ed Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 16:36:33 +0530
Subject: [PATCH 28/43] [IMP]change the table header in delivery report

bzr revid: azaz.201186@gmail.com-20101007110633-rc0idf2j69ja66xt
---
 addons/delivery/report/shipping.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 2c7107c2386..a4ed29bc643 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -179,7 +179,7 @@
     <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Designation</para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Lot</para>
@@ -215,4 +215,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From 5d14c3749674fc6e7d41099adf84e065fca2ac24 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 18:09:36 +0530
Subject: [PATCH 29/43] improve

bzr revid: apa@tinyerp.com-20101007123936-iioup1p4e49o1ue5
---
 addons/hr_payroll/report/report_employees_detail.py | 2 +-
 addons/hr_payroll/report/report_year_salary.py      | 2 +-
 addons/hr_payroll/report/rml_parse.py               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index d36df160ad2..c3d90c4eac7 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -227,7 +227,7 @@ class employees_salary_report(rml_parse.rml_parse):
     def get_monthly_total(self):
         return self.month_total_list
 
-report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header=3)
+report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index a85d7328973..5e03e4710a6 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -105,7 +105,7 @@ class year_salary_report(rml_parse.rml_parse):
               self.total += item[count]
         return self.total
 
-report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header=3)
+report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
 
 
 
diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
index 2e3ca9dc019..7abb29711b6 100755
--- a/addons/hr_payroll/report/rml_parse.py
+++ b/addons/hr_payroll/report/rml_parse.py
@@ -151,10 +151,10 @@ class rml_parse(report_sxw.rml_parse):
             print Stringer
             return Stringer
 
-    def _add_header(self, node, header=1):
-        if header==2:
+    def _add_header(self, node, header='external'):
+        if header=='internal':
             rml_head =  self.rml_header2
-        elif header==3:
+        elif header=='internal landscape':
             rml_head =  self.rml_header3
         else:
             rml_head =  self.rml_header

From 56ea5b6e35f3327509c230177ab3ffdbbe10f244 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 18:42:48 +0530
Subject: [PATCH 30/43] overdue payment

bzr revid: apa@tinyerp.com-20101007131248-t21lp7jd8l8tzr93
---
 addons/account/report/overdue.rml | 44 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index a0748e281ac..d3d2c77e47a 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -46,11 +46,13 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,1" stop="5,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -116,7 +118,7 @@
     </para>
     <para style="terp_default_9">Document: Customer account statement</para>
     <para style="terp_default_9">Date: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
-    <para style="terp_default_9">Customer Ref: [[ o.ref or '' ]]</para>
+    <para style="terp_default_9">Customer Ref: [[ o.ref or ' ']]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -181,10 +183,10 @@
             <para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]</para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] </para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
@@ -195,7 +197,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="247.0,65.0,59.0,56.0,66.0,17.0" style="Table2">
+    <blockTable colWidths="244.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -206,7 +208,7 @@
           <para style="terp_default_Bold_9">Sub-Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] </para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
@@ -220,6 +222,8 @@
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="250.0,66.0,62.0,131.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -230,25 +234,21 @@
           <para style="terp_default_Bold_9">Balance : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </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">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]].</para>
     <para style="terp_default_8">
       <font color="white"> </font>

From f346dc0bd56dd6767dfe681ea6fc573db52659ac Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:00:23 +0530
Subject: [PATCH 31/43] improve

bzr revid: apa@tinyerp.com-20101007133023-w0e14zu1xkoph0gc
---
 addons/account/report/account_central_journal.rml | 2 +-
 addons/account/report/account_general_journal.rml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 4bf23b3d4b6..d6e53c4f3c7 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -295,7 +295,7 @@
     </blockTable>
     <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
-        <td><para style="terp_default_Bold_9">Total<font size="8.0">([[ company.currency_id.code]])</font>:</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] </para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] </para></td>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 84a9ee6a780..61113212c2d 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -270,7 +270,7 @@
   		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] </para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>

From 2902b1138f62584ab7b1cd5c5f96021cc170a327 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:11:19 +0530
Subject: [PATCH 32/43] improve

bzr revid: apa@tinyerp.com-20101007134119-q04dm2l2ubqjpymd
---
 .../hr_payroll/report/report_year_report.rml  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 4c32436955a..d103d35185f 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -63,11 +63,24 @@
     <blockTableStyle id="Table6">
       <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="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" 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" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -134,7 +147,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
@@ -176,7 +189,7 @@
             <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">Total([[company.currency_id.code]])</para>
+            <para style="terp_tblheader_Details_Right">Total</para>
           </td>
         </tr>
       </blockTable>
@@ -185,7 +198,7 @@
       </para>
       <section>
         <para style="terp_default_9">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
+        <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
           <tr>
             <td>
               <para style="terp_default_9">[[ e[0] ]]</para>
@@ -231,23 +244,14 @@
             </td>
           </tr>
         </blockTable>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="P1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_tblheader_Details">Total([[company.currency_id.code]])</para>
+            <para style="terp_tblheader_Details">Total</para>
           </td>
           <td>
             <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
@@ -298,4 +302,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 5987cb0a8d2fdb56a2eba874db54f2211c75ec55 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:30:08 +0530
Subject: [PATCH 33/43] improve

bzr revid: apa@tinyerp.com-20101007140008-1q8f9m64p198exk6
---
 .../report/report_employees_detail.rml        | 260 ++++++++----------
 1 file changed, 118 insertions(+), 142 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 1988d932ce2..28ebe20d007 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -86,33 +86,19 @@
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
@@ -122,20 +108,20 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -144,20 +130,20 @@
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
@@ -166,24 +152,38 @@
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <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="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -292,10 +292,10 @@
           <para style="terp_default_9">[[ o.name ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Other Id</para>
+          <para style="terp_tblheader_Details">PAN No.</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+          <para style="terp_default_9">[[ o.pan_no or ' ']]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Address</para>
@@ -332,7 +332,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
@@ -378,13 +378,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_9">
-          <font color="white"> </font>
-        </para>
         <blockTable colWidths="1063.0" style="Table7">
           <tr>
             <td>
@@ -393,56 +387,53 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+          <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
         <blockTable colWidths="1063.0" style="Table10">
           <tr>
@@ -452,56 +443,53 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
+          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
         <blockTable colWidths="1063.0" style="Table11">
           <tr>
@@ -511,107 +499,98 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
+          <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e3[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <blockTable colWidths="101.0,73.0,68.0,74.0,70.0,74.0,74.0,73.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -619,11 +598,8 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From f75a5aff9118bd1845755cad90925a568c3e8123 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 8 Oct 2010 11:45:23 +0530
Subject: [PATCH 34/43] [REM]:stock:removed lot location report.(same as
 location overviwe.)

bzr revid: apa@tinyerp.com-20101008061523-vmbl352ty3m5yhk5
---
 addons/stock/report/__init__.py      |   1 -
 addons/stock/report/lot_location.py  |  50 -------
 addons/stock/report/lot_location.rml | 212 ---------------------------
 addons/stock/stock_report.xml        |   1 -
 addons/stock/test/stock_report.yml   |  18 +--
 5 files changed, 5 insertions(+), 277 deletions(-)
 delete mode 100644 addons/stock/report/lot_location.py
 delete mode 100644 addons/stock/report/lot_location.rml

diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 63d02ca2717..5a53a5b79dd 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import product_stock
-import lot_location
 import ups
 import picking
 import lot_overview_all
diff --git a/addons/stock/report/lot_location.py b/addons/stock/report/lot_location.py
deleted file mode 100644
index c1b1ae9fe05..00000000000
--- a/addons/stock/report/lot_location.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-import pooler
-import time
-from report import report_sxw
-
-class lot_location(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(lot_location, self).__init__(cr, uid, name, context=context)
-        self.grand_total = 0.0
-
-        self.localcontext.update({
-            'time': time,
-            'process':self.process,
-            'qty_total':self._qty_total,
-        })
-
-    def process(self,location_id):
-        location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
-        data = location_obj._product_get_report(self.cr,self.uid, [location_id])
-        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
-        self.grand_total += data['total']
-        return [data]
-
-    def _qty_total(self):
-        return str( self.grand_total)
-
-report_sxw.report_sxw('report.lot.location', 'stock.location', 'addons/stock/report/lot_location.rml', parser=lot_location)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
deleted file mode 100644
index 76da9ec0480..00000000000
--- a/addons/stock/report/lot_location.rml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Locations" 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"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <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"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-      <section>
-        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
-        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table2">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Product</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Quantity</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">
-                <font color="white"> </font>
-              </para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table3">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-          </tr>
-        </blockTable>
-        <section>
-          <para style="terp_default_9">[[ repeatIn(ob['product'], 'p') ]]</para>
-          <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table6">
-            <tr>
-              <td>
-                <para style="terp_default_9">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_9">[ [[p['code'] ]] ] [[ p['prod_name'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ p['uom'] ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </section>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table5">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Total :</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">[[ ob['total'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-      </section>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-    </section>
-    <blockTable colWidths="138.0,255.0,56.0,34.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Grand Total:</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ qty_total() ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 1332e840e10..e634d27153e 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -5,7 +5,6 @@
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Inventory" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
-        <!-- ODO: Useless report, duplicates the previous one? <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/> -->
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Inventory (with child locations)" rml="stock/report/lot_overview_all.rml"/>
         <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/>
     </data>
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index 3d31977f123..48396019c6c 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,22 +1,14 @@
 -
   In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
-- 
+-
   !python {model: stock.location}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on stock location, we will print a lot location report
-- 
-  !python {model: stock.location}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lot.location').create(cr, uid, [ref('stock.stock_location_components')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_lot_location.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on stock inventory, we will print a Stock Inventory Move report
-- 
+-
   !python {model: stock.inventory}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock.stock_inventory_0')], {}, {})
@@ -24,7 +16,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'stock-stock_inventory_move.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a stock, we will print a Stock Overview report
-- 
+-
   !python {model: stock.location}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('stock.stock_location_14')], {}, {})
@@ -32,7 +24,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'stock-overview'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a stock, we will print a Stock Picking List report
-- 
+-
   !python {model: stock.picking}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_0')], {}, {})
@@ -40,7 +32,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'stock-picking_list'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Stock, we will print Product Stock Report
-- 
+-
   !python {model: product.product}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product.product_product_pc1')], {}, {})

From ec1d1384963682c7def886c636e78dda9ce2c7cf Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 8 Oct 2010 14:33:30 +0530
Subject: [PATCH 35/43] cost ledger

bzr revid: apa@tinyerp.com-20101008090330-g4q2y3jscfgaailf
---
 addons/account/project/report/cost_ledger.rml | 46 ++++++-------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index 4f495891378..a59e95724d0 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -181,13 +181,10 @@
           <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Centre">Balance</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total">
       <tr>
         <td>
@@ -199,21 +196,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
+          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
         </td>
         <td>
-          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
+          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
         </td>
         <td>
           <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+      <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
       <blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
         <tr>
           <td>
@@ -223,21 +217,18 @@
             <para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
           </td>
           <td>
-            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
+            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
           </td>
           <td>
-            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
+            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
           </td>
           <td>
             <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="Standard">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
+        <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
         <blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
           <tr>
             <td>
@@ -247,21 +238,18 @@
               <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
             </td>
             <td>
-              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
+              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] </para>
             </td>
             <td>
-              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
+              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
             </td>
             <td>
               <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
         <section>
-          <para style="terp_default_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
+          <para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
           <blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
             <tr>
               <td>
@@ -274,13 +262,13 @@
                 <para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] </para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
               </td>
             </tr>
           </blockTable>
@@ -288,13 +276,7 @@
             <font color="white"> </font>
           </para>
         </section>
-        <para style="terp_default_8">
-          <font color="white"> </font>
-        </para>
       </section>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 0935df7cbab6366dd177022babd9b8d004e505a8 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 8 Oct 2010 16:26:03 +0530
Subject: [PATCH 36/43] salary structure

bzr revid: apa@tinyerp.com-20101008105603-r53paarjw8rotym8
---
 .../report/report_emp_salary_structure.rml    | 38 ++-----------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 6bfc528e4e0..105bf823b43 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -290,10 +290,10 @@
             <para style="terp_default_9">[[ employee.name ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">Other Id</para>
+            <para style="terp_tblheader_Details">PAN No.</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.otherid or '' ]]</para>
+            <para style="terp_default_9">[[ employee.pan_no or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Address</para>
@@ -369,7 +369,7 @@
             <para style="terp_tblheader_Details">Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
+            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]] [[ employee.company_id and employee.company_id.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Notes:</para>
@@ -389,13 +389,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
         <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
           <tr>
             <td>
@@ -457,18 +451,9 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
     </section>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="539.0" style="Table10">
       <tr>
         <td>
@@ -476,13 +461,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
         <tr>
           <td>
@@ -508,11 +487,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
+        <para style="terp_default_1">[[repeatIn(employee.line_ids,'line1')]]</para>
         <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
           <tr>
             <td>
@@ -542,12 +518,6 @@
           <font color="white"> </font>
         </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
\ No newline at end of file

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 37/43] [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>

From eaccd57934fafc2d24987226c623bc94519c186f Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Sat, 9 Oct 2010 17:16:34 +0530
Subject: [PATCH 38/43] [IMP]Improves all reports of point of sale module

bzr revid: azaz.201186@gmail.com-20101009114634-4ruovxonxa1bny4d
---
 .../report/all_closed_cashbox_of_the_day.rml  |  30 +--
 .../report/pos_details_summary.rml            | 189 +++++++++---------
 addons/point_of_sale/report/pos_lines.rml     |  16 +-
 .../report/pos_payment_report.py              |  12 +-
 .../report/pos_payment_report.rml             |   4 +-
 .../report/pos_payment_report_date.py         |  12 +-
 .../report/pos_payment_report_date.rml        |  16 +-
 .../report/pos_payment_report_user.py         |   6 +-
 .../report/pos_payment_report_user.rml        |  13 +-
 .../point_of_sale/report/pos_sales_user.rml   |  26 +--
 .../report/pos_sales_user_today.rml           |  26 ++-
 .../pos_sales_user_today_current_user.rml     |  19 +-
 .../report/pos_users_product.rml              |  64 +++---
 13 files changed, 220 insertions(+), 213 deletions(-)

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..7013ddcfb6f 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
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Cashbox of the day" 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="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -114,10 +114,10 @@
       <font color="white"> </font>
     </para>
     <para style="terp_header_Centre">Today's Closed Cashbox</para>
-    <para style="terp_header_Centre">
+    <para style="terp_default_Right_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -127,7 +127,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -140,7 +140,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table3">
+    <blockTable colWidths="59.0,101.0,75.0,78.0,104.0,95.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">St.Name</para>
@@ -162,7 +162,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table4">
+    <blockTable colWidths="59.0,101.0,75.0,78.0,104.0,95.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_General">Total:</para>
@@ -183,16 +183,16 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_Bold_8">[[ repeatIn(get_data(user),'statement') ]]</para>
-      <blockTable colWidths="56.0,94.0,71.0,74.0,97.0,90.0" style="Table7">
+      <para style="terp_default_1">[[ repeatIn(get_data(user),'statement') ]]</para>
+      <blockTable colWidths="60.0,99.0,75.0,79.0,103.0,96.0" style="Table7">
         <tr>
           <td>
             <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
@@ -207,16 +207,16 @@
             <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
           </td>
           <td>
-            <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
+            <para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
           </td>
           <td>
-            <para style="P1">[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</para>
+            <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
           </td>
         </tr>
       </blockTable>
       <section>
-        <para style="Standard">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
-        <blockTable colWidths="94.0,126.0,121.0,3.0,138.0" style="Table5">
+        <para style="terp_default_1">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
+        <blockTable colWidths="99.0,134.0,129.0,3.0,147.0" style="Table5">
           <tr>
             <td>
               <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -240,7 +240,7 @@
             </td>
           </tr>
         </blockTable>
-        <para style="Standard">
+        <para style="terp_default_1">
           <font color="white"> </font>
         </para>
       </section>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 5f68c7869f0..4c538f3b15e 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Detail of sales" 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="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -38,23 +38,30 @@
       <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"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
       <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="#cccccc" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <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="Table5">
+    <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
@@ -64,11 +71,6 @@
       <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="#cccccc" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -104,11 +106,12 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="19" alignment="LEFT"/>
-    <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="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="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 +150,14 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">Details of Sales</para>
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <para style="P4">Details of Sales</para>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -167,7 +170,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
@@ -180,80 +183,84 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table3">
+    <blockTable colWidths="256.0,256.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(gettaxamount(objects).items(),'p') ]]</para>
+      <blockTable colWidths="256.0,256.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P6">[[ p[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="256.0,256.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Mode of Payment</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(getpayments(objects).items(),'t') ]]</para>
+      <blockTable colWidths="256.0,256.0" style="Table9">
+        <tr>
+          <td>
+            <para style="P5">[[ t[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="256.0,256.0" style="Table8">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Summary</para>
+        </td>
         <td>
           <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
       </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>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ p[1] ]]</para>
-        </td>
-      </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table5">
-      <tr>
-        <td>
-          <para style="P3">Mode of Payment</para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </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>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ '%.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>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table7">
+    <blockTable colWidths="256.0,256.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index a62cd04e104..95f02bb5c1c 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Sales lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="36.0" y1="57.0" width="525" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -115,7 +115,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="175.0,175.0,175.0" style="Table3">
+    <blockTable colWidths="171.0,170.0,170.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -128,7 +128,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="175.0,175.0,175.0" style="Table4">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -147,7 +147,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="201.0,82.0,64.0,61.0,51.0,67.0" style="Tableau6">
+    <blockTable colWidths="196.0,78.0,62.0,58.0,56.0,63.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -170,8 +170,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[repeatIn(o.lines,'l')]]</para>
-      <blockTable colWidths="201.0,83.0,64.0,60.0,51.0,67.0" style="Tableau7">
+      <para style="terp_default_1">[[repeatIn(o.lines,'l')]]</para>
+      <blockTable colWidths="195.0,78.0,62.0,58.0,56.0,63.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para>
@@ -194,7 +194,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="87.0,87.0,88.0,117.0,70.0,76.0" style="Table1">
+    <blockTable colWidths="84.0,85.0,86.0,114.0,68.0,74.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -284,4 +284,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index dc5653551a2..f679e230107 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -38,17 +38,17 @@ class pos_payment_report(report_sxw.rml_parse):
         sql = """ select id from pos_order where id = %d"""%(obj.id)
         self.cr.execute(sql)
         if self.cr.fetchone():
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                                  "(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 " \
-                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  and pu.id=pt.uom_id " \
                                  "and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date and po.id=%d"%(obj.id))
             data=self.cr.dictfetchall()
         else :
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                                  "(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 " \
-                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu  " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id  " \
                                  "and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
             data=self.cr.dictfetchall()
 
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 01fcdf355e1..2d25c740d77 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -175,10 +175,10 @@
       <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_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_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">[[ formatLang(line_ids['discount']) ]]</para>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index 362ff569f72..823fb3ce95e 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -38,17 +38,17 @@ class pos_payment_report_date(report_sxw.rml_parse):
         dt2 = form['date_end'] + ' 23:59:59'
         data={}
         if form['user_id']:
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                              "(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 " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
+                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
                              "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id IN %s " \
                              ,(dt1,dt2,tuple(form['user_id'])))
         else:
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                              "(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 " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
+                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  and pu.id=pt.uom_id " \
                              "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s" \
                              ,(dt1,dt2))
         data=self.cr.dictfetchall()
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..23c3f950d81 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Payment" 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="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -102,7 +102,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -112,7 +112,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -128,7 +128,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
+    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -149,13 +149,13 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
+      <blockTable colWidths="271.0,63.0,45.0,64.0,68.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_Right_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">[[ formatLang(line_ids['discount']) ]]</para>
@@ -169,7 +169,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
+    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index 1a982457895..37b129f68f2 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -35,10 +35,10 @@ class pos_payment_report_user(report_sxw.rml_parse):
     def __pos_payment_user__(self,form):
         data={}
         ids = form['user_id']
-        sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+        sql = "select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                          "(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 " \
-                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
                          "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
                          "and po.user_id IN %s"
         self.cr.execute (sql, (tuple(ids), ))
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..18ed5b73d84 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -59,8 +59,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </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="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" 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"/>
@@ -103,8 +102,8 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P2">Payment By User </para>
-    <para style="P2">
+    <para style="P1">Payment By User </para>
+    <para style="P1">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="241.0,241.0" style="Table1">
@@ -153,14 +152,14 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
+      <para style="terp_default_1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
       <blockTable colWidths="241.0,55.0,61.0,61.0,64.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_Right_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">[[ formatLang(line_ids['discount']) ]]</para>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 5a98c092a3a..d2fefc379fd 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Sales Report" 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="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -41,7 +41,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -54,8 +54,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <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="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" 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"/>
@@ -98,11 +97,11 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P3">Sales Report</para>
-    <para style="P3">
+    <para style="P2">Sales Report</para>
+    <para style="P2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -112,7 +111,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -128,7 +127,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
+    <blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -148,8 +147,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P2">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table5">
+      <para style="terp_default_1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
@@ -168,12 +167,9 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
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..6e633d375d8 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Todays Sales By User" 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="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -53,10 +53,8 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </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="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" 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"/>
@@ -99,11 +97,11 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P2">Today's Sales By User</para>
-    <para style="P2">
+    <para style="P1">Today's Sales By User</para>
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -113,7 +111,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -129,7 +127,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
+    <blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -138,7 +136,7 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="P3">User</para>
+          <para style="P2">User</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Right">State</para>
@@ -149,8 +147,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="141.0,111.0,92.0,60.0,78.0" style="Table5">
+      <para style="terp_default_1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="150.0,118.0,97.0,64.0,83.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
@@ -169,7 +167,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
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..7a94f5d6632 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
@@ -2,7 +2,7 @@
 <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">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -65,8 +65,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <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="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" 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"/>
@@ -109,11 +108,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Today's Sales By Current User</para>
+    <para style="P2">Today's Sales By Current User</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -126,7 +125,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -145,7 +144,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table3">
+    <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -162,8 +161,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P2">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
-      <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table6">
+      <para style="terp_default_1">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
+      <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -180,7 +179,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table5">
+    <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index d5c7d6a9996..ae15e6478e7 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?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"/>
     </pageTemplate>
@@ -57,9 +57,19 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <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">
       <blockAlignment value="LEFT"/>
@@ -71,8 +81,8 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <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="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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"/>
@@ -118,7 +128,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">User's Product</para>
+    <para style="P2">User's Product</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -169,13 +179,7 @@
     <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>
-    <blockTable colWidths="239.0,80.0,163.0" style="Table3">
+    <blockTable colWidths="161.0,161.0,161.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -184,25 +188,29 @@
           <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Amount </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="239.0,80.0,163.0" style="Table4">
-      <tr>
-        <td>
-          <para style="P2">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
-          <para style="P2">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-          <para style="terp_default_9">[[ line_ids['name'] ]]</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['amt']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_General_Right">Amount</para>
         </td>
       </tr>
     </blockTable>
+    <section>
+      <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">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ formatLang(line_ids['qty']) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
     <blockTable colWidths="319.0,80.0,83.0" style="Table5">
       <tr>
         <td>

From 6c2c41bbc117be5756ee87eb7e17a75da746c3f6 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 11:55:03 +0530
Subject: [PATCH 39/43] improve

bzr revid: apa@tinyerp.com-20101011062503-u099hf39z69vogjr
---
 addons/account/report/account_central_journal.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index d6e53c4f3c7..7516ae84c1e 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -304,7 +304,7 @@
     </blockTable>
     <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>

From c6d60694dc2cee44f72f4a29e9759b4834c9ec13 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 12:38:19 +0530
Subject: [PATCH 40/43] improve

bzr revid: apa@tinyerp.com-20101011070819-co8p6lneh3nbosvn
---
 .../account/report/account_central_journal.rml | 18 ++++++++----------
 .../account/report/account_general_journal.rml |  2 +-
 .../account/report/account_general_ledger.py   |  2 +-
 .../account/report/account_general_ledger.rml  |  2 +-
 .../account_general_ledger_landscape.rml       |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 7516ae84c1e..1cdf1e8fb20 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -283,7 +283,7 @@
   		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
       </tr>
     </blockTable>
-   <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+   <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -293,7 +293,7 @@
 		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -302,7 +302,7 @@
 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
-      <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@@ -323,19 +323,17 @@
  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
         </tr>
       </blockTable>
-      <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para></td>
-  			<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
-		  <td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and  line['currency_code'] or '']]</para></td>
+  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+		  <td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
         </tr>
       </blockTable>
     </section>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>
+
   </story>
 </document>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 61113212c2d..76ff805352b 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -373,7 +373,7 @@
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]]</para></td>
-          <td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</para></td>
+          <td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
         </tr>
       </blockTable>
       </section>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 80a7ff44f0e..d9920ba94fd 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -160,7 +160,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         else:
             sql_sort='l.date'
         sql = """
-            SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
+            SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
             m.name AS move_name, m.id AS mmove_id,
             c.symbol AS currency_code,
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 7ded26849bd..00e93507c63 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -334,7 +334,7 @@
        <td><para style="P4">[[ formatLang(line['debit']) ]]</para></td>
        <td><para style="P4">[[ formatLang(line['credit']) ]]</para></td>
        <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-       <td><para style="P4">[[  formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']]</para></td>
+       <td><para style="P4"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
      </tr>
   </blockTable>
   </section>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index ec205f5e542..4f7205af4ed 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -295,7 +295,7 @@
 			<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
-			<td><para style="P4_content">[[  formatLang(line['amount_currency'] or '')]] [[  line['currency_code'] or '' ]]</para></td>
+			<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
 		</tr>
 	  </blockTable>
 

From 7a30f6643bf23809adf06e14c8ac39ec181b8981 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 15:34:19 +0530
Subject: [PATCH 41/43] remove conflicts

bzr revid: apa@tinyerp.com-20101011100419-jzburzmpos92am48
---
 addons/hr_payroll/report/report_employees_detail.rml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 42127c8283c..9ddad713046 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -440,11 +440,8 @@
           </tr>
         </blockTable>
         <section>
-<<<<<<< TREE
-          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
-=======
+
           <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
->>>>>>> MERGE-SOURCE
           <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
             <tr>
               <td>
@@ -500,11 +497,7 @@
           </tr>
         </blockTable>
         <section>
-<<<<<<< TREE
-          <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
-=======
           <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
->>>>>>> MERGE-SOURCE
           <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
             <tr>
               <td>

From eaa031075c354bdef9ce568f6d8ca3b41047a3f3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 15:36:17 +0530
Subject: [PATCH 42/43] remove conflicts

bzr revid: apa@tinyerp.com-20101011100617-noz4sgp9xfpevzgv
---
 .../report/report_emp_salary_structure.rml       | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 8e2b69c43e2..e5505eb5b02 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -437,14 +437,10 @@
         </tr>
       </blockTable>
       <section>
-<<<<<<< TREE
-        <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
-=======
         <para style="terp_default_1">
           <font color="white"> </font>
         </para>
         <blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
->>>>>>> MERGE-SOURCE
           <tr>
             <td>
               <para style="terp_tblheader_Details">Code</para>
@@ -484,12 +480,9 @@
         </section>
       </section>
     </section>
-<<<<<<< TREE
-=======
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
->>>>>>> MERGE-SOURCE
     <blockTable colWidths="539.0" style="Table10">
       <tr>
         <td>
@@ -498,14 +491,10 @@
       </tr>
     </blockTable>
     <section>
-<<<<<<< TREE
-      <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
-=======
       <para style="terp_default_1">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="34.0,338.0,82.0,84.0" style="Table11">
->>>>>>> MERGE-SOURCE
         <tr>
           <td>
             <para style="terp_tblheader_Details">Code</para>
@@ -522,13 +511,8 @@
         </tr>
       </blockTable>
       <section>
-<<<<<<< TREE
-        <para style="terp_default_1">[[repeatIn(employee.line_ids,'line1')]]</para>
-        <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
-=======
         <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
         <blockTable colWidths="34.0,338.0,81.0,86.0" style="Table12">
->>>>>>> MERGE-SOURCE
           <tr>
             <td>
               <para style="terp_default_9">[[ line1.code or '' ]]</para>

From ebb0595c549b3e2472bf2242e217c98c091d0f1e Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Mon, 11 Oct 2010 16:08:56 +0530
Subject: [PATCH 43/43] Removed the conflict

bzr revid: jni@tinyerp.com-20101011103856-dvfjcx75kpntp591
---
 addons/stock/stock_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1f624b8012..9e948ea2b77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1705,9 +1705,7 @@
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
                     </group>
-<<<<<<< TREE
-            <field name="name">Delivery Products vs Planned</field>
-=======
+
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
                         <field name="date" groups="base.group_extended"/>