From 2d53dd6b15357aa897629b481a726e6b63cedc88 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 25 Aug 2010 19:34:45 +0530
Subject: [PATCH 01/73] [IMP]:account:Improved Profit And Loss report.

bzr revid: apa@tinyerp.com-20100825140445-85xc8cj0m6j3qvhu
---
 .../report/account_profit_horizontal.rml      | 48 ++++++++-----------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index 76d462aacf8..9926a1581cf 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -3,7 +3,6 @@
   <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="Openerp" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
-	
     </pageTemplate>
   </template>
   <stylesheet>
@@ -71,7 +70,7 @@
      <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>        
+    </blockTableStyle>
     <blockTableStyle id="Table_Net_Profit_Loss">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -142,9 +141,9 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
-    </blockTableStyle>      
-    
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -184,33 +183,26 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="Standard">
+    <para style="terp_header_Centre">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="539.0" style="Table_Heading">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">[[ get_company(data) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="terp_header_Centre">Profit And Loss Account</para>
+          <para style="terp_header_Centre">Profit And Loss</para>
         </td>
       </tr>
     </blockTable>
         <para style="Standard">
       <font color="white"> </font>
     </para>
- 		<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>    
+ 		<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
       <blockTable colWidths="250.0,200.0,200.0,200.0,200.0" style="Table2_header">
       <tr>
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>  
+		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
 	<tr>
@@ -220,25 +212,25 @@
         	<blockTable colWidths="90.0,90.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="90.0,90.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>        	
+		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
 		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
 	</blockTable>
@@ -273,12 +265,12 @@
           <td>
             <para style="terp_default_9">
 
-              <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
+              <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
             </para>
           </td>
           <td>
             <para style="terp_default_9">
-              <font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]][[ a['name'] ]]</font>
+              <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>
@@ -286,12 +278,12 @@
           </td>
           <td>
             <para style="terp_default_9">
-              [[ a['code1'] ]]<font>[[ a['level1']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
+              [[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
             </para>
           </td>
           <td>
             <para style="terp_default_9">
-              <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
+              <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
             </para>
           </td>
           <td>

From c35a6a29bec558d18eb62eeaf01a3c7f6c8b1522 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 10:46:04 +0530
Subject: [PATCH 02/73] [IMP]:account:Improved Profit And Loss report.(both)

bzr revid: apa@tinyerp.com-20100826051604-ltdusr9cni5g8a6i
---
 .../report/account_profit_horizontal.rml      |  2 +-
 addons/account/report/account_profit_loss.rml | 45 ++++++++-----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index 9926a1581cf..d22e2e18a20 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="Openerp" allowSplitting="20" >
+  <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
     </pageTemplate>
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 7bf0704b8a0..316ffb1b795 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Profit and Loss" author="Openerp" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -42,7 +42,7 @@
      <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>        
+    </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -144,8 +144,8 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
-    </blockTableStyle>      
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -185,20 +185,13 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="Standard">
+    <para style="terp_header_Centre">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="539.0" style="Table_Heading">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">[[ get_company(data) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="terp_header_Centre">Profit And Loss Account</para>
+          <para style="terp_header_Centre">Profit And Loss</para>
         </td>
       </tr>
     </blockTable>
@@ -212,7 +205,7 @@
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>  
+		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
 	<tr>
@@ -222,25 +215,25 @@
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>        	
+		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
 		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
 	</blockTable>
@@ -265,12 +258,12 @@
       <tr>
         <td>
           <para style="terp_default_9">
-            <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
+            <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
           </para>
         </td>
         <td>
           <para style="terp_default_9">
-            <font color="white">[[  '. '*(a.level-1) ]]</font><font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]][[ a.name ]]</font>
+            <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>
@@ -320,12 +313,12 @@
       <tr>
         <td>
           <para style="terp_default_9">
-            <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
+            <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
           </para>
         </td>
         <td>
           <para style="terp_default_9">
-            <font color="white">[[  '. '*(a.level-1) ]]</font><font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]][[ a.name ]]</font>
+            <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>

From 69f0c5e572aedc574fba26964af56381eb25277c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 12:36:42 +0530
Subject: [PATCH 03/73] [IMP]:account_budget:Improved budgets report.

bzr revid: apa@tinyerp.com-20100826070642-e9wfhnqytljrju4n
---
 .../report/crossovered_budget_report.py       |   2 +-
 .../report/crossovered_budget_report.rml      | 126 ++++++++----------
 2 files changed, 54 insertions(+), 74 deletions(-)

diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index a5f26b19ebf..dd9bbede469 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -205,6 +205,6 @@ class budget_report(report_sxw.rml_parse):
 
         return result
 
-report_sxw.report_sxw('report.crossovered.budget.report', 'crossovered.budget', 'addons/account_budget/report/crossovered_budget_report.rml',parser=budget_report,header=False)
+report_sxw.report_sxw('report.crossovered.budget.report', 'crossovered.budget', 'addons/account_budget/report/crossovered_budget_report.rml',parser=budget_report,header='internal')
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml
index 9705ebba0f3..2394520771e 100644
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.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="Budgets" 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>
@@ -17,8 +17,9 @@
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
-       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,1" stop="1,1"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -35,51 +36,36 @@
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
-       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="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="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <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"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <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="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" 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"/>
@@ -94,114 +80,108 @@
     <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="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" 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_Bold_right_9" fontName="Helvetica-Bold" 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>
-  <images/>
   <story>
-    <para style="P5">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <blockTable colWidths="499.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_header_Centre">[[ company.name ]]</para>
+          <para style="terp_header_Centre">Budgets</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="249.0,249.0" style="Table1">
       <tr>
         <td>
-          <para style="P6">Currency: [[ company.currency_id.name ]]</para>
+          <para style="terp_default_9">Currency: [[ company.currency_id.name ]]</para>
         </td>
         <td>
-          <para style="P7">Printed at: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S')]]</para>
+          <para style="terp_default_Right_9">Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="terp_default_address">
-           Analysis from [[ data['form']['date_from'] ]] to [[ data['form']['date_to'] ]]
-          </para>
+          <para style="terp_default_9">Analysis from [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
         </td>
         <td>
-          <para style="P8">Budget : <font color="blue">[[ o.name ]]</font></para>
+          <para style="terp_default_Bold_right_9">Budget : <font face="Helvetica" color="blue">[[ o.name ]]</font></para>
         </td>
       </tr>
     </blockTable>
-    <para style="P5">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P5">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="191.0,82.0,81.0,83.0,62.0" style="Table3">
       <tr>
         <td>
-          <para style="P4">Description</para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="P4">Theoretical Amount</para>
+          <para style="terp_tblheader_Details_Centre">Theoretical Amount</para>
         </td>
         <td>
-          <para style="P4">Planned Amount</para>
+          <para style="terp_tblheader_Details_Centre">Planned Amount</para>
         </td>
         <td>
-          <para style="P4">Practical Amount</para>
+          <para style="terp_tblheader_Details_Centre">Practical Amount</para>
         </td>
         <td>
-          <para style="P4">Perc(%)</para>
+          <para style="terp_tblheader_Details_Centre">Perc(%)</para>
         </td>
       </tr>
     </blockTable>
-	<para style="P5">
-        <font color="white"> </font>
-      </para>
     <section>
-      <para style="P5">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
-      <blockTable colWidths="191.0,82.0,80.0,84.0,61.0" style="Table4">
+      <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
+      <blockTable colWidths="191.0,82.0,81.0,84.0,61.0" style="Table4">
         <tr>
           <td>
-            <para style="P1"><font>[['.....' *(a['status']-1) ]] [[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and (setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
+            <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['theo'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ '%.2f' % a['theo'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['pln'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['pln'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['prac'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['prac'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['perc'] ]]%</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['perc'] ]]%</para>
           </td>
         </tr>
       </blockTable>
     </section>
-     <para style="P5">
-        <font color="white"> </font>
-      </para>
-    <blockTable colWidths="191.0,83.0,80.0,84.0,61.0" style="Table5">
+    <blockTable colWidths="191.0,85.0,83.0,84.0,62.0" style="Table5">
       <tr>
         <td>
-          <para style="P3"><font face="Times-Roman">[[ repeatIn(funct_total(data['form']),'b') ]]</font> <b>Total :</b></para>
+          <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font><font face="Helvetica">Total </font>:</para>
         </td>
         <td>
-          <para style="P3">[[ '%.2f' % b['tot_theo'] ]]</para>
+          <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_theo'] ]]</para>
         </td>
         <td>
-          <para style="P2">[[ '%.2f' % b['tot_pln'] ]]</para>
+          <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_pln'] ]]</para>
         </td>
         <td>
-          <para style="P2">[[ '%.2f' % b['tot_prac'] ]]</para>
+          <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_prac'] ]]</para>
         </td>
         <td>
-          <para style="P2">[[ '%.2f' % b['tot_perc'] ]]%</para>
+          <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_perc'] ]]%</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P5">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>

From 29ea95c1da866cde1e8b71220b1c35f657308f25 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 14:09:22 +0530
Subject: [PATCH 04/73] [IMP]:account:Improved partner ledger report(both).

bzr revid: apa@tinyerp.com-20100826083922-8ytg35m5epsiw9c0
---
 .../account/report/account_partner_ledger.rml | 78 +++++++++----------
 .../report/account_partner_ledger_other.rml   | 42 +++++-----
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 934591032e8..23453145800 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.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="Partner Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -68,8 +68,8 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
-    </blockTableStyle>    
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -84,7 +84,7 @@
  	<blockTableStyle id="Table3_header">
       <blockAlignment value="LEFT"/>
         <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>    
+    </blockTableStyle>
      <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -100,9 +100,9 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      
+
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -123,7 +123,7 @@
       <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"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -174,7 +174,7 @@
     <blockTable colWidths="539.0" style="Table_header">
       <tr>
         <td>
-          <para style="terp_header_Centre">Third Party Ledger</para>
+          <para style="terp_header_Centre">Partner Ledger</para>
         </td>
         <tr>
           <td>
@@ -193,34 +193,34 @@
     </para>
     <para style="P4">
       <font color="white"> </font>
-    </para>  
+    </para>
       <para style="P4">
       <font color="white"> </font>
-    </para>    
-      <para style="P4">
-      <font color="white"> </font>
-    </para>  
-          <para style="P4">
-      <font color="white"> </font>
-    </para>    
+    </para>
       <para style="P4">
       <font color="white"> </font>
     </para>
           <para style="P4">
       <font color="white"> </font>
-    </para>    
+    </para>
       <para style="P4">
       <font color="white"> </font>
     </para>
           <para style="P4">
       <font color="white"> </font>
-    </para>    
+    </para>
+      <para style="P4">
+      <font color="white"> </font>
+    </para>
+          <para style="P4">
+      <font color="white"> </font>
+    </para>
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
       <blockTable colWidths="80.0,80.0,80.0,130.0,70.0,80.0" style="Table2_header">
       <tr>
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-		<td><para style="terp_tblheader_General_Centre">Journal</para></td>        
+		<td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Partner's</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
@@ -233,28 +233,28 @@
         	<blockTable colWidths="60.0,60.0" style="Table3_header">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="65.0,65.0" style="Table3_header">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
-	<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>        	
+	<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
 	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
-	</blockTable>  
+	</blockTable>
      <para style="P4">
       <font color="white"> </font>
     </para>
@@ -285,13 +285,13 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
@@ -397,16 +397,16 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance ([[ get_currency(data) ]])</para>
         </td>
          <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
+          <para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
@@ -435,7 +435,7 @@
       <font color="white"> </font>
     </para>
     <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-    
+
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -448,7 +448,7 @@
         </td>
         <td>
           <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
-        </td>     
+        </td>
         <td>
           <para style="P5">
             <font color="white"> </font>
@@ -470,7 +470,7 @@
         </td>
    		<td>
           <para style="P5"></para>
-        </td>  
+        </td>
     </tr>
     </blockTable>
     <para style="terp_default_2">
@@ -510,7 +510,7 @@
         <font color="white"> </font>
       </para>
     </section>
-    
+
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 7396734fdc9..1869144cfc9 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.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="Partner Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -180,7 +180,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
 
     </blockTableStyle>
     <blockTableStyle id="Table9">
@@ -196,7 +196,7 @@
     <blockTableStyle id="Table_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <blockTableStyle id="Table_header_1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -320,7 +320,7 @@
     <paraStyle name="Table index 1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
     <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Table index heading" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="16.0" leading="20" spaceBefore="12.0" spaceAfter="6.0"/>
-	<paraStyle name="terp_default_Right_1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>    
+	<paraStyle name="terp_default_Right_1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -333,7 +333,7 @@
     <blockTable colWidths="539.0" style="Table_header">
       <tr>
         <td>
-          <para style="terp_header_Centre">Third Party Ledger</para>
+          <para style="terp_header_Centre">Partner Ledger</para>
         </td>
         <tr>
           <td>
@@ -391,10 +391,10 @@
                   </tr>
                   <tr>
                     <td>
-                      <para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para>
+                      <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
                     </td>
                     <td>
-                      <para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para>
+                      <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
                     </td>
                   </tr>
                 </blockTable>
@@ -446,13 +446,13 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
@@ -472,11 +472,11 @@
         </td>
       </tr>
     </blockTable>
-    
+
 	<section>
 	<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
     <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-	
+
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -535,7 +535,7 @@
       </blockTable>
     </section>
     </section>
-    <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]] 
+    <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -550,21 +550,21 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
+          <para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
     <para style="P4"/>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]] 
+    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_default_Bold_9">Balance Brought Forward</para>
@@ -588,7 +588,7 @@
     <section>
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
     <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
- 
+
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -623,8 +623,8 @@
         </td>
    		<td>
           <para style="terp_default_Right_9"></para>
-        </td>    
-        </tr>   
+        </td>
+        </tr>
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>

From a9dff77e6475d18f56c20d8e17d5db95d83bd8e8 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 14:17:36 +0530
Subject: [PATCH 05/73] [IMP]:account:Improved partner balance report.

bzr revid: apa@tinyerp.com-20100826084736-licx3we3y3tz2amy
---
 addons/account/report/account_partner_balance.rml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index df381493889..5c8d98a1a94 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <document filename="HipHop.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Partner Balance" 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>
@@ -152,7 +151,7 @@
     <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10"/>
     <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -210,8 +209,8 @@
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
 	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]

From 9dfefe059cbf983c38c0172128523cc1e977d674 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 14:54:36 +0530
Subject: [PATCH 06/73] [IMP]:account:Improved Analytic journal report.

bzr revid: apa@tinyerp.com-20100826092436-dvazem4fpwzepwin
---
 .../project/report/analytic_journal.rml       | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml
index bd4129fd067..7b55c6ad212 100644
--- a/addons/account/project/report/analytic_journal.rml
+++ b/addons/account/project/report/analytic_journal.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="Analytic Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -64,6 +64,34 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-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="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="Table6">
+      <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>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -116,16 +144,36 @@
   <images/>
   <story>
     <para style="P12">[[ repeatIn(objects,'o') ]]</para>
-    <blockTable colWidths="539.0" style="Table_Tilte">
+   <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header_Centre">Analytic Journal</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="180.0,180.0,180.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_header_Centre">Analytic Journal - [[ company.currency_id.name ]]</para>
+          <para style="terp_tblheader_Details_Centre">Period from</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Period to</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Currency</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="180.0,180.0,180.0" style="Table6">
       <tr>
         <td>
-          <para style="terp_header_Centre">Period from : [[ data['form']['date1'] ]]</para>
-          <para style="terp_header_Centre">to : [[ data['form']['date2'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>

From 5f1ac3b2c12977c6b92065378d77cb21b7427319 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 15:04:35 +0530
Subject: [PATCH 07/73] [IMP]:account:Improved journal report.

bzr revid: apa@tinyerp.com-20100826093435-tzt2qenfvbj00878
---
 addons/account/report/account_journal.rml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 400eed846f3..79ace45352a 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="print_journal.pdf">
-  <template pageSize="(595.0,842.0)" title="Print Journal" author="OpenERP" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Journal" 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>
@@ -189,7 +189,7 @@
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="terp_header_Centre">Print Journal</para>
+          <para style="terp_header_Centre">Journal</para>
         </td>
       </tr>
     </blockTable>
@@ -221,8 +221,8 @@
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
 	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
@@ -246,7 +246,7 @@
      <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="40.0,65.0,50.0,62.0,174.0,57.0,61.0,40.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="40.0,65.0,50.0,62.0,154.0,58.0,60.0,60.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
         <td><para style="P10">Voucher No</para></td>

From 4c2ce5d7672a9316725b9b7316c2b445a1a5bdb2 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 15:06:55 +0530
Subject: [PATCH 08/73] [IMP]:account:Improved journal report.

bzr revid: apa@tinyerp.com-20100826093655-3p6gh2l0g1pkgoa8
---
 addons/account/report/account_journal.rml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 79ace45352a..728afa2bbba 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -249,9 +249,9 @@
     <blockTable colWidths="40.0,65.0,50.0,62.0,154.0,58.0,60.0,60.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
-        <td><para style="P10">Voucher No</para></td>
+        <td><para style="P10">Entry No</para></td>
         <td><para style="P10">A/c No.</para></td>
-        <td><para style="P10a">Third party</para></td>
+        <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Entry label</para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
@@ -284,9 +284,9 @@
     <blockTable colWidths="50.0,65.0,50.0,60.0,89.0,40.0,60.0,50.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data)  or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
-        <td><para style="P10">Voucher No</para></td>
+        <td><para style="P10">Entry No</para></td>
         <td><para style="P10">A/c No.</para></td>
-        <td><para style="P10a">Third party</para></td>
+        <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Entry label</para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>

From 42a0eaa0975fc698b8e1edfe54c8b88913023fde Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 15:11:58 +0530
Subject: [PATCH 10/73] [IMP]:account:Improved general ledger report.

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

diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index dd5ffa87bd9..407f76df1ef 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="General Ledger" 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"/>
 			<pageGraphics>

From b944bd792dda9c8f11432386f4a691229b0bb388 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 15:24:45 +0530
Subject: [PATCH 11/73] [IMP]:account:Improved general/central journal report.

bzr revid: apa@tinyerp.com-20100826095445-epsendwp5qvfi2j8
---
 .../report/account_central_journal.rml        | 88 +++++++++----------
 .../report/account_general_journal.rml        |  6 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 03ae0ed3bc1..a1d36fcdcc8 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <document filename="central_journal.pdf">
-  <template pageSize="(595.0,842.0)" title="Central Journal" author="OpenERP" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
 			<pageGraphics>
 
-			</pageGraphics>        
+			</pageGraphics>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -97,8 +97,8 @@
       <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"/>        
+  	 <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="Table_Account_detail_Title_Currency">
       <blockAlignment value="LEFT"/>
@@ -107,14 +107,14 @@
       <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"/>  	 
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/> 
-    </blockTableStyle>    
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
  <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
    <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>       
+    </blockTableStyle>
     <blockTableStyle id="Table_Final_Total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -122,8 +122,8 @@
       <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"/> 
+   	  <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="Table_Final_Total_currency">
       <blockAlignment value="LEFT"/>
@@ -133,8 +133,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"/> 
-	 <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>  
+	 <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+	 <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Journal_Line_Content">
       <blockAlignment value="LEFT"/>
@@ -143,8 +143,8 @@
       <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="4,-1" stop="4,-1"/>
+   	 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Journal_Line_Content_currency">
       <blockAlignment value="LEFT"/>
@@ -154,8 +154,8 @@
       <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>  
+  	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -186,9 +186,9 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
     </blockTableStyle>
-     
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -235,7 +235,7 @@
       <tr>
         <td><para style="terp_header"><font color="white"> </font></para>
         </td>
-        <td><para style="terp_header_Centre">Central Journal</para></td>
+        <td><para style="terp_header_Centre">Centralized Journal</para></td>
         <td><para style="terp_header"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
@@ -244,10 +244,10 @@
     </para>
 	<blockTable colWidths="90.0,80.0,100.0,130.0,100.0" style="Table2">
 		<tr>
-		<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>        
-      	 <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>        
+		<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
+      	 <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-			<td><para style="terp_tblheader_General_Centre">Journal</para></td>        
+			<td><para style="terp_tblheader_General_Centre">Journal</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Filter By  [[get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
@@ -259,37 +259,37 @@
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="65.0,65.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
 	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
-	</blockTable>       
+	</blockTable>
     <para style="P9">
       <font color="white"> </font>
-    </para>    
+    </para>
     <blockTable colWidths="50.0,200.0,95.0,92.0,69.0" style="Table_Account_detail_Title">[[  display_currency(data) == False 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>
         <td><para style="terp_tblheader_Details_Right">Debit</para></td>
         <td><para style="terp_tblheader_Details_Right">Credit</para></td>
-  		<td><para style="terp_tblheader_Details_Right">Balance</para></td>        
+  		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
       </tr>
     </blockTable>
    <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
@@ -298,17 +298,17 @@
         <td><para style="terp_tblheader_Details">Account Name</para></td>
         <td><para style="terp_tblheader_Details_Right">Debit</para></td>
         <td><para style="terp_tblheader_Details_Right">Credit</para></td>
-		<td><para style="terp_tblheader_Details_Right">Balance</para></td>          
-		<td><para style="terp_tblheader_Details_Right">Currency</para></td>                
+		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
+		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="50.0,200.0,94.0,92.0,69.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>
         <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>
-		<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) ) ]]</para></td>        
+		<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) ) ]]</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
@@ -317,10 +317,10 @@
         <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>
-		<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) ) ]]</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_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]]</para></td>
+		 <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
       <blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
@@ -329,7 +329,7 @@
           <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']) ]]</para></td>          
+ 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]]</para></td>
         </tr>
       </blockTable>
       <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
@@ -338,10 +338,10 @@
           <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']) ]]</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']) ]]</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>
         </tr>
-      </blockTable>      
+      </blockTable>
       <para style="terp_default_2">
         <font color="white"> </font>
       </para>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 244f9ac8291..7bdcf6e3ba3 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="general_journal.pdf">
-  <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP" allowSplitting="20">
+  <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
 			<pageGraphics>
@@ -242,8 +242,8 @@
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
 	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True)]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]

From 4210cf47b7d9b396c12d6fb2e322732d77962f98 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 15:30:16 +0530
Subject: [PATCH 12/73] [IMP]:account:Improved aged trial balance report.

bzr revid: apa@tinyerp.com-20100826100016-n43yuvako8o19rnc
---
 .../report/account_aged_partner_balance.rml   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index bd52f9be4f5..2c62375bf64 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-    <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <template pageSize="(1120.0,770.0)" title="Aged Trial balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
        <frame id="first" x1="20.0" y1="35.0" width="1080" height="650"/>
     </pageTemplate>
@@ -23,7 +23,7 @@
     <blockTableStyle id="Table_header_Content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <blockTableStyle id="Tableau1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -33,7 +33,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-      
+
       <blockValign value="TOP"/>
       <blockAlignment value="LEFT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
@@ -68,7 +68,7 @@
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,1" stop="4,1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    
+
     <blockTableStyle id="Tableau3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -107,7 +107,7 @@
 	<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_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-	<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>		    
+	<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
     <para style="P9">
@@ -147,7 +147,7 @@
           <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date_from'],date=True) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
@@ -155,13 +155,13 @@
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]]</para>
         </td>
-      </tr>      
+      </tr>
       </blockTable>
   	<para style="P9">
       <font color="white"> </font>
     </para>  <para style="P9">
       <font color="white"> </font>
-    </para>      
+    </para>
     <blockTable colWidths="300.0,100.0,100.0,100.0,100.0,105.0,105.0,125.0" style="Table2" repeatRows="1">
       <tr>
         <td>
@@ -189,9 +189,9 @@
           <para style="P8">Total</para>
         </td>
       </tr>
-      
+
       <tr>
-      
+
         <td>
           <para style="P3"> <font color="white">[[ (get_lines(data['form']), 'partner') == False or removeParentNode('para')  ]]</font></para>
           <para style="P9"><font color="white"> </font></para>
@@ -226,7 +226,7 @@
           <para style="Total_right">[[ formatLang(get_total('5') or 0.00) ]]</para>
         </td>
       </tr>
-      
+
       <tr>
         <td>
           <para style="P3">[[ repeatIn(get_lines(data['form']), 'partner') ]]</para>
@@ -255,7 +255,7 @@
         </td>
       </tr>
     </blockTable>
-    
+
     <para style="P9">
       <font color="white"> </font>
     </para>

From 7140ef1ec6248556377fc99945ca6761c4790371 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 13:05:15 +0530
Subject: [PATCH 13/73] [IMP]:account:Improved general ledger report.

bzr revid: apa@tinyerp.com-20100827073515-kby3yr6pb73wbzju
---
 .../account/report/account_general_ledger.rml |  4 +--
 .../account_general_ledger_landscape.rml      | 32 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 407f76df1ef..ac940d13d34 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -212,8 +212,8 @@
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
 	        	</tr>
 	        	<tr>
-	       		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
+	       		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 09781a7b346..7fbf9269320 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-   <template pageSize="(1120.5,767.8)" title="General Ledger" author="Openerp" allowSplitting="20" >
+   <template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
 			<pageGraphics>
-		
+
 			</pageGraphics>
     </pageTemplate>
   </template>
@@ -128,12 +128,12 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
     </blockTableStyle>
      <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>    
+    </blockTableStyle>
      <blockTableStyle id="Table_Company_Name">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -202,11 +202,11 @@
     </para>
       <blockTable colWidths="200.0,130.0,200.0,150.0,150.0,100.0,110.0" style="Table2">
       <tr>
-      <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>        
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>       
+      <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
        	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>        
+		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
@@ -216,28 +216,28 @@
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
        <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
 		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		
+
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
 	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
@@ -282,7 +282,7 @@
 					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]]</u></para></td>
 					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]]</u></para></td>
 			  			<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]</u></para></td>                
+			  			<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
 	    	</td>

From 84e9c24e539df43e2ea560320d2088783d643448 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 14:44:13 +0530
Subject: [PATCH 14/73] [IMP]:Improved rml reports.

bzr revid: apa@tinyerp.com-20100827091413-yggrgit6chbj69ed
---
 .../report/attendance_errors.rml              |   4 +-
 addons/hr_payroll/report/payslip.rml          |   5 +-
 addons/mrp/report/bom_structure.py            |  10 +-
 addons/mrp/report/bom_structure.rml           |   4 +-
 addons/mrp/report/order.rml                   |  28 +-
 addons/point_of_sale/report/pos_details.py    |   6 +-
 addons/point_of_sale/report/pos_details.rml   | 644 ++++++++----------
 7 files changed, 324 insertions(+), 377 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index 6df3084b862..1275677ee19 100644
--- a/addons/hr_attendance/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.rml
@@ -121,10 +121,10 @@
                 <para style="terp_default_Centre_9">[[ att['action']  ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_9">[[  att['date']  ]]</para>
+                <para style="terp_default_Centre_9">[[  formatLang(att['date'],date_time=True)  ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_9">[[ att['create_date'] ]]</para>
+                <para style="terp_default_Centre_9">[[ formatLang(att['create_date'],date_time=True) ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_9">[[ att['delay']  ]]</para>
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 30f20d167c6..f07c1109ac6 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.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="Pay Slip" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -270,8 +270,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Pay Slip </para>
-          <para style="terp_default_Centre_9">For the month of [[ get_month(o) ]]</para>
+          <para style="terp_header_Centre">Pay Slip</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index fa2f5835ae4..b38f2499c40 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.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/>.
 #
 ##############################################################################
 
@@ -52,12 +52,12 @@ class bom_structure(report_sxw.rml_parse):
                     if level>0 and level<6:
                         level -= 1
             return result
-        
+
         children = _get_rec(object,level)
-        
+
         return children
 
-report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure)
+report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure,header='internal')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
index 527c26d1581..93f2db207bc 100644
--- a/addons/mrp/report/bom_structure.rml
+++ b/addons/mrp/report/bom_structure.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" 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="498" height="678"/>
+      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 5ed1af444f1..b394394bb31 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -20,12 +20,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -37,12 +34,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -189,7 +183,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table3">
+    <blockTable colWidths="193.0,93.0,242.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Product </para>
@@ -197,24 +191,18 @@
         <td>
           <para style="terp_tblheader_General_Centre">Quantity</para>
         </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Priority</para>
-        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Note</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table5">
+    <blockTable colWidths="193.0,93.0,242.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[o.priority or '']]</para>
+          <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ o.product_uom.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.description or '' ]]</para>
@@ -224,7 +212,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,83.0,122.0,129.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="193.0,92.0,114.0,129.0" repeatRows="1" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Planned Date</para>
@@ -241,7 +229,7 @@
       </tr>
     </blockTable>
     <section>
-      <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table2">
+      <blockTable colWidths="193.0,92.0,114.0,129.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_Centre_8">[[ formatLang(o.date_planned, date_time = True) ]]</para>
@@ -386,4 +374,4 @@
       </para>
     </section>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 7715f1b78be..44b73be6570 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.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/>.
 #
 ##############################################################################
 
@@ -207,7 +207,7 @@ class pos_details(report_sxw.rml_parse):
             'getinvoice':self._get_invoice,
         })
 
-report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header=None)
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header='external')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 10bfb2435dc..a86460116da 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,53 +1,57 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-    <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-        <pageTemplate id="first">
-            <frame id="first" x1="5.0" y1="57.0" width="590" height="828"/>
-        </pageTemplate>
-    </template>
-    <stylesheet>
+  <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>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <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="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" 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="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="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" 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="0,0" 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"/>
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-
-    </blockTableStyle>
-
-	<blockTableStyle id="Tableau7">
-      <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"/>
@@ -55,342 +59,298 @@
       <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"/>
-
     </blockTableStyle>
-    <blockTableStyle id="Table7">
+    <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="0,0" stop="-1,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,0"/>
-
+      <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="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-	  <lineStyle kind="LINEABOVE" colorName="#000000" start="0,-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="Standard_Outline">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="Tableau8">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="black"/>
-            <blockBackground colorName="#dddddd" start="0,0" stop="-1,0"/>
-        </blockTableStyle>
-        <blockTableStyle id="Tableau6">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="grey"/>
-            <blockBackground colorName="#e6e6e6" start="0,-1" stop="-1,-1"/>
-        </blockTableStyle>
-
-        <blockTableStyle id="Table1">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable1">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable2">
-            <blockAlignment value="CENTER"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable3">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="black"/>
-        </blockTableStyle>
-        <blockTableStyle id="tmpTable4">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-            <lineStyle kind="GRID" colorName="black"/>
-        </blockTableStyle>
-        <initialize>
-            <paraStyle name="all" alignment="justify"/>
-        </initialize>
-        <paraStyle name="terp_tblheader_Details_Center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="Center" spaceBefore="6.0" spaceAfter="6.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_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-        <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.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_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_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-        <paraStyle name="terp_default_Left_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="-6.0" spaceAfter="6.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_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" 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="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-        <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P5" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P16" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P17" fontName="Times-Bold" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
-        <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="P13" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Standard" fontName="Times-Roman"/>
-        <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-        <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-        <paraStyle name="Heading1" fontName="Helvetica" alignment="CENTER" fontSize="14.0" leading="15" spaceBefore="10.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="14.0" leading="18" spaceBefore="10.0" spaceAfter="6.0"/>
-        <paraStyle name="Index" fontName="Times-Roman"/>
-    </stylesheet>
-    <story>
-    <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-	<para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-     <para style="terp_header"> Detail of Sales </para>
-     <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-     <blockTable colWidths="178.0,178.0,178.0" style="Table2">
+    <blockTableStyle id="Table7">
+      <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"/>
+    </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="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="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <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_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_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="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"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_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_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"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_header_Centre">Details of Sales</para>
+    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Company </para>
+          <para style="terp_tblheader_General_Centre">Company</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Print Date </para>
+          <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">Period</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
+          <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>
         </td>
-
       </tr>
     </blockTable>
-	  <para style="terp_default_8">
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <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</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">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_time = 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']) ]]</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']) ]]</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">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Mode of Taxes</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
             <font color="white"> </font>
           </para>
-        <para style="terp_default_8">
+        </td>
+      </tr>
+      <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>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(p['amount']) or removeParentNode('font') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Mode of Payment</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-
-      <!--<blockTable colWidths="95,42,180,40,27,37,37,40,40"  style="Table7" rowHeights="0.5cm">
-
-            <tr>
-                <td> <para style="terp_tblheader_Details">Date</para> </td>
-                <td> <para style="terp_tblheader_Details">Code</para> </td>
-                <td> <para style="terp_tblheader_Details">Product</para> </td>
-                <td> <para style="terp_tblheader_Details">Price</para> </td>
-                <td> <para style="terp_tblheader_Details">Qty</para> </td>
-                <td> <para style="terp_tblheader_Details">Disc</para> </td>
-                <td> <para style="terp_tblheader_Details">VAT(%)</para> </td>
-                <td> <para style="terp_tblheader_Details">VAT</para> </td>
-                <td> <para style="terp_tblheader_Details">Invoiced</para> </td>
-            </tr>
-        </blockTable> -->
-        <blockTable colWidths="100,52,170,60,34,37,85"  style="Table7" rowHeights="0.5cm">
-
-            <tr>
-                <td> <para style="terp_tblheader_Details">Date</para> </td>
-                <td> <para style="terp_tblheader_Details">Code</para> </td>
-                <td> <para style="terp_tblheader_Details">Product</para> </td>
-                <td> <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</para> </td>
-                <td> <para style="terp_tblheader_Details_Center">Invoiced</para> </td>
-            </tr>
-        </blockTable>
-        <section>
-        <para style="terp_default_8">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
-			<blockTable colWidths="100,52,170,60,34,37,85" style="Tableau7">
-	        <tr>
-	          <td>
-	            <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = 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']) ]]</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']) ]]</para>
-	          </td>
-			  <td>
-			  <para style="terp_default_Right_9"><font>[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</font></para>
-	            <!--<para style="terp_default_Right_9">[[ line_ids['invoice_id'] ]]</para-->
-	          </td>
-	        </tr>
-	      </blockTable>
-	      </section>
-
-        <!--<section>
-            [[ repeatIn(objects,'o') ]]
-            <blockTable colWidths="95,42,180,40,27,37,37,40,40" style="Table8" rowHeights="0.5cm">
-                <tr>
-                    <td>[[ repeatIn(o.lines,'line') ]]<para style="terp_default_9">[[line.create_date ]]</para> </td>
-                    <td> </td>
-                    <td> <para style="terp_default_9"> [[strip_name(line.product_id.name, 32) ]] </para></td>
-                    <td> <para style="terp_default_Right_9"> [[ '%.2f' % (line.price_subtotal,) ]]</para></td>
-                    <td> <para style="terp_default_Right_9"> [[ '%d' % line.qty ]]</para></td>
-                    <td> <para style="terp_default_Right_9"> [[ '%d%%' % (line.discount) ]]</para></td>
-                    <td> <para style="terp_default_Right_9"> [[ len(line.product_id.taxes_id) > 0 and ('%d%%' % (line.product_id.taxes_id[0].amount * 100)) or '' ]] </para></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-                <tr>
-                    <td> <para style="terp_default_9">[[ o.date_order ]] </para></td>
-                    <td> <para style="terp_default_9">[[ o.name ]] </para></td>
-                    <td> <para style="terp_default_9">[[ o.user_id.name ]] </para></td>
-                    <td> <para style="terp_default_Right_9">[[ '%.2f' % (o.amount_total,) ]]</para></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td><para style="terp_default_Right_9">[[ o.amount_tax ]] </para></td>
-                    <td><para style="terp_default_Right_9">[[ o.invoice_id and o.invoice_id.number or '']]</para></td>
-                </tr>
-            </blockTable>
-        </section>-->
-        <para>
-            <font color="white"> </font>
-        </para>
-        <para>
-            <font color="white"> </font>
-        </para>
-        <blockTable colWidths="267.0,267.0" style="Table4">
-                        <tr>
-                            <td>
-                                <para style="terp_tblheader_Details">
-                                    <font face="Helvetica-Bold" size="10.0">Mode of Taxes</font>
-                                </para>
-                            </td>
-                            <td></td>
-                        </tr>
-                        <tr><para>[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</para>
-                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
-                            <td><para style="terp_default_Right_9"><font>[[  formatLang(p['amount']) or removeParentNode('font') ]]</font></para></td>
-                        </tr>
-       </blockTable>
-
-       <blockTable colWidths="267.0,267.0" style="Table4">
-                        <tr>
-                            <td>
-                                <para style="terp_tblheader_Details">
-                                    <font face="Helvetica-Bold" size="10.0">Mode of payment</font>
-                                </para>
-                            </td>
-                            <td></td>
-                        </tr>
-                        <tr>[[ repeatIn(getpayments(data['form'],user), 'p') ]]
-                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
-                            <td><para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]]</para></td>
-                            <!--<td>[[ p.statement_id.journal_id.name ]]</td>
-                            <td><para style="terp_default_Right_9">[[ formatLang(p.amount) ]]</para></td>-->
-                        </tr>
-                    </blockTable>
-
-		<para style="terp_default_8">
-            <font color="white"> </font>
-    	</para>
-    	<para style="terp_default_8">
+        </td>
+      </tr>
+      <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>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]]</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>
+        </td>
+        <td>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-			<section>
-
-         <blockTable colWidths="267.0,267.0" style="Table5">
-         	<tr>
-            	<td colspan="2">
-                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
-            </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Sales total</para></td>
-
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsalestotal2(data['form'],user)) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]]</para></td>
-                        </tr>
-                        <!--<tr>
-                            <td><para style="terp_tblheader_Details">Total discount</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[  formatLang(getsumdisc(objects)) ]]</para></td>
-                        </tr>-->
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total paid</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getpaidtotal2(data['form'],user))  ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ formatLang(gettotalofthaday(data['form'])) ]]</para></td>
-                        </tr>
-                    </blockTable>
-                    </section>
-         <!--<blockTable colWidths="267.0,267.0" style="Table5">
-         	<tr>
-            	<td colspan="2">
-                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
-            </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Sales total</para></td>
-                            terp_tblheader_Details
-                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getsalestotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getqtytotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total discount</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total paid</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
-                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
-                        </tr>
-                    </blockTable> -->
-    </story>
-</document>
-
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.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)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Qty of product</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total invoiced</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getsuminvoice2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total discount</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getsumdisc(objects)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total paid</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(getpaidtotal2(data['form'],user)) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total of the day</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(gettotalofthaday(data['form'])) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
\ No newline at end of file

From f67d103a9bb429f25b17008d2a13eb2bbed29749 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 15:35:22 +0530
Subject: [PATCH 15/73] [IMP/ADD]:Improved rml reports.

bzr revid: apa@tinyerp.com-20100827100522-wvxt5cp2kqmttivn
---
 addons/point_of_sale/report/pos_lines.rml     |  26 ++--
 .../report/pos_payment_report_date.rml        | 134 ++++++++----------
 .../project_planning_report.xml               |   6 +-
 addons/project_planning/report/__init__.py    |   6 +-
 .../report/report_planning.py                 |  36 +++++
 .../report/report_planning.rml                |  91 ++++++------
 addons/stock/report/picking.rml               |  19 +--
 7 files changed, 163 insertions(+), 155 deletions(-)
 create mode 100644 addons/project_planning/report/report_planning.py

diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 5ff85f5afd1..d51fdaefdd0 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -73,14 +73,14 @@
     <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="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"/>
-    <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="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <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 +90,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,14 +106,18 @@
     <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_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_header_Centre">Sales lines</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="179.0,179.0,179.0" style="Table3">
       <tr>
         <td>
@@ -283,4 +287,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
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 f83d985b6b4..b6b726d127f 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="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,24 @@
       <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="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 +76,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 +91,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="terp_header_Centre">Payment</para>
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -125,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>
@@ -138,32 +125,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_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+      <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">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -180,34 +166,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_date_total(data['form'])) or removeParentNode('blockTable')]]</para>
         </td>
       </tr>
-      </blockTable>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/project_planning/project_planning_report.xml b/addons/project_planning/project_planning_report.xml
index 2b71602f97c..6a60850124b 100644
--- a/addons/project_planning/project_planning_report.xml
+++ b/addons/project_planning/project_planning_report.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report id="report_planning" model="report_account_analytic.planning" name="report_account_analytic.planning.print" rml="project_planning/report/report_planning.rml" string="Planning"/>
+        <report id="report_planning"
+        	model="report_account_analytic.planning"
+        	name="report_account_analytic.planning.print"
+        	rml="project_planning/report/report_planning.rml"
+        	string="Planning"/>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/project_planning/report/__init__.py b/addons/project_planning/report/__init__.py
index 9a6ca02408e..230f7e6a702 100644
--- a/addons/project_planning/report/__init__.py
+++ b/addons/project_planning/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,8 +15,8 @@
 #    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/>.
 #
 ##############################################################################
-
+import report_planning
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/report/report_planning.py b/addons/project_planning/report/report_planning.py
new file mode 100644
index 00000000000..67fd118491f
--- /dev/null
+++ b/addons/project_planning/report/report_planning.py
@@ -0,0 +1,36 @@
+# -*- 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 time
+
+from report import report_sxw
+
+class report_planning(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(report_planning, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+        })
+
+report_sxw.report_sxw('report.report_account_analytic.planning.print','report_account_analytic.planning','addons/project_planning/report/report_planning.rml',parser=report_planning, header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 976af76e9d6..711ba2f9e47 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="HR Planning" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -12,7 +12,7 @@
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
-      <blockValign value="CENTER"/>
+      <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="2,-1" stop="2,-1"/>
@@ -22,17 +22,6 @@
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="5,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cecece" start="0,1" stop="-1,-1"/>
-      
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
@@ -53,15 +42,22 @@
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="5,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,1" stop="-1,-1"/>
-
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Helvetica" alignment="RIGHT"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="CENTER"/>
     <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="14.0" leading="17"/>
@@ -69,17 +65,10 @@
     <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.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"/>
@@ -88,8 +77,8 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
     <para style="P1">
@@ -98,21 +87,21 @@
     <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="P15">HR Planning</para>
+    <para style="P10">HR Planning</para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="154.0,199.0,146.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="149.0,192.0,141.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="P1"><font face="Helvetica-Bold">Responsible</font>: [[ o.user_id.name ]]</para>
+          <para style="P1"><font face="Helvetica">Responsible</font>: [[ o.user_id.name ]]</para>
         </td>
         <td>
-          <para style="P10">[[ o.name]]</para>
+          <para style="P11">[[ o.name]]</para>
         </td>
         <td>
-          <para style="P2">From: [[ o.date_from ]]</para>
-          <para style="P2">To: [[ o.date_to ]]</para>
+          <para style="P2"><font face="Helvetica">From</font>: [[ formatLang(o.date_from,date=True) ]]</para>
+          <para style="P2"><font face="Helvetica">To</font>: [[ formatLang(o.date_to,date=True) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -122,17 +111,17 @@
     <para style="P5">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="499.0" style="Table6">
+    <blockTable colWidths="482.0" style="Table6">
       <tr>
         <td>
           <para style="P9">Summary by user</para>
-          <para style="P3">
-      		<font color="white"> </font>
-    	  </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="108.0,104.0,117.0,103.0,66.0" style="Table3">
+    <blockTable colWidths="104.0,101.0,113.0,100.0,63.0" style="Table3">
       <tr>
         <td>
           <para style="P7">User</para>
@@ -153,36 +142,36 @@
       </tr>
       <tr>
         <td>
-          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]</para>
+          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ formatLang(u.user_id.name ]]</para>
         </td>
         <td>
           <para style="P6">[[ formatLang(u.plan_tasks) ]]</para>
         </td>
         <td>
-          <para style="P6">[[  formatLang(u.tasks) ]]</para>
+          <para style="P6">[[ formatLang(u.tasks) ]]</para>
         </td>
         <td>
-          <para style="P6">[[  formatLang(u.free) ]]</para>
+          <para style="P6">[[ formatLang(u.free) ]]</para>
         </td>
         <td>
-          <para style="P6">[[  formatLang(u.timesheet) ]]</para>
+          <para style="P6">[[ formatLang(u.timesheet) ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="P5">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="499.0" style="Table5">
+    <blockTable colWidths="482.0" style="Table5">
       <tr>
         <td>
           <para style="P9">Summary by project</para>
-          <para style="P3">
-      		<font color="white"> </font>
-    	  </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="107.0,106.0,116.0,104.0,65.0" style="Table4">
+    <blockTable colWidths="104.0,103.0,112.0,101.0,63.0" style="Table4">
       <tr>
         <td>
           <para style="P13">Project</para>
@@ -203,7 +192,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P11"><font face="Helvetica" size="11.0">[[ repeatIn(o.planning_account , 'l') ]] </font>[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
+          <para style="P12"><font face="Helvetica" size="11.0">[[ repeatIn(o.planning_account , 'l') ]] </font>[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
         </td>
         <td>
           <para style="P6">[[ formatLang(l.plan_tasks) ]]</para>
@@ -223,4 +212,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 3ef7ce2e866..720fb7c863f 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -125,16 +125,11 @@
     </para>
     <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
       <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
         <td>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
-          
+
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
@@ -142,15 +137,7 @@
             <font color="white"> </font>
           </para>
         </td>
-      </tr>
-      <tr>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">[[ picking.address_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
           <para style="terp_default_9">[[ (  picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
@@ -273,8 +260,8 @@
         <para style="terp_default_2">
         <font color="white"> </font>
       </para>
-  
-  </section>    
+
+  </section>
 	<para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft'  or line.state=='waiting' )])  and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>

From 0810c92b23dd4b4fea95caf56338a9a163aa5ed9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 16:02:36 +0530
Subject: [PATCH 16/73] [IMP/ADD]:Improved rml reports.

bzr revid: apa@tinyerp.com-20100827103236-0075vn3n2cizwtk4
---
 addons/product/report/product_pricelist.rml | 113 ++++++++++----------
 1 file changed, 58 insertions(+), 55 deletions(-)

diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 7ce4ca4e19d..873c5afd6e0 100644
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.rml
@@ -13,10 +13,30 @@
     <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">
+    <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="Table7">
       <blockAlignment value="LEFT"/>
@@ -27,17 +47,17 @@
       <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"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-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"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,0" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_category">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -46,7 +66,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="3.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -99,85 +119,68 @@
     <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="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
   <story>
-    <para style="P1">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P1">
+    <para style="terp_header_Centre">Products Price List</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table1">
+    <blockTable colWidths="180.0,180.0,180.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_header_Centre">Products Price List</para>
+          <para style="terp_tblheader_General_Centre">Price List Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Currency</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Printing Date</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="131.0,408.0" style="Table2">
+    <blockTable colWidths="180.0,180.0,180.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_default_9">Price List Name:</para>
+          <para style="terp_default_Centre_8">[[ get_pricelist(data['form']['price_list']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ get_pricelist(data['form']['price_list']) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Currency :</para>
+          <para style="terp_default_Centre_8">[[ get_currency ( data['form']['price_list']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ get_currency ( data['form']['price_list']) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">Printing Date :</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P1">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P1">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="165.0,78.0,74.0,73.0,72.0,76.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
-          <para style="terp_default_8">[[repeatIn(get_titles(data['form']), 'k')]]</para>
+          <para style="terp_default_1">[[repeatIn(get_titles(data['form']), 'k')]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><font>[[ k['qty1'] or removeParentNode('font') ]] units</font></para>
+          <para style="terp_default_Right_9_Bold">[[ k['qty1'] or removeParentNode('para') ]] units</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><font>[[ k['qty2'] or removeParentNode('font') ]] units</font></para>
+          <para style="terp_default_Right_9_Bold">[[ k['qty2'] or removeParentNode('para') ]] units</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><font>[[ k['qty3'] or removeParentNode('font') ]] units</font></para>
+          <para style="terp_default_Right_9_Bold">[[ k['qty3'] or removeParentNode('para') ]] units</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><font>[[ k['qty4'] or removeParentNode('font') ]] units</font></para>
+          <para style="terp_default_Right_9_Bold">[[ k['qty4'] or removeParentNode('para') ]] units</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><font>[[ k['qty5'] or removeParentNode('font') ]] units</font></para>
+          <para style="terp_default_Right_9_Bold">[[ k['qty5'] or removeParentNode('para') ]] units</para>
         </td>
       </tr>
     </blockTable>
@@ -206,19 +209,19 @@
               <para style="terp_default_9">[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold"><font>[[ p['qty1'] or removeParentNode('font') ]]</font></para>
+              <para style="terp_default_Right_9_Bold">[[ p['qty1'] or removeParentNode('para') ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold"><font>[[ p['qty2'] or removeParentNode('font') ]]</font></para>
+              <para style="terp_default_Right_9_Bold">[[ p['qty2'] or removeParentNode('para') ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold"><font>[[ p['qty3'] or removeParentNode('font') ]]</font></para>
+              <para style="terp_default_Right_9_Bold">[[ p['qty3'] or removeParentNode('para') ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold"><font>[[ p['qty4'] or removeParentNode('font') ]]</font></para>
+              <para style="terp_default_Right_9_Bold">[[ p['qty4'] or removeParentNode('para') ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold"><font>[[ p['qty5'] or removeParentNode('font') ]]</font></para>
+              <para style="terp_default_Right_9_Bold">[[ p['qty5'] or removeParentNode('para') ]]</para>
             </td>
           </tr>
         </blockTable>

From c757b0d233e5fdd3202d9df13c58ee4fd4427d10 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 16:19:21 +0530
Subject: [PATCH 17/73] [IMP]:account:rename the title and author of rml
 reports.

bzr revid: apa@tinyerp.com-20100827104921-njkrtxypbvld9v3a
---
 .../project/report/analytic_balance.rml       | 20 ++++++------
 .../account/project/report/analytic_check.rml |  2 +-
 addons/account/project/report/cost_ledger.rml |  2 +-
 .../report/inverted_analytic_balance.rml      |  2 +-
 .../project/report/quantity_cost_ledger.rml   |  2 +-
 addons/account/report/account_balance.rml     | 12 +++----
 .../report/account_balance_landscape.rml      |  2 +-
 .../account_balance_landscape_old_backup.rml  |  2 +-
 .../report/account_balance_old_backup.rml     |  4 +--
 .../account/report/account_balance_sheet.rml  | 28 ++++++++--------
 .../account_balance_sheet_horizontal.rml      | 32 +++++++++----------
 addons/account/report/account_tax_code.rml    | 18 +++++------
 .../report/compare_account_balance.rml        |  2 +-
 addons/account/report/invoice.rml             |  2 +-
 addons/account/report/overdue.rml             |  2 +-
 addons/account/report/tax_report.rml          | 30 ++++++++---------
 addons/account/report/voucher_print.rml       |  2 +-
 17 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index a9b39e49cc5..926b2adadd3 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.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="Analytic Balance" 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"/>
       <header>
@@ -18,22 +18,22 @@
 				<!--COL 1-->
 				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
 				<drawRightString x="20cm" y="28.1cm">Analytic Balance - [[ company.currency_id.name ]]</drawRightString>
-				
+
 				<!-- Header -->
-				
-				
+
+
 				<setFont name="Helvetica" size="9"/>
 				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
 				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1cm 27.7cm 20cm 27.7cm</lines>
 				<setFont name="Helvetica" size="8"/>
-			
+
 			</pageGraphics>
-			</header>   
+			</header>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -51,12 +51,12 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      
+
     </blockTableStyle>
     <blockTableStyle id="tbl_content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      
+
     </blockTableStyle>
     <blockTableStyle id="tbl_data">
       <blockAlignment value="LEFT"/>
@@ -186,7 +186,7 @@
                 <td>
                   <para style="terp_default_Right_8">[[ formatLang(move_g['quantity']) ]]</para>
                 </td>
-              </tr>   
+              </tr>
       </blockTable>
       </section>
       <para style="terp_default_8">
diff --git a/addons/account/project/report/analytic_check.rml b/addons/account/project/report/analytic_check.rml
index d38ac43adc8..501cf1204eb 100644
--- a/addons/account/project/report/analytic_check.rml
+++ b/addons/account/project/report/analytic_check.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="Analytic Check" 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"/>
         <header>
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index a407fb82fc5..b0f31b93031 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.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="Cost Ledger" 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/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 5761fc122c6..13bf6328486 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.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="Inverted Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 5c7e9331078..f5364039a94 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_cost_ledger.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="Quantity Cost Ledger" 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/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index d6c9ab114e5..65d8b1186ea 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.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="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
@@ -20,7 +20,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
 	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
     </blockTableStyle>
-         
+
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -116,7 +116,7 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-		<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>  
+		<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Account_Balance_Content">
       <blockAlignment value="LEFT"/>
@@ -208,11 +208,11 @@
     </para>
     <para style="P11">
       <font color="white"> </font>
-    </para>    
+    </para>
     <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>        
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>       
+        <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml
index d96227476a5..1f695eb36a8 100644
--- a/addons/account/report/account_balance_landscape.rml
+++ b/addons/account/report/account_balance_landscape.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
     </pageTemplate>
diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml
index 830c20ba2aa..cd7e9edc860 100755
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ b/addons/account/report/account_balance_landscape_old_backup.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
+  <template pageSize="(1120.0,770.0)" title="Account balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
     </pageTemplate>
diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml
index 1d60a242eb8..1d40e58cbfb 100755
--- a/addons/account/report/account_balance_old_backup.rml
+++ b/addons/account/report/account_balance_old_backup.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(635.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(635.0,842.0)" title="Account balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
     </pageTemplate>
@@ -24,7 +24,7 @@
       <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      
+
     </blockTableStyle>
     <blockTableStyle id="Table61">
       <blockAlignment value="LEFT"/>
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 3722e3d1f9f..79fbaed79e6 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Balance sheet" author="Openerp" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Balance sheet" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -107,9 +107,9 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
-    </blockTableStyle>      
-    
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -178,13 +178,13 @@
         <para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
         <para style="terp_default_9">
       <font color="white"> </font>
-    </para>	
+    </para>
       <blockTable colWidths="120.0,100.0,140.0,90.0,90.0" style="Table2_header" >
       <tr>
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font></para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>  
+		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
 	<tr>
@@ -194,25 +194,25 @@
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
 	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>        	
+		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
 		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
 	</blockTable>
@@ -224,7 +224,7 @@
     </para>
     <para style="terp_default_9">
       <font color="white"> </font>
-    </para>	
+    </para>
     <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
       <tr>
         <td>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index d30f904619a..2de52ddf134 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Balance sheet" author="Openerp" allowSplitting="20" >
+  <template pageSize="(1120.0,770.0)" title="Balance sheet" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
-	
+
     </pageTemplate>
   </template>
   <stylesheet>
@@ -123,14 +123,14 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
-    </blockTableStyle>      
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
         <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
    	<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>
-    
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -198,13 +198,13 @@
       <font color="white"> </font>
     </para>
 	<para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
-    
+
       <blockTable colWidths="210.0,210.0,200.0,200.0,200.0" style="Table2_header" >
       <tr>
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>  
+		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
 	<tr>
@@ -214,28 +214,28 @@
         	<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>        	
-	        	</tr>        	
+	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
 	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>        	
+	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>      	
-	        	</tr>        	
+			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+	        	</tr>
 	        	<tr>
 			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
 			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
 	        	</tr>
-        	 </blockTable>        	 
+        	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>        	
+		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
 		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
-	</blockTable>    
+	</blockTable>
 	    <para style="Standard">
       <font color="white"> </font>
     </para>
@@ -298,7 +298,7 @@
         </td>
 		<td>
           <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
-        </td>     
+        </td>
          </tr>
     </blockTable>
     <para style="terp_default_Right_9">
diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index e1dd6bdade9..35205440993 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.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="Tax Code" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="700"/>
        <header>
@@ -11,22 +11,22 @@
 				<!--COL 1-->
 				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
 				<drawRightString x="20cm" y="28.1cm">Accounting Entries-[[ company.currency_id.name ]]</drawRightString>
-				
+
 				<!-- Header -->
-				
-				
+
+
 				<setFont name="Helvetica" size="9"/>
 				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
 				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1cm 27.7cm 20cm 27.7cm</lines>
 				<setFont name="Helvetica" size="8"/>
-			
+
 			</pageGraphics>
-		</header>   
+		</header>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -48,7 +48,7 @@
 	  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
 	  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
 	  <lineStyle kind="LINEBELOW" colorName="#000000" start="6,0" stop="6,0"/>
-	  	  
+
 	  <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"/>
@@ -119,7 +119,7 @@
     <para style="terp_tblheader_Details">
     <font color="white"></font>
     </para>
-    <para style="terp_tblheader_Details">[[ o.name ]]</para> 
+    <para style="terp_tblheader_Details">[[ o.name ]]</para>
     <para style="terp_tblheader_Details">
     <font color="white"></font>
     </para>
diff --git a/addons/account/report/compare_account_balance.rml b/addons/account/report/compare_account_balance.rml
index ac17ea930a8..1706d2fcf2d 100644
--- a/addons/account/report/compare_account_balance.rml
+++ b/addons/account/report/compare_account_balance.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="Account Balance" 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/account/report/invoice.rml b/addons/account/report/invoice.rml
index f05198876b9..37dfb536268 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.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="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index e8e1a7dc84c..d6f1bd35670 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.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="Overdue" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
     </pageTemplate>
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 54a6d87321c..9a3926be67b 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.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="Taxes" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="62.0" width="511" height="728"/>
 			<pageGraphics>
@@ -17,19 +17,19 @@
 				<!--COL 1-->
 				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
 				<drawRightString x="20cm" y="28.1cm">Tax Report</drawRightString>
-				
-				
+
+
 				<setFont name="Helvetica" size="9"/>
 				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
 				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1cm 27.7cm 20cm 27.7cm</lines>
 				<setFont name="Helvetica" size="8"/>
 			</pageGraphics>
-      
+
     </pageTemplate>
   </template>
   <stylesheet>
@@ -47,19 +47,19 @@
       <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
       <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
     </blockTableStyle>
-     
+
     <blockTableStyle id="Table2">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-      
+
       <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"/>
-      
-     
+
+
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
@@ -101,19 +101,19 @@
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-    
-        
-   
+
+
+
     <blockTableStyle id="TrLevel">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
     </blockTableStyle>
 
-	
+
 	<paraStyle name="Level"
 		fontSize="8.0"
-		fontName="Helvetica-Bold" 
+		fontName="Helvetica-Bold"
 		/>
-    
+
   </stylesheet>
   <story>
 	<para style="P2"><font color="white"> </font></para>
diff --git a/addons/account/report/voucher_print.rml b/addons/account/report/voucher_print.rml
index 028575c81f2..b9d5d76be89 100644
--- a/addons/account/report/voucher_print.rml
+++ b/addons/account/report/voucher_print.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="Voucher" 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>

From 913cba032163b55d1d44dc8c62c0dc2f010fbe9e Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 16:34:43 +0530
Subject: [PATCH 18/73] [IMP]:rename the title and author of rml reports.

bzr revid: apa@tinyerp.com-20100827110443-fbrqg6vfyvpl19pg
---
 addons/account_analytic_plans/report/crossovered_analytic.rml   | 2 +-
 addons/account_budget/report/analytic_account_budget_report.rml | 2 +-
 addons/account_budget/report/budget_report.rml                  | 2 +-
 addons/account_followup/report/report_followp_print.rml         | 2 +-
 .../report/report_account_invoice_layout.rml                    | 2 +-
 .../account_invoice_layout/report/special_message_invoice.rml   | 2 +-
 addons/account_payment/report/order.rml                         | 2 +-
 addons/account_report/report/accounting_report.rml              | 2 +-
 addons/account_report/report/print_indicator.rml                | 2 +-
 addons/account_reporting/report/account_report_bs.rml           | 2 +-
 addons/account_voucher/report/report_voucher.rml                | 2 +-
 addons/account_voucher/report/report_voucher_amount.rml         | 2 +-
 addons/auction/report/auction_artists.rml                       | 2 +-
 addons/auction/report/auction_bids.rml                          | 2 +-
 addons/auction/report/auction_buyer_result.rml                  | 2 +-
 addons/auction/report/auction_catelog.rml                       | 2 +-
 addons/auction/report/auction_objects.rml                       | 2 +-
 addons/auction/report/auction_result.rml                        | 2 +-
 addons/auction/report/auction_total.rml                         | 2 +-
 addons/auction/report/auction_total_rml.rml                     | 2 +-
 addons/auction/report/bids_lots.rml                             | 2 +-
 addons/auction/report/bids_phones_details.rml                   | 2 +-
 addons/auction/report/buyer_form_report.rml                     | 2 +-
 addons/auction/report/buyer_list.rml                            | 2 +-
 addons/auction/report/catelogwithpictures.rml                   | 2 +-
 addons/auction/report/deposit_seller.rml                        | 2 +-
 addons/auction/report/lots_list.rml                             | 2 +-
 addons/auction/report/lots_list_inventory.rml                   | 2 +-
 addons/auction/report/lots_list_landscape.rml                   | 2 +-
 addons/auction/report/seller_form_report.rml                    | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 78a01d82a96..df4334d03dd 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.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="Crossovered Analytic" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/account_budget/report/analytic_account_budget_report.rml b/addons/account_budget/report/analytic_account_budget_report.rml
index 99a095f336e..6bcd1b09494 100644
--- a/addons/account_budget/report/analytic_account_budget_report.rml
+++ b/addons/account_budget/report/analytic_account_budget_report.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="Analytic Account Budget" 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/account_budget/report/budget_report.rml b/addons/account_budget/report/budget_report.rml
index ade14440ffe..cd12f60108d 100644
--- a/addons/account_budget/report/budget_report.rml
+++ b/addons/account_budget/report/budget_report.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="Budgets" 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/account_followup/report/report_followp_print.rml b/addons/account_followup/report/report_followp_print.rml
index 97aaa377c1e..63e63a9ef73 100644
--- a/addons/account_followup/report/report_followp_print.rml
+++ b/addons/account_followup/report/report_followp_print.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="Follow Up" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
     </pageTemplate>
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 950a84fc637..d215b431efa 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 7eaae14497f..20ec8b6b5c0 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index e62b07b13fe..20e569140aa 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.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="34.0" y1="34.0" width="527" height="774"/>
     </pageTemplate>
diff --git a/addons/account_report/report/accounting_report.rml b/addons/account_report/report/accounting_report.rml
index 95c9f03d1b0..4425506b6b8 100644
--- a/addons/account_report/report/accounting_report.rml
+++ b/addons/account_report/report/accounting_report.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="Accounting Report" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
 <pageTemplate id="first">
 <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
 </pageTemplate>
diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml
index 929024fd54a..52133cb894e 100644
--- a/addons/account_report/report/print_indicator.rml
+++ b/addons/account_report/report/print_indicator.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="Indicator" 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"/>
 	<pageGraphics>
diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml
index 3d81d427769..59caba5ab76 100644
--- a/addons/account_reporting/report/account_report_bs.rml
+++ b/addons/account_reporting/report/account_report_bs.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="Account Report" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index 2a1b5bcd9a5..2eb3613debd 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.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="Voucher" 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/account_voucher/report/report_voucher_amount.rml b/addons/account_voucher/report/report_voucher_amount.rml
index 71e18a23a69..7e5847b5f08 100755
--- a/addons/account_voucher/report/report_voucher_amount.rml
+++ b/addons/account_voucher/report/report_voucher_amount.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="Voucher Amount" 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/auction/report/auction_artists.rml b/addons/auction/report/auction_artists.rml
index d9d212f26ff..dfe81549245 100644
--- a/addons/auction/report/auction_artists.rml
+++ b/addons/auction/report/auction_artists.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="Artists" 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/auction/report/auction_bids.rml b/addons/auction/report/auction_bids.rml
index 72c61003dae..7de9cba0d1a 100644
--- a/addons/auction/report/auction_bids.rml
+++ b/addons/auction/report/auction_bids.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="Bids" 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/auction/report/auction_buyer_result.rml b/addons/auction/report/auction_buyer_result.rml
index 3f07e8cdde8..bad772963ed 100644
--- a/addons/auction/report/auction_buyer_result.rml
+++ b/addons/auction/report/auction_buyer_result.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="Buyer" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/auction_catelog.rml b/addons/auction/report/auction_catelog.rml
index 688be5a1f08..02027055131 100644
--- a/addons/auction/report/auction_catelog.rml
+++ b/addons/auction/report/auction_catelog.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="Catelog" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/auction_objects.rml b/addons/auction/report/auction_objects.rml
index 57131941f95..988d9c1321f 100644
--- a/addons/auction/report/auction_objects.rml
+++ b/addons/auction/report/auction_objects.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="Objects" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/auction_result.rml b/addons/auction/report/auction_result.rml
index 0944c227ee8..48ecd99d2e1 100644
--- a/addons/auction/report/auction_result.rml
+++ b/addons/auction/report/auction_result.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="Result" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/auction_total.rml b/addons/auction/report/auction_total.rml
index f394099d21e..b7718a56b9c 100644
--- a/addons/auction/report/auction_total.rml
+++ b/addons/auction/report/auction_total.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="Auction Total" 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/auction/report/auction_total_rml.rml b/addons/auction/report/auction_total_rml.rml
index 9fb70d789e5..2d88e2ad2c5 100644
--- a/addons/auction/report/auction_total_rml.rml
+++ b/addons/auction/report/auction_total_rml.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="Auction Total" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/bids_lots.rml b/addons/auction/report/bids_lots.rml
index 513846b0267..9d688868d30 100644
--- a/addons/auction/report/bids_lots.rml
+++ b/addons/auction/report/bids_lots.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="Bids Lots" 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/auction/report/bids_phones_details.rml b/addons/auction/report/bids_phones_details.rml
index c250779caaa..17ba5f94b81 100644
--- a/addons/auction/report/bids_phones_details.rml
+++ b/addons/auction/report/bids_phones_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="Bids Phones Details" 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/auction/report/buyer_form_report.rml b/addons/auction/report/buyer_form_report.rml
index 23da02d881f..c917a931fd3 100644
--- a/addons/auction/report/buyer_form_report.rml
+++ b/addons/auction/report/buyer_form_report.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="Buyer Form" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/buyer_list.rml b/addons/auction/report/buyer_list.rml
index 571fb1b86a5..245617a7f86 100644
--- a/addons/auction/report/buyer_list.rml
+++ b/addons/auction/report/buyer_list.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="Buyer List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/catelogwithpictures.rml b/addons/auction/report/catelogwithpictures.rml
index b3a772b4940..6348f139fed 100644
--- a/addons/auction/report/catelogwithpictures.rml
+++ b/addons/auction/report/catelogwithpictures.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="Catelog With Picture" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
     </pageTemplate>
diff --git a/addons/auction/report/deposit_seller.rml b/addons/auction/report/deposit_seller.rml
index faed2d9c86c..3adc1152067 100644
--- a/addons/auction/report/deposit_seller.rml
+++ b/addons/auction/report/deposit_seller.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="Deposit Seller" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/lots_list.rml b/addons/auction/report/lots_list.rml
index 97047995281..ff3621f90e4 100644
--- a/addons/auction/report/lots_list.rml
+++ b/addons/auction/report/lots_list.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="Lots" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/lots_list_inventory.rml b/addons/auction/report/lots_list_inventory.rml
index 5e6f85f3347..561c90c5240 100644
--- a/addons/auction/report/lots_list_inventory.rml
+++ b/addons/auction/report/lots_list_inventory.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="Lots Inventory" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/lots_list_landscape.rml b/addons/auction/report/lots_list_landscape.rml
index 1b428641f55..250d21ca497 100644
--- a/addons/auction/report/lots_list_landscape.rml
+++ b/addons/auction/report/lots_list_landscape.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="Lots" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
diff --git a/addons/auction/report/seller_form_report.rml b/addons/auction/report/seller_form_report.rml
index bf226a41217..c2d724eb259 100644
--- a/addons/auction/report/seller_form_report.rml
+++ b/addons/auction/report/seller_form_report.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="Seller Form" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>

From b40a24abb2d56bd3ef7cd8378fe40e40c1c14734 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 17:01:55 +0530
Subject: [PATCH 19/73] [IMP]:rename the title and author of rml reports.

bzr revid: apa@tinyerp.com-20100827113155-exychrchfe7rvmyz
---
 .../base_module_doc_rst/report/ir_module_reference_graph.rml  | 2 +-
 addons/delivery/report/shipping.rml                           | 2 +-
 addons/hr_attendance/report/attendance_errors.rml             | 2 +-
 addons/hr_expense/report/expense.rml                          | 2 +-
 addons/hr_payroll/report/payroll_register.rml                 | 2 +-
 addons/hr_payroll/report/payslip.rml                          | 2 +-
 addons/hr_payroll/report/report_emp_salary_structure.rml      | 2 +-
 addons/hr_payroll/report/report_employees_detail.rml          | 2 +-
 addons/hr_payroll/report/report_payroll_advice.rml            | 2 +-
 addons/hr_payroll/report/report_year_report.rml               | 2 +-
 .../hr_timesheet_invoice/report/account_analytic_profit.rml   | 2 +-
 addons/hr_timesheet_invoice/report/cost_ledger.rml            | 2 +-
 addons/l10n_ch/report/bvr_invoice_report.rml                  | 2 +-
 addons/l10n_ch/report/bvr_report.rml                          | 2 +-
 addons/l10n_fr/report/bilan_report.rml                        | 2 +-
 addons/l10n_fr/report/compute_resultant_report.rml            | 2 +-
 addons/lunch/report/order.rml                                 | 2 +-
 addons/mrp/report/bom_structure.rml                           | 2 +-
 addons/mrp/report/order.rml                                   | 2 +-
 addons/mrp_operations/report/mrp_code_barcode.rml             | 2 +-
 addons/mrp_operations/report/mrp_wc_barcode.rml               | 2 +-
 addons/mrp_repair/report/order.rml                            | 2 +-
 addons/point_of_sale/report/account_statement.rml             | 2 +-
 addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml | 2 +-
 addons/point_of_sale/report/pos_details.rml                   | 2 +-
 addons/point_of_sale/report/pos_details_summary.rml           | 2 +-
 addons/point_of_sale/report/pos_lines.rml                     | 2 +-
 addons/point_of_sale/report/pos_payment_report.rml            | 2 +-
 addons/point_of_sale/report/pos_payment_report_date.rml       | 2 +-
 addons/point_of_sale/report/pos_payment_report_user.rml       | 2 +-
 addons/point_of_sale/report/pos_receipt.rml                   | 4 ++--
 addons/point_of_sale/report/pos_receipt_bis.rml               | 2 +-
 addons/point_of_sale/report/pos_receipt_with_remboursment.rml | 2 +-
 .../point_of_sale/report/pos_receipt_without_remboursment.rml | 2 +-
 addons/point_of_sale/report/pos_sales_user.rml                | 2 +-
 addons/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 +-
 38 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/addons/base_module_doc_rst/report/ir_module_reference_graph.rml b/addons/base_module_doc_rst/report/ir_module_reference_graph.rml
index 1cbd1438f01..9d24bf1be86 100644
--- a/addons/base_module_doc_rst/report/ir_module_reference_graph.rml
+++ b/addons/base_module_doc_rst/report/ir_module_reference_graph.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="Introspection report on objects" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="42.0" width="511" height="758"/>
 		<header>
diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 5089d261fe3..c07395a3662 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.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="Delivery" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="30.0" y1="27.0" width="508" height="815"/>
     </pageTemplate>
diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index 1275677ee19..3b602dc6cfd 100644
--- a/addons/hr_attendance/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.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="Attendance Errors" 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/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index f239d1ce77d..7556b5d5e61 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="HR Expenses" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="16.0" y1="57.0" width="522" height="728"/>
     </pageTemplate>
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 10f01c182cd..0ea1fa40e69 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.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="Payroll Register" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="480" height="728"/>
     </pageTemplate>
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index f07c1109ac6..5a760096bc5 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Pay Slip" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Pay Slip" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index d5864beb675..f23712f80ce 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.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="Salary Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 1c3ec0e03fa..8a9689b45c6 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(842.0,595.0)" title="Employees Salary Details" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
     </pageTemplate>
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index d9f8c793a8e..3cfb41f46d4 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.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 Advice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 74c6d347550..77a6cdfa1fb 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(842.0,595.0)" title="Yearly Salary Details" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
     </pageTemplate>
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index d678a390e48..348f85b877a 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.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="Invoice rate by user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="57.0" width="525" height="728"/>
     </pageTemplate>
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.rml b/addons/hr_timesheet_invoice/report/cost_ledger.rml
index 607d709546b..3fa2f8239e1 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.rml
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.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="Cost Ledger" 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/l10n_ch/report/bvr_invoice_report.rml b/addons/l10n_ch/report/bvr_invoice_report.rml
index 7c8b2185ee9..5507915c0af 100755
--- a/addons/l10n_ch/report/bvr_invoice_report.rml
+++ b/addons/l10n_ch/report/bvr_invoice_report.rml
@@ -5,7 +5,7 @@
 
   </docinit>
 
-  <template pageSize="(210.0mm,297.0mm)" title="Invoices BVR" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(210.0mm,297.0mm)" title="Invoices BVR" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
   	<pageTemplate id="first">
 		<pageGraphics>
             <!-- You Logo - Change X,Y,Width and Height -->
diff --git a/addons/l10n_ch/report/bvr_report.rml b/addons/l10n_ch/report/bvr_report.rml
index b38266b560e..838f29523b3 100755
--- a/addons/l10n_ch/report/bvr_report.rml
+++ b/addons/l10n_ch/report/bvr_report.rml
@@ -3,7 +3,7 @@
   <docinit>
     <registerFont fontFile="/tmp/ocrbb.ttf"  expr="{'fontFile':str(police_absolute_path('addons/l10n_ch/report/ocrbb.ttf'))}"  fontName="ocrb"   />
   </docinit>
-  <template pageSize="(210.0mm,297.0mm)" title="BVR" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(210.0mm,297.0mm)" title="BVR" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
 	  <pageGraphics>
             <!-- You Logo - Change X,Y,Width and Height -->
diff --git a/addons/l10n_fr/report/bilan_report.rml b/addons/l10n_fr/report/bilan_report.rml
index e93a63aec86..9aa20eee960 100644
--- a/addons/l10n_fr/report/bilan_report.rml
+++ b/addons/l10n_fr/report/bilan_report.rml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Bilan" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Table3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P31" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P32" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P33" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P34" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P35" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P36" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P37" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P38" fontName="Times-Bold" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P39" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P40" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P41" fontName="Times-Roman"/><paraStyle name="P42" fontName="Times-Roman" fontSize="13.0" leading="16"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="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="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P31">[[ _load('bilan',data['form'])]]</para><para style="P31">[[ _set_variable('at1a',bavar1+bavar2+bavar3+bavar4+bavar5+bavar6+bavar7+bavar8+bavar9+bavar10+bavar11+bavar12+bavar13+bavar14+bavar15+bavar16+bavar17+bavar18+bavar19+bavar20)]]</para><para style="P31">[[ _set_variable('at1b', bavar2b+bavar3b+bavar4b+bavar5b+bavar6b+bavar7b+bavar9b+bavar10b+bavar11b+bavar12b+bavar13b+bavar15b+ bavar16b+bavar17b+bavar18b+bavar19b+bavar20b)]]</para><para style="P31">[[ _set_variable('at1', at1a+at1b)]]</para><para style="P31">[[ _set_variable('at2a', bavar21+bavar22+bavar23+bavar24+bavar25+bavar26+bavar27+bavar28+bavar29+bavar30+bavar31+bavar32+bavar33)]]</para><para style="P31">[[ _set_variable('at2b', bavar21b+bavar22b+bavar23b+bavar24b+bavar26b+bavar27b+bavar29b+bavar30b)]]</para><para style="P31">[[ _set_variable('at2', at2a+at2b)]]</para><para style="P31">[[ _set_variable('actif', at1+at2+bavar34+bavar35+bavar36)]]</para><para style="P31">[[ _set_variable('pt1', bpvar1+bpvar2+bpvar3+bpvar4+bpvar5+bpvar6+bpvar7+bpvar8+bpvar9+bpvar10+bpvar11+bpvar12)]]</para><para style="P31">[[ _set_variable('pt2', bpvar13+bpvar14)]]</para><para style="P31">[[ _set_variable('pt3', bpvar15+bpvar16+bpvar17+bpvar18+bpvar19+bpvar20+bpvar21+bpvar22+bpvar23+bpvar24+bpvar25)]]</para><para style="P31">[[ _set_variable('passif', pt1+pt2+pt3+bpvar26)]]</para><blockTable colWidths="178.0,124.0,179.0" style="Tableau"><tr><td><para style="P40">[[ company.name ]]</para><para style="P39">au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P35">Bilan</para></td><td><para style="P36">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P33"><font color="white"> </font></para></td><td><para style="P31"><font color="white"> </font></para></td><td><para style="P34">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P38">ACTIF</para><blockTable colWidths="200.0,99.0,100.0,83.0" style="Table3"><tr><td><para style="P8"><font color="white"> </font></para></td><td><para style="P9">Brut</para></td><td><para style="P9">Amortissements et d&#xE9;pr&#xE9;ciations</para></td><td><para style="P9">Net</para></td></tr><tr><td><para style="P16"><font face="Times-Roman" size="6.0"/><font face="Times-Roman" size="7.0">C</font><font face="Times-Roman" size="7.0">apital souscrit - non appel&#xE9;</font></para></td><td><para style="P12">[[bavar1]]</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32">[[bavar1]]</para></td></tr><tr><td><para style="P17">ACTIF IMMOBILIS&#xC9;</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">IMMOBILISATIONS INCORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais d'&#xE9;tablissement</para></td><td><para style="P12">[[bavar2]]</para></td><td><para style="P12">[[-bavar2b]]</para></td><td><para style="P32">[[bavar2+bavar2b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais de recherche et de d&#xE9;veloppement</para></td><td><para style="P12">[[bavar3]]</para></td><td><para style="P12">[[-bavar3b]]</para></td><td><para style="P32">[[bavar3+bavar3b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Concessions, brevets, licences,..., droits et valeurs similaires</para></td><td><para style="P12">[[bavar4]]</para></td><td><para style="P12">[[-bavar4b]]</para></td><td><para style="P32">[[bavar4+bavar4b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Fonds commercial</para></td><td><para style="P12">[[bavar5]]</para></td><td><para style="P12">[[-bavar5b]]</para></td><td><para style="P32">[[bavar5+bavar5b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar6]]</para></td><td><para style="P12">[[-bavar6b]]</para></td><td><para style="P32">[[bavar6+bavar6b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Immobilisations incorporelles en cours</para></td><td><para style="P12">[[bavar7]]</para></td><td><para style="P12">[[-bavar7b]]</para></td><td><para style="P32">[[bavar7+bavar7b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Avances et acomptes</para></td><td><para style="P12">[[bavar8]]</para></td><td><para style="P15"><font color="white"> </font></para></td><td><para style="P32">[[bavar8]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS CORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>errains</para></td><td><para style="P12">[[bavar9]]</para></td><td><para style="P12">[[-bavar9b]]</para></td><td><para style="P32">[[bavar9+bavar9b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>onstructions</para></td><td><para style="P12">[[bavar10]]</para></td><td><para style="P12">[[-bavar10b]]</para></td><td><para style="P32">[[bavar10+bavar10b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>nstallations techniques,mat&#xE9;riel et outillage</para></td><td><para style="P12">[[bavar11]]</para></td><td><para style="P12">[[-bavar11b]]</para></td><td><para style="P32">[[bavar11+bavar11b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres </para></td><td><para style="P12">[[bavar12]]</para></td><td><para style="P12">[[-bavar12b]]</para></td><td><para style="P32">[[bavar12+bavar12b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>mmobilisations corporelles en cours</para></td><td><para style="P12">[[bavar13]]</para></td><td><para style="P12">[[-bavar13b]]</para></td><td><para style="P32">[[bavar13+bavar13b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>vances et acomptes</para></td><td><para style="P12">[[bavar14]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar14]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS FINANCI&#xC9;RES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>articipations</para></td><td><para style="P12">[[bavar15]]</para></td><td><para style="P12">[[-bavar15b]]</para></td><td><para style="P32">[[bavar15+bavar15b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>r&#xE9;ances rattach&#xE9;es &#xE0; des participations</para></td><td><para style="P12">[[bavar16]]</para></td><td><para style="P12">[[-bavar16b]]</para></td><td><para style="P32">[[bavar16+bavar16b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>itres immobilis&#xE9;s de l'activit&#xE9; de portefeuille</para></td><td><para style="P12">[[bavar17]]</para></td><td><para style="P12">[[-bavar17b]]</para></td><td><para style="P32">[[bavar17+bavar17b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres titres immobilis&#xE9;s</para></td><td><para style="P12">[[bavar18]]</para></td><td><para style="P12">[[-bavar18b]]</para></td><td><para style="P32">[[bavar18+bavar18b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>r&#xEA;ts</para></td><td><para style="P12">[[bavar19]]</para></td><td><para style="P12">[[-bavar19b]]</para></td><td><para style="P32">[[bavar19+bavar19b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres</para></td><td><para style="P12">[[bavar20]]</para></td><td><para style="P12">[[-bavar20b]]</para></td><td><para style="P32">[[bavar20+bavar20b]]</para></td></tr><tr><td><para style="P10">TOTAL I</para></td><td><para style="P5">[[at1a]]</para></td><td><para style="P5">[[-at1b]]</para></td><td><para style="P32">[[at1]]</para></td></tr><tr><td><para style="P6">ACTIF CIRCULANT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">STOCK EN COURS</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>ati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P12">[[bavar21]]</para></td><td><para style="P12">[[-bavar21b]]</para></td><td><para style="P32">[[bavar21+bavar21b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">E</font>n-cours de production [biens et services]</para></td><td><para style="P12">[[bavar22]]</para></td><td><para style="P12">[[-bavar22b]]</para></td><td><para style="P32">[[bavar22+bavar22b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>roduits interm&#xE9;diaires et finis</para></td><td><para style="P12">[[bavar23]]</para></td><td><para style="P12">[[-bavar23b]]</para></td><td><para style="P32">[[bavar23+bavar23b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>archandises</para></td><td><para style="P12">[[bavar24]]</para></td><td><para style="P12">[[-bavar24b]]</para></td><td><para style="P32">[[bavar24+bavar24b]]</para></td></tr><tr><td><para style="P13">Avances et acomptes vers&#xE9;s sur commandes</para></td><td><para style="P12">[[bavar25]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar25]]</para></td></tr><tr><td><para style="P11">CR&#xC9;ANCES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Cr&#xE9;ances clients et comptes rattach&#xE9;s</para></td><td><para style="P12">[[bavar26]]</para></td><td><para style="P12">[[-bavar26b]]</para></td><td><para style="P32">[[bavar26+bavar26b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar27]]</para></td><td><para style="P12">[[-bavar27b]]</para></td><td><para style="P32">[[bavar27+bavar27b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Capital souscrit - appel&#xE9; , non vers&#xE9;</para></td><td><para style="P12">[[bavar28]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar28]]</para></td></tr><tr><td><para style="P18">VALEURS MOBILI&#xC8;RES DE PLACEMENT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19">Actions propres</para></td><td><para style="P12">[[bavar29]]</para></td><td><para style="P12">[[-bavar29b]]</para></td><td><para style="P32">[[bavar29+bavar29b]]</para></td></tr><tr><td><para style="P19">Autres titres</para></td><td><para style="P12">[[bavar30]]</para></td><td><para style="P12">[[-bavar30b]]</para></td><td><para style="P32">[[bavar30+bavar30b]]</para></td></tr><tr><td><para style="P19">Instruments de tr&#xE9;sorerie</para></td><td><para style="P12">[[bavar31]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar31]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman">D</font>isponibilit&#xE9;s</para></td><td><para style="P12">[[bavar32]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar32]]</para></td></tr><tr><td><para style="P19">Charges constat&#xE9;s d'avance</para></td><td><para style="P12">[[bavar33]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar33]]</para></td></tr><tr><td><para style="P10">TOTAL II</para></td><td><para style="P5">[[at2a]]</para></td><td><para style="P5">[[-at2b]]</para></td><td><para style="P32">[[at2]]</para></td></tr><tr><td><para style="P12">Charges &#xE0; r&#xE9;partir sur plusieurs exercices <font face="Times-Roman">( III )</font></para></td><td><para style="P12">[[bavar34]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar34]]</para></td></tr><tr><td><para style="P12">Primes de remboursement des emprunts <font face="Times-Roman">( IV )</font></para></td><td><para style="P12">[[bavar35]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar35]]</para></td></tr><tr><td><para style="P12">&#xC9;carts de conversion actif <font face="Times-Roman">( V )</font></para></td><td><para style="P12">[[bavar36]]</para></td><td><para style="P2"><font color="white"> </font></para></td><td><para style="P32">[[bavar36]]</para></td></tr><tr><td><para style="P7"><font face="Times-Roman" size="7.0">TOTAL ACTIF ( </font><font face="Times-Bold" size="7.0">I + II + III + IV + V</font><font face="Times-Roman" size="7.0"> )</font></para></td><td><para style="P5">[[at1a+at2a]]</para></td><td><para style="P5">[[-at1b-at2b]]</para></td><td><para style="P32">[[actif]]</para></td></tr></blockTable><para style="P37">PASSIF</para><blockTable colWidths="211.0,270.0" style="Tableau3"><tr><td><para style="P4">CAPITAUX PROPRES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P28">Capital [dont vers&#xE9;...]</para></td><td><para style="P3">[[bpvar1]]</para></td></tr><tr><td><para style="P28">Primes d'&#xE9;mission, de fusion, d'apport</para></td><td><para style="P3">[[bpvar2]]</para></td></tr><tr><td><para style="P22">&#xC9;carts de r&#xE9;&#xE9;valuation</para></td><td><para style="P3">[[bpvar3]]</para></td></tr><tr><td><para style="P22">&#xC9;cart d'&#xE9;quivalence</para></td><td><para style="P3">[[bpvar4]]</para></td></tr><tr><td><para style="P26">R&#xC9;SERVES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">R&#xE9;serve l&#xE9;gale</para></td><td><para style="P3">[[bpvar5]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves statutaires ou contractuelles</para></td><td><para style="P3">[[bpvar6]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar7]]</para></td></tr><tr><td><para style="P28">Autres r&#xE9;serves</para></td><td><para style="P3">[[bpvar8]]</para></td></tr><tr><td><para style="P28">Report &#xE0; nouveau</para></td><td><para style="P3">[[bpvar9]]</para></td></tr><tr><td><para style="P25">R&#xC9;SULTAT DE L'EXERCICE [b&#xE9;n&#xE9;fice ou perte]</para></td><td><para style="P3">[[bpvar10]]</para></td></tr><tr><td><para style="P23">Subventions d'investissement</para></td><td><para style="P3">[[bpvar11]]</para></td></tr><tr><td><para style="P23">Provisions r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar12]]</para></td></tr><tr><td><para style="P27">TOTAL I</para></td><td><para style="P3">[[pt1]]</para></td></tr><tr><td><para style="P29">PROVISIONS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">Provisions pour risques</para></td><td><para style="P3">[[bpvar13]]</para></td></tr><tr><td><para style="P22">Provisions pour charges</para></td><td><para style="P3">[[bpvar14]]</para></td></tr><tr><td><para style="P27">TOTAL II</para></td><td><para style="P3">[[pt2]]</para></td></tr><tr><td><para style="P30">DETTES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P21">Emprunts obligataires convertibles</para></td><td><para style="P3">[[bpvar15]]</para></td></tr><tr><td><para style="P21">Autres emprunts obligataires</para></td><td><para style="P3">[[bpvar16]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes aupr&#xE8;s des &#xE9;tablissements de cr&#xE9;dit</para></td><td><para style="P3">[[bpvar17]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes financi&#xE8;res diverses</para></td><td><para style="P3">[[bpvar18]]</para></td></tr><tr><td><para style="P21">Avances et acomptes re&#xE7;us sur commandes en cours</para></td><td><para style="P3">[[bpvar19]]</para></td></tr><tr><td><para style="P21">Dettes fournisseurs et comptes rattach&#xE9;s </para></td><td><para style="P3">[[bpvar20]]</para></td></tr><tr><td><para style="P21">Dettes fiscales et sociales</para></td><td><para style="P3">[[bpvar21]]</para></td></tr><tr><td><para style="P21">Dettes sur immobilisations et comptes rattach&#xE9;s</para></td><td><para style="P3">[[bpvar22]]</para></td></tr><tr><td><para style="P21">Autres dettes</para></td><td><para style="P3">[[bpvar23]]</para></td></tr><tr><td><para style="P21">Instruments de tr&#xE9;sorerie</para></td><td><para style="P3">[[bpvar24]]</para></td></tr><tr><td><para style="P21">Produits constat&#xE9;s d'avance</para></td><td><para style="P3">[[bpvar25]]</para></td></tr><tr><td><para style="P20">TOTAL III</para></td><td><para style="P3">[[pt3]]</para></td></tr><tr><td><para style="P24">&#xC9;carts de conversion passif <font face="Times-Roman">( IV )</font></para></td><td><para style="P3">[[bpvar26]]</para></td></tr><tr><td><para style="P27">TOTAL G&#xC9;N&#xC9;RAL (I + II + III + IV)</para></td><td><para style="P3">[[passif]]</para></td></tr><tr><td><para style="P27">ACTIF - PASSIF</para></td><td><para style="P3">[[round(actif-passif,2)]]</para></td></tr></blockTable><para style="P41"><font color="white"> </font></para><para style="P42"><font face="Times-Roman" size="13.0">[[ abs(bpcheck)&lt;0.0001 and removeParentNode('para') ]] Attention, pour que votre bilan soit correct, vous devez solder les comptes 120 ou 129 (R&#xE9;sultat de l'exercice pr&#xE9;c&#xE9;dant) dans un compte de report &#xE0; nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez </font>vous sur votre structure juridique et son fonctionnement comptable.</para></story></document>
+<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Bilan" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Table3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P31" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P32" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P33" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P34" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P35" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P36" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P37" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P38" fontName="Times-Bold" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P39" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P40" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P41" fontName="Times-Roman"/><paraStyle name="P42" fontName="Times-Roman" fontSize="13.0" leading="16"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="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="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P31">[[ _load('bilan',data['form'])]]</para><para style="P31">[[ _set_variable('at1a',bavar1+bavar2+bavar3+bavar4+bavar5+bavar6+bavar7+bavar8+bavar9+bavar10+bavar11+bavar12+bavar13+bavar14+bavar15+bavar16+bavar17+bavar18+bavar19+bavar20)]]</para><para style="P31">[[ _set_variable('at1b', bavar2b+bavar3b+bavar4b+bavar5b+bavar6b+bavar7b+bavar9b+bavar10b+bavar11b+bavar12b+bavar13b+bavar15b+ bavar16b+bavar17b+bavar18b+bavar19b+bavar20b)]]</para><para style="P31">[[ _set_variable('at1', at1a+at1b)]]</para><para style="P31">[[ _set_variable('at2a', bavar21+bavar22+bavar23+bavar24+bavar25+bavar26+bavar27+bavar28+bavar29+bavar30+bavar31+bavar32+bavar33)]]</para><para style="P31">[[ _set_variable('at2b', bavar21b+bavar22b+bavar23b+bavar24b+bavar26b+bavar27b+bavar29b+bavar30b)]]</para><para style="P31">[[ _set_variable('at2', at2a+at2b)]]</para><para style="P31">[[ _set_variable('actif', at1+at2+bavar34+bavar35+bavar36)]]</para><para style="P31">[[ _set_variable('pt1', bpvar1+bpvar2+bpvar3+bpvar4+bpvar5+bpvar6+bpvar7+bpvar8+bpvar9+bpvar10+bpvar11+bpvar12)]]</para><para style="P31">[[ _set_variable('pt2', bpvar13+bpvar14)]]</para><para style="P31">[[ _set_variable('pt3', bpvar15+bpvar16+bpvar17+bpvar18+bpvar19+bpvar20+bpvar21+bpvar22+bpvar23+bpvar24+bpvar25)]]</para><para style="P31">[[ _set_variable('passif', pt1+pt2+pt3+bpvar26)]]</para><blockTable colWidths="178.0,124.0,179.0" style="Tableau"><tr><td><para style="P40">[[ company.name ]]</para><para style="P39">au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P35">Bilan</para></td><td><para style="P36">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P33"><font color="white"> </font></para></td><td><para style="P31"><font color="white"> </font></para></td><td><para style="P34">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P38">ACTIF</para><blockTable colWidths="200.0,99.0,100.0,83.0" style="Table3"><tr><td><para style="P8"><font color="white"> </font></para></td><td><para style="P9">Brut</para></td><td><para style="P9">Amortissements et d&#xE9;pr&#xE9;ciations</para></td><td><para style="P9">Net</para></td></tr><tr><td><para style="P16"><font face="Times-Roman" size="6.0"/><font face="Times-Roman" size="7.0">C</font><font face="Times-Roman" size="7.0">apital souscrit - non appel&#xE9;</font></para></td><td><para style="P12">[[bavar1]]</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32">[[bavar1]]</para></td></tr><tr><td><para style="P17">ACTIF IMMOBILIS&#xC9;</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">IMMOBILISATIONS INCORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais d'&#xE9;tablissement</para></td><td><para style="P12">[[bavar2]]</para></td><td><para style="P12">[[-bavar2b]]</para></td><td><para style="P32">[[bavar2+bavar2b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais de recherche et de d&#xE9;veloppement</para></td><td><para style="P12">[[bavar3]]</para></td><td><para style="P12">[[-bavar3b]]</para></td><td><para style="P32">[[bavar3+bavar3b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Concessions, brevets, licences,..., droits et valeurs similaires</para></td><td><para style="P12">[[bavar4]]</para></td><td><para style="P12">[[-bavar4b]]</para></td><td><para style="P32">[[bavar4+bavar4b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Fonds commercial</para></td><td><para style="P12">[[bavar5]]</para></td><td><para style="P12">[[-bavar5b]]</para></td><td><para style="P32">[[bavar5+bavar5b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar6]]</para></td><td><para style="P12">[[-bavar6b]]</para></td><td><para style="P32">[[bavar6+bavar6b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Immobilisations incorporelles en cours</para></td><td><para style="P12">[[bavar7]]</para></td><td><para style="P12">[[-bavar7b]]</para></td><td><para style="P32">[[bavar7+bavar7b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Avances et acomptes</para></td><td><para style="P12">[[bavar8]]</para></td><td><para style="P15"><font color="white"> </font></para></td><td><para style="P32">[[bavar8]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS CORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>errains</para></td><td><para style="P12">[[bavar9]]</para></td><td><para style="P12">[[-bavar9b]]</para></td><td><para style="P32">[[bavar9+bavar9b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>onstructions</para></td><td><para style="P12">[[bavar10]]</para></td><td><para style="P12">[[-bavar10b]]</para></td><td><para style="P32">[[bavar10+bavar10b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>nstallations techniques,mat&#xE9;riel et outillage</para></td><td><para style="P12">[[bavar11]]</para></td><td><para style="P12">[[-bavar11b]]</para></td><td><para style="P32">[[bavar11+bavar11b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres </para></td><td><para style="P12">[[bavar12]]</para></td><td><para style="P12">[[-bavar12b]]</para></td><td><para style="P32">[[bavar12+bavar12b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>mmobilisations corporelles en cours</para></td><td><para style="P12">[[bavar13]]</para></td><td><para style="P12">[[-bavar13b]]</para></td><td><para style="P32">[[bavar13+bavar13b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>vances et acomptes</para></td><td><para style="P12">[[bavar14]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar14]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS FINANCI&#xC9;RES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>articipations</para></td><td><para style="P12">[[bavar15]]</para></td><td><para style="P12">[[-bavar15b]]</para></td><td><para style="P32">[[bavar15+bavar15b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>r&#xE9;ances rattach&#xE9;es &#xE0; des participations</para></td><td><para style="P12">[[bavar16]]</para></td><td><para style="P12">[[-bavar16b]]</para></td><td><para style="P32">[[bavar16+bavar16b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>itres immobilis&#xE9;s de l'activit&#xE9; de portefeuille</para></td><td><para style="P12">[[bavar17]]</para></td><td><para style="P12">[[-bavar17b]]</para></td><td><para style="P32">[[bavar17+bavar17b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres titres immobilis&#xE9;s</para></td><td><para style="P12">[[bavar18]]</para></td><td><para style="P12">[[-bavar18b]]</para></td><td><para style="P32">[[bavar18+bavar18b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>r&#xEA;ts</para></td><td><para style="P12">[[bavar19]]</para></td><td><para style="P12">[[-bavar19b]]</para></td><td><para style="P32">[[bavar19+bavar19b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres</para></td><td><para style="P12">[[bavar20]]</para></td><td><para style="P12">[[-bavar20b]]</para></td><td><para style="P32">[[bavar20+bavar20b]]</para></td></tr><tr><td><para style="P10">TOTAL I</para></td><td><para style="P5">[[at1a]]</para></td><td><para style="P5">[[-at1b]]</para></td><td><para style="P32">[[at1]]</para></td></tr><tr><td><para style="P6">ACTIF CIRCULANT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">STOCK EN COURS</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>ati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P12">[[bavar21]]</para></td><td><para style="P12">[[-bavar21b]]</para></td><td><para style="P32">[[bavar21+bavar21b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">E</font>n-cours de production [biens et services]</para></td><td><para style="P12">[[bavar22]]</para></td><td><para style="P12">[[-bavar22b]]</para></td><td><para style="P32">[[bavar22+bavar22b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>roduits interm&#xE9;diaires et finis</para></td><td><para style="P12">[[bavar23]]</para></td><td><para style="P12">[[-bavar23b]]</para></td><td><para style="P32">[[bavar23+bavar23b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>archandises</para></td><td><para style="P12">[[bavar24]]</para></td><td><para style="P12">[[-bavar24b]]</para></td><td><para style="P32">[[bavar24+bavar24b]]</para></td></tr><tr><td><para style="P13">Avances et acomptes vers&#xE9;s sur commandes</para></td><td><para style="P12">[[bavar25]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar25]]</para></td></tr><tr><td><para style="P11">CR&#xC9;ANCES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Cr&#xE9;ances clients et comptes rattach&#xE9;s</para></td><td><para style="P12">[[bavar26]]</para></td><td><para style="P12">[[-bavar26b]]</para></td><td><para style="P32">[[bavar26+bavar26b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar27]]</para></td><td><para style="P12">[[-bavar27b]]</para></td><td><para style="P32">[[bavar27+bavar27b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Capital souscrit - appel&#xE9; , non vers&#xE9;</para></td><td><para style="P12">[[bavar28]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar28]]</para></td></tr><tr><td><para style="P18">VALEURS MOBILI&#xC8;RES DE PLACEMENT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19">Actions propres</para></td><td><para style="P12">[[bavar29]]</para></td><td><para style="P12">[[-bavar29b]]</para></td><td><para style="P32">[[bavar29+bavar29b]]</para></td></tr><tr><td><para style="P19">Autres titres</para></td><td><para style="P12">[[bavar30]]</para></td><td><para style="P12">[[-bavar30b]]</para></td><td><para style="P32">[[bavar30+bavar30b]]</para></td></tr><tr><td><para style="P19">Instruments de tr&#xE9;sorerie</para></td><td><para style="P12">[[bavar31]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar31]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman">D</font>isponibilit&#xE9;s</para></td><td><para style="P12">[[bavar32]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar32]]</para></td></tr><tr><td><para style="P19">Charges constat&#xE9;s d'avance</para></td><td><para style="P12">[[bavar33]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar33]]</para></td></tr><tr><td><para style="P10">TOTAL II</para></td><td><para style="P5">[[at2a]]</para></td><td><para style="P5">[[-at2b]]</para></td><td><para style="P32">[[at2]]</para></td></tr><tr><td><para style="P12">Charges &#xE0; r&#xE9;partir sur plusieurs exercices <font face="Times-Roman">( III )</font></para></td><td><para style="P12">[[bavar34]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar34]]</para></td></tr><tr><td><para style="P12">Primes de remboursement des emprunts <font face="Times-Roman">( IV )</font></para></td><td><para style="P12">[[bavar35]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar35]]</para></td></tr><tr><td><para style="P12">&#xC9;carts de conversion actif <font face="Times-Roman">( V )</font></para></td><td><para style="P12">[[bavar36]]</para></td><td><para style="P2"><font color="white"> </font></para></td><td><para style="P32">[[bavar36]]</para></td></tr><tr><td><para style="P7"><font face="Times-Roman" size="7.0">TOTAL ACTIF ( </font><font face="Times-Bold" size="7.0">I + II + III + IV + V</font><font face="Times-Roman" size="7.0"> )</font></para></td><td><para style="P5">[[at1a+at2a]]</para></td><td><para style="P5">[[-at1b-at2b]]</para></td><td><para style="P32">[[actif]]</para></td></tr></blockTable><para style="P37">PASSIF</para><blockTable colWidths="211.0,270.0" style="Tableau3"><tr><td><para style="P4">CAPITAUX PROPRES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P28">Capital [dont vers&#xE9;...]</para></td><td><para style="P3">[[bpvar1]]</para></td></tr><tr><td><para style="P28">Primes d'&#xE9;mission, de fusion, d'apport</para></td><td><para style="P3">[[bpvar2]]</para></td></tr><tr><td><para style="P22">&#xC9;carts de r&#xE9;&#xE9;valuation</para></td><td><para style="P3">[[bpvar3]]</para></td></tr><tr><td><para style="P22">&#xC9;cart d'&#xE9;quivalence</para></td><td><para style="P3">[[bpvar4]]</para></td></tr><tr><td><para style="P26">R&#xC9;SERVES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">R&#xE9;serve l&#xE9;gale</para></td><td><para style="P3">[[bpvar5]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves statutaires ou contractuelles</para></td><td><para style="P3">[[bpvar6]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar7]]</para></td></tr><tr><td><para style="P28">Autres r&#xE9;serves</para></td><td><para style="P3">[[bpvar8]]</para></td></tr><tr><td><para style="P28">Report &#xE0; nouveau</para></td><td><para style="P3">[[bpvar9]]</para></td></tr><tr><td><para style="P25">R&#xC9;SULTAT DE L'EXERCICE [b&#xE9;n&#xE9;fice ou perte]</para></td><td><para style="P3">[[bpvar10]]</para></td></tr><tr><td><para style="P23">Subventions d'investissement</para></td><td><para style="P3">[[bpvar11]]</para></td></tr><tr><td><para style="P23">Provisions r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar12]]</para></td></tr><tr><td><para style="P27">TOTAL I</para></td><td><para style="P3">[[pt1]]</para></td></tr><tr><td><para style="P29">PROVISIONS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">Provisions pour risques</para></td><td><para style="P3">[[bpvar13]]</para></td></tr><tr><td><para style="P22">Provisions pour charges</para></td><td><para style="P3">[[bpvar14]]</para></td></tr><tr><td><para style="P27">TOTAL II</para></td><td><para style="P3">[[pt2]]</para></td></tr><tr><td><para style="P30">DETTES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P21">Emprunts obligataires convertibles</para></td><td><para style="P3">[[bpvar15]]</para></td></tr><tr><td><para style="P21">Autres emprunts obligataires</para></td><td><para style="P3">[[bpvar16]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes aupr&#xE8;s des &#xE9;tablissements de cr&#xE9;dit</para></td><td><para style="P3">[[bpvar17]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes financi&#xE8;res diverses</para></td><td><para style="P3">[[bpvar18]]</para></td></tr><tr><td><para style="P21">Avances et acomptes re&#xE7;us sur commandes en cours</para></td><td><para style="P3">[[bpvar19]]</para></td></tr><tr><td><para style="P21">Dettes fournisseurs et comptes rattach&#xE9;s </para></td><td><para style="P3">[[bpvar20]]</para></td></tr><tr><td><para style="P21">Dettes fiscales et sociales</para></td><td><para style="P3">[[bpvar21]]</para></td></tr><tr><td><para style="P21">Dettes sur immobilisations et comptes rattach&#xE9;s</para></td><td><para style="P3">[[bpvar22]]</para></td></tr><tr><td><para style="P21">Autres dettes</para></td><td><para style="P3">[[bpvar23]]</para></td></tr><tr><td><para style="P21">Instruments de tr&#xE9;sorerie</para></td><td><para style="P3">[[bpvar24]]</para></td></tr><tr><td><para style="P21">Produits constat&#xE9;s d'avance</para></td><td><para style="P3">[[bpvar25]]</para></td></tr><tr><td><para style="P20">TOTAL III</para></td><td><para style="P3">[[pt3]]</para></td></tr><tr><td><para style="P24">&#xC9;carts de conversion passif <font face="Times-Roman">( IV )</font></para></td><td><para style="P3">[[bpvar26]]</para></td></tr><tr><td><para style="P27">TOTAL G&#xC9;N&#xC9;RAL (I + II + III + IV)</para></td><td><para style="P3">[[passif]]</para></td></tr><tr><td><para style="P27">ACTIF - PASSIF</para></td><td><para style="P3">[[round(actif-passif,2)]]</para></td></tr></blockTable><para style="P41"><font color="white"> </font></para><para style="P42"><font face="Times-Roman" size="13.0">[[ abs(bpcheck)&lt;0.0001 and removeParentNode('para') ]] Attention, pour que votre bilan soit correct, vous devez solder les comptes 120 ou 129 (R&#xE9;sultat de l'exercice pr&#xE9;c&#xE9;dant) dans un compte de report &#xE0; nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez </font>vous sur votre structure juridique et son fonctionnement comptable.</para></story></document>
 
diff --git a/addons/l10n_fr/report/compute_resultant_report.rml b/addons/l10n_fr/report/compute_resultant_report.rml
index 9d3693f0b52..de59b0201ee 100644
--- a/addons/l10n_fr/report/compute_resultant_report.rml
+++ b/addons/l10n_fr/report/compute_resultant_report.rml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Compte de resultat" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" fontName="Times-Roman"/><paraStyle name="P25" fontName="Times-Roman"/><paraStyle name="P26" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P27" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P28" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P29" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="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="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P19">[[ _load('cdr',data['form'])]]</para><para style="P19">[[ _set_variable('ct1', cdrc1+cdrc2+cdrc3+cdrc4+cdrc5+cdrc6+cdrc7+cdrc8+cdrc9+cdrc10+cdrc11+cdrc12+cdrc13+cdrc14+cdrc15)]]</para><para style="P19">[[ _set_variable('ct3', cdrc17+cdrc18+cdrc19+cdrc20)]]</para><para style="P19">[[ _set_variable('ct4', cdrc21+cdrc22+cdrc23)]]</para><para style="P19">[[ _set_variable('charges', ct1+cdrc16+ct3+ct4+cdrc24+cdrc25)]]</para><para style="P19">[[ _set_variable('pta', cdrp1+cdrp2)]]</para><para style="P19">[[ _set_variable('ptb', cdrp3+cdrp4+cdrp5+cdrp6+cdrp7)]]</para><para style="P19">[[ _set_variable('pt1', pta+ptb)]]</para><para style="P19">[[ _set_variable('pt3', cdrp9+cdrp10+cdrp11+cdrp12+cdrp13+cdrp14)]]</para><para style="P19">[[ _set_variable('pt4', cdrp15+cdrp16+cdrp17)]]</para><para style="P19">[[ _set_variable('produits', pt1+cdrp8+pt3+pt4)]]</para><blockTable colWidths="165.0,160.0,156.0" style="Tableau"><tr><td><para style="P28">[[ company.name ]]</para><para style="P26">p&#xE9;riode du [[ time.strftime('%d-%m-%Y',time.strptime(date_start,'%Y-%m-%d'))]] au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P22">Compte de r&#xE9;sultat</para></td><td><para style="P23">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P20"><font color="white"> </font></para></td><td><para style="P19"><font color="white"> </font></para></td><td><para style="P21">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P27"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau3"><tr><td><para style="P3">CHARGES ( hors taxes )</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">CHARGES D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Achat de marchandises</para></td><td><para style="P2">[[cdrc1]]</para></td></tr><tr><td><para style="P10">Variation des stocks</para></td><td><para style="P2">[[cdrc2]]</para></td></tr><tr><td><para style="P10">Achats de mati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P2">[[cdrc3]]</para></td></tr><tr><td><para style="P17">Variation des stocks</para></td><td><para style="P2">[[cdrc4]]</para></td></tr><tr><td><para style="P10">Autres achats et charges externes</para></td><td><para style="P2">[[cdrc5]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail mobilier</para></td><td><para style="P2">[[cdrc6]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail immobilier</para></td><td><para style="P2">[[cdrc7]]</para></td></tr><tr><td><para style="P10">Imp&#xF4;ts, taxes et versements assimil&#xE9;s</para></td><td><para style="P2">[[cdrc8]]</para></td></tr><tr><td><para style="P10">Salaires et traitements</para></td><td><para style="P2">[[cdrc9]]</para></td></tr><tr><td><para style="P17">Charges sociales</para></td><td><para style="P2">[[cdrc10]]</para></td></tr><tr><td><para style="P17">Dotation aux amortissements et aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux amortissements</para></td><td><para style="P2">[[cdrc11]]</para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc12]]</para></td></tr><tr><td><para style="P12">Sur actif circulant : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc13]]</para></td></tr><tr><td><para style="P12">Dotations aux provisions</para></td><td><para style="P2">[[cdrc14]]</para></td></tr><tr><td><para style="P12">Autres charges</para></td><td><para style="P2">[[cdrc15]]</para></td></tr><tr><td><para style="P16">TOTAL I</para></td><td><para style="P2">[[ct1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun ( II )</para></td><td><para style="P2">[[cdrc16]]</para></td></tr><tr><td><para style="P15">CHARGES FINANCI&#xC8;RES</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P10">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc17]]</para></td></tr><tr><td><para style="P10">Int&#xE9;r&#xEA;ts et charges assimil&#xE9;es</para></td><td><para style="P2">[[cdrc18]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences n&#xE9;gatives de change</para></td><td><para style="P2">[[cdrc19]]</para></td></tr><tr><td><para style="P10">Charges nettes sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrc20]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[ct3]]</para></td></tr><tr><td><para style="P18">CHARGES EXCEPTIONNELLES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrc21]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrc22]]</para></td></tr><tr><td><para style="P6">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc23]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[ct4]]</para></td></tr><tr><td><para style="P8">Participation des salari&#xE9;s aux r&#xE9;sultats <font face="Times-Roman" size="7.0">( V )</font></para></td><td><para style="P2">[[cdrc24]]</para></td></tr><tr><td><para style="P9">Imp&#xF4;ts sur les b&#xE9;n&#xE9;fices <font face="Times-Roman" size="7.0">( VI )</font></para></td><td><para style="P2">[[cdrc25]]</para></td></tr><tr><td><para style="P16">TOTAL CHARGES ( I + II + III <font face="Times-Bold" size="7.0">+ IV+ V+ VI</font> )</para></td><td><para style="P2">[[charges]]</para></td></tr></blockTable><para style="P24"><font color="white"> </font></para><pageBreak/><para style="P25"><font color="white"> </font></para><para style="P24"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau1"><tr><td><para style="P3">PRODUITS (hors taxes)</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">PRODUITS D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Vente de marchandises</para></td><td><para style="P2">[[cdrp1]]</para></td></tr><tr><td><para style="P10">Production vendue [biens et services]</para></td><td><para style="P2">[[cdrp2]]</para></td></tr><tr><td><para style="P13">Sous-total A - Montant net du chiffre d'affaires</para></td><td><para style="P2">[[pta]]</para></td></tr><tr><td><para style="P17">Production stock&#xE9;e</para></td><td><para style="P2">[[cdrp3]]</para></td></tr><tr><td><para style="P10">Production immobilis&#xE9;e</para></td><td><para style="P2">[[cdrp4]]</para></td></tr><tr><td><para style="P10">Subventions d'exploitation</para></td><td><para style="P2">[[cdrp5]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations (et amortissements) et transferts de charges</para></td><td><para style="P2">[[cdrp6]]</para></td></tr><tr><td><para style="P10">Autres produits</para></td><td><para style="P2">[[cdrp7]]</para></td></tr><tr><td><para style="P13">Sous-total B</para></td><td><para style="P2">[[ptb]]</para></td></tr><tr><td><para style="P14">TOTAL I ( A + B )</para></td><td><para style="P2">[[pt1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun (II)</para></td><td><para style="P2">[[cdrp8]]</para></td></tr><tr><td><para style="P15">PRODUITS FINANCIERS</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P11">De participation</para></td><td><para style="P2">[[cdrp9]]</para></td></tr><tr><td><para style="P11">D'autres valeurs mobili&#xE8;res et cr&#xE9;ances de l'actif immobilis&#xE9;</para></td><td><para style="P2">[[cdrp10]]</para></td></tr><tr><td><para style="P10">Autres int&#xE9;r&#xEA;ts et produits assimil&#xE9;s</para></td><td><para style="P2">[[cdrp11]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp12]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences positives de change</para></td><td><para style="P2">[[cdrp13]]</para></td></tr><tr><td><para style="P10">Produits nets sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrp14]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[pt3]]</para></td></tr><tr><td><para style="P18">PRODUITS EXCEPTIONNELS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrp15]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrp16]]</para></td></tr><tr><td><para style="P6">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp17]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[pt4]]</para></td></tr><tr><td><para style="P16">TOTAL DES PRODUITS ( I + II + III + IV )</para></td><td><para style="P2">[[produits]]</para></td></tr><tr><td><para style="P16">PRODUITS - CHARGES</para></td><td><para style="P2">[[produits-charges]]</para></td></tr></blockTable><para style="Standard"><font color="white"> </font></para></story></document>
+<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Compte de resultat" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" fontName="Times-Roman"/><paraStyle name="P25" fontName="Times-Roman"/><paraStyle name="P26" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P27" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P28" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P29" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="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="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P19">[[ _load('cdr',data['form'])]]</para><para style="P19">[[ _set_variable('ct1', cdrc1+cdrc2+cdrc3+cdrc4+cdrc5+cdrc6+cdrc7+cdrc8+cdrc9+cdrc10+cdrc11+cdrc12+cdrc13+cdrc14+cdrc15)]]</para><para style="P19">[[ _set_variable('ct3', cdrc17+cdrc18+cdrc19+cdrc20)]]</para><para style="P19">[[ _set_variable('ct4', cdrc21+cdrc22+cdrc23)]]</para><para style="P19">[[ _set_variable('charges', ct1+cdrc16+ct3+ct4+cdrc24+cdrc25)]]</para><para style="P19">[[ _set_variable('pta', cdrp1+cdrp2)]]</para><para style="P19">[[ _set_variable('ptb', cdrp3+cdrp4+cdrp5+cdrp6+cdrp7)]]</para><para style="P19">[[ _set_variable('pt1', pta+ptb)]]</para><para style="P19">[[ _set_variable('pt3', cdrp9+cdrp10+cdrp11+cdrp12+cdrp13+cdrp14)]]</para><para style="P19">[[ _set_variable('pt4', cdrp15+cdrp16+cdrp17)]]</para><para style="P19">[[ _set_variable('produits', pt1+cdrp8+pt3+pt4)]]</para><blockTable colWidths="165.0,160.0,156.0" style="Tableau"><tr><td><para style="P28">[[ company.name ]]</para><para style="P26">p&#xE9;riode du [[ time.strftime('%d-%m-%Y',time.strptime(date_start,'%Y-%m-%d'))]] au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P22">Compte de r&#xE9;sultat</para></td><td><para style="P23">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P20"><font color="white"> </font></para></td><td><para style="P19"><font color="white"> </font></para></td><td><para style="P21">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P27"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau3"><tr><td><para style="P3">CHARGES ( hors taxes )</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">CHARGES D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Achat de marchandises</para></td><td><para style="P2">[[cdrc1]]</para></td></tr><tr><td><para style="P10">Variation des stocks</para></td><td><para style="P2">[[cdrc2]]</para></td></tr><tr><td><para style="P10">Achats de mati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P2">[[cdrc3]]</para></td></tr><tr><td><para style="P17">Variation des stocks</para></td><td><para style="P2">[[cdrc4]]</para></td></tr><tr><td><para style="P10">Autres achats et charges externes</para></td><td><para style="P2">[[cdrc5]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail mobilier</para></td><td><para style="P2">[[cdrc6]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail immobilier</para></td><td><para style="P2">[[cdrc7]]</para></td></tr><tr><td><para style="P10">Imp&#xF4;ts, taxes et versements assimil&#xE9;s</para></td><td><para style="P2">[[cdrc8]]</para></td></tr><tr><td><para style="P10">Salaires et traitements</para></td><td><para style="P2">[[cdrc9]]</para></td></tr><tr><td><para style="P17">Charges sociales</para></td><td><para style="P2">[[cdrc10]]</para></td></tr><tr><td><para style="P17">Dotation aux amortissements et aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux amortissements</para></td><td><para style="P2">[[cdrc11]]</para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc12]]</para></td></tr><tr><td><para style="P12">Sur actif circulant : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc13]]</para></td></tr><tr><td><para style="P12">Dotations aux provisions</para></td><td><para style="P2">[[cdrc14]]</para></td></tr><tr><td><para style="P12">Autres charges</para></td><td><para style="P2">[[cdrc15]]</para></td></tr><tr><td><para style="P16">TOTAL I</para></td><td><para style="P2">[[ct1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun ( II )</para></td><td><para style="P2">[[cdrc16]]</para></td></tr><tr><td><para style="P15">CHARGES FINANCI&#xC8;RES</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P10">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc17]]</para></td></tr><tr><td><para style="P10">Int&#xE9;r&#xEA;ts et charges assimil&#xE9;es</para></td><td><para style="P2">[[cdrc18]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences n&#xE9;gatives de change</para></td><td><para style="P2">[[cdrc19]]</para></td></tr><tr><td><para style="P10">Charges nettes sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrc20]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[ct3]]</para></td></tr><tr><td><para style="P18">CHARGES EXCEPTIONNELLES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrc21]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrc22]]</para></td></tr><tr><td><para style="P6">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc23]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[ct4]]</para></td></tr><tr><td><para style="P8">Participation des salari&#xE9;s aux r&#xE9;sultats <font face="Times-Roman" size="7.0">( V )</font></para></td><td><para style="P2">[[cdrc24]]</para></td></tr><tr><td><para style="P9">Imp&#xF4;ts sur les b&#xE9;n&#xE9;fices <font face="Times-Roman" size="7.0">( VI )</font></para></td><td><para style="P2">[[cdrc25]]</para></td></tr><tr><td><para style="P16">TOTAL CHARGES ( I + II + III <font face="Times-Bold" size="7.0">+ IV+ V+ VI</font> )</para></td><td><para style="P2">[[charges]]</para></td></tr></blockTable><para style="P24"><font color="white"> </font></para><pageBreak/><para style="P25"><font color="white"> </font></para><para style="P24"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau1"><tr><td><para style="P3">PRODUITS (hors taxes)</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">PRODUITS D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Vente de marchandises</para></td><td><para style="P2">[[cdrp1]]</para></td></tr><tr><td><para style="P10">Production vendue [biens et services]</para></td><td><para style="P2">[[cdrp2]]</para></td></tr><tr><td><para style="P13">Sous-total A - Montant net du chiffre d'affaires</para></td><td><para style="P2">[[pta]]</para></td></tr><tr><td><para style="P17">Production stock&#xE9;e</para></td><td><para style="P2">[[cdrp3]]</para></td></tr><tr><td><para style="P10">Production immobilis&#xE9;e</para></td><td><para style="P2">[[cdrp4]]</para></td></tr><tr><td><para style="P10">Subventions d'exploitation</para></td><td><para style="P2">[[cdrp5]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations (et amortissements) et transferts de charges</para></td><td><para style="P2">[[cdrp6]]</para></td></tr><tr><td><para style="P10">Autres produits</para></td><td><para style="P2">[[cdrp7]]</para></td></tr><tr><td><para style="P13">Sous-total B</para></td><td><para style="P2">[[ptb]]</para></td></tr><tr><td><para style="P14">TOTAL I ( A + B )</para></td><td><para style="P2">[[pt1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun (II)</para></td><td><para style="P2">[[cdrp8]]</para></td></tr><tr><td><para style="P15">PRODUITS FINANCIERS</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P11">De participation</para></td><td><para style="P2">[[cdrp9]]</para></td></tr><tr><td><para style="P11">D'autres valeurs mobili&#xE8;res et cr&#xE9;ances de l'actif immobilis&#xE9;</para></td><td><para style="P2">[[cdrp10]]</para></td></tr><tr><td><para style="P10">Autres int&#xE9;r&#xEA;ts et produits assimil&#xE9;s</para></td><td><para style="P2">[[cdrp11]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp12]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences positives de change</para></td><td><para style="P2">[[cdrp13]]</para></td></tr><tr><td><para style="P10">Produits nets sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrp14]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[pt3]]</para></td></tr><tr><td><para style="P18">PRODUITS EXCEPTIONNELS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrp15]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrp16]]</para></td></tr><tr><td><para style="P6">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp17]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[pt4]]</para></td></tr><tr><td><para style="P16">TOTAL DES PRODUITS ( I + II + III + IV )</para></td><td><para style="P2">[[produits]]</para></td></tr><tr><td><para style="P16">PRODUITS - CHARGES</para></td><td><para style="P2">[[produits-charges]]</para></td></tr></blockTable><para style="Standard"><font color="white"> </font></para></story></document>
 
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index a7bc1b32cdd..44773e22e96 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.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="Lunch Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
     </pageTemplate>
diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
index 93f2db207bc..c05da1242ea 100644
--- a/addons/mrp/report/bom_structure.rml
+++ b/addons/mrp/report/bom_structure.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="BOM Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
     </pageTemplate>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index b394394bb31..35e509b9033 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.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="Production Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
     </pageTemplate>
diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
index 10440a45e11..bcc4fc54870 100755
--- a/addons/mrp_operations/report/mrp_code_barcode.rml
+++ b/addons/mrp_operations/report/mrp_code_barcode.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
+<template pageSize="(550,280)" title="Code Barcode" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
 <pageTemplate id="first">
   <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
 </pageTemplate>
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
index af0352ac80d..6d52cbcd070 100755
--- a/addons/mrp_operations/report/mrp_wc_barcode.rml
+++ b/addons/mrp_operations/report/mrp_wc_barcode.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
+<template pageSize="(550,280)" title="WC" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
 <pageTemplate id="first">
   <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
 </pageTemplate>
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index bb3e61ab4e7..c02ee80d816 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.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="Repair" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index 90d3fcf7d78..180e9d6a97b 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="Statements" 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 63bae7c798f..f75c08dbadb 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 a86460116da..1aaac4dbe3a 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 254f397b6b6..3981f389166 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="Olivier Laurent" 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="5.0" y1="57.0" width="590" height="828"/>
         </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index d51fdaefdd0..0cc1c43520a 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.rml b/addons/point_of_sale/report/pos_payment_report.rml
index ebe30bdf3bc..c1980e9e209 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.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="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 b6b726d127f..1f220e253ca 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 f3a9311e186..fc874e52dac 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="2.0" y1="57.0" width="537" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 313ba8cdb61..e722687f094 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-    <template pageSize="(204.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <template pageSize="(204.0,842.0)" title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
         <pageTemplate id="first">
             <frame id="first" x1="0.0" y1="0.0" width="204" height="842"/>
         </pageTemplate>
@@ -136,7 +136,7 @@
                 </td>
                 <td>
                     <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
-                    
+
                 </td>
                 <td>
                     <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%)</font></para>
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
index 1080a69ea65..ab8af5ca999 100644
--- a/addons/point_of_sale/report/pos_receipt_bis.rml
+++ b/addons/point_of_sale/report/pos_receipt_bis.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(224.0,842.0)" title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
     </pageTemplate>
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 01fa0e4ac1e..32dea8dcd48 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(224.0,842.0)" title="Receipt with reimbursement " author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
     </pageTemplate>
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 0eb0dba773a..4e3b8ec64e1 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(224.0,842.0)" title="Receipt without reimbursement  " author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index b6a3dae9685..cb817035a46 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 by user" 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_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 7db76e33ff4..39f6ddacb4c 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="Today's sales with users" 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_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index 469fc5cdd33..475d045252b 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="Today's sales with current user" 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_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index cbb309ceef2..ef911861d85 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="Product by user" 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>

From b8771e21a9debefc6300b3c771f618e2eee7db94 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 27 Aug 2010 17:14:38 +0530
Subject: [PATCH 20/73] [IMP]:rename the title and author of rml reports.

bzr revid: apa@tinyerp.com-20100827114438-s08nsd2g7p37e3nx
---
 addons/product/report/product_pricelist.rml        | 2 +-
 addons/project_planning/report/report_planning.rml | 2 +-
 addons/purchase/report/order.rml                   | 2 +-
 addons/purchase/report/request_quotation.rml       | 2 +-
 addons/report_intrastat/report/invoice.rml         | 2 +-
 addons/sale/report/sale_order.rml                  | 2 +-
 addons/sale/report/sale_prepare_allot.rml          | 2 +-
 addons/sale_layout/report/order.rml                | 2 +-
 addons/sale_layout/report/report_sale_layout.rml   | 6 +++---
 addons/stock/report/lot_location.rml               | 2 +-
 addons/stock/report/lot_overview.rml               | 2 +-
 addons/stock/report/lot_overview_all.rml           | 2 +-
 addons/stock/report/packing.rml                    | 6 +++---
 addons/stock/report/picking.rml                    | 2 +-
 addons/stock/report/stock_inventory_move.rml       | 6 +++---
 15 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 873c5afd6e0..2deef94a319 100644
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.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="Products Price List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 711ba2f9e47..8a6fe372661 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="HR Planning" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="HR Planning" 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/purchase/report/order.rml b/addons/purchase/report/order.rml
index 51dc6941f3f..a7f6337323e 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.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="Purchase Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
     </pageTemplate>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 961ce8239b4..c691eb9cdc6 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.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="Request for Quotation" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index 4c3bfd5d2c4..8e4f92da708 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.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="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 5f535a05371..6eb62ddfe01 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.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="Sale Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
diff --git a/addons/sale/report/sale_prepare_allot.rml b/addons/sale/report/sale_prepare_allot.rml
index 97ee442fd7a..e39bf0674fa 100644
--- a/addons/sale/report/sale_prepare_allot.rml
+++ b/addons/sale/report/sale_prepare_allot.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="Prepare allot" 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/sale_layout/report/order.rml b/addons/sale_layout/report/order.rml
index 8c7cfaa0d2d..cde59d18e02 100755
--- a/addons/sale_layout/report/order.rml
+++ b/addons/sale_layout/report/order.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="Sale Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index fe2f15ebf42..e98edd38d99 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.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="Sale Layout" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
     </pageTemplate>
@@ -292,7 +292,7 @@
         </td>
       </tr>
     </blockTable>
- 
+
 	<section>
       <para style="P32">[[ repeatIn(sale_order_lines(o),'a') ]]</para>
 		<blockTable colWidths="0.0,216.0,66,46,24,66,55,54" style="Table1">
@@ -336,7 +336,7 @@
     <blockTable colWidths="66.0,461.0" style="Table3">
       <tr>
         <td>
-        	
+
           <para style="P7"><font>[[ a['note']=='' and removeParentNode('blockTable') ]]</font><font>[[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]</font></para>
         </td>
         <td>
diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
index c7524d13691..ecbe9fec9fa 100644
--- a/addons/stock/report/lot_location.rml
+++ b/addons/stock/report/lot_location.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="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>
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index b26c9842636..f0495ba99ee 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.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="Lot Overview" 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/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 80c40590164..ac3207a5b6e 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.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="All Lot Overview" 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/stock/report/packing.rml b/addons/stock/report/packing.rml
index 7288615da6d..15fa35e07e9 100644
--- a/addons/stock/report/packing.rml
+++ b/addons/stock/report/packing.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="Packing" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -136,7 +136,7 @@
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
-          
+
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
@@ -276,7 +276,7 @@
         <font color="white"> </font>
       </para>
     </section>
-	
+
 	<para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' )])  and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
 	 <section>
       <blockTable colWidths="197.0,68.0,61.0,57,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 720fb7c863f..35067f0b482 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Picking" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index cd82cc4312a..155be7ed416 100755
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.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="Stock inventory move" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -31,7 +31,7 @@
       <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"/>  
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -100,7 +100,7 @@
     <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="14.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_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-	<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" 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"/>
     <images/>
   </stylesheet>
   <story>

From 3a8b4898c43dbb60e747da6d59747735df42aa9b Mon Sep 17 00:00:00 2001
From: "saz(OpenERP)" <>
Date: Fri, 27 Aug 2010 18:32:34 +0530
Subject: [PATCH 21/73] [IMP]:hr_attandance:improved Attendance By Month.

bzr revid: apa@tinyerp.com-20100827130234-cmht1cqe4djexsjn
---
 .../report/attendance_by_month.py             | 16 +++++++-------
 addons/hr_attendance/report/bymonth.xsl       | 22 ++++++++++++-------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index 8899df5ab59..f4ee7035136 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -32,10 +32,10 @@ from report.interface import toxml
 one_day = DateTime.RelativeDateTime(days=1)
 month2name = [0, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
 
-def hour2str(h):
-    hours = int(h)
-    minutes = int(round((h - hours) * 60, 0))
-    return '%02dh%02d' % (hours, minutes)
+#def hour2str(h):
+#    hours = int(h)
+#    minutes = int(round((h - hours) * 60, 0))
+#    return '%02dh%02d' % (hours, minutes)
 
 class report_custom(report_rml):
 
@@ -67,7 +67,7 @@ class report_custom(report_rml):
                     '''
                     cr.execute(sql, (today.strftime('%Y-%m-%d %H:%M:%S'), tomor.strftime('%Y-%m-%d %H:%M:%S'), emp['id']))
                     attendences = cr.dictfetchall()
-                    wh = 0
+                    wh = 0.0
                     # Fake sign ins/outs at week ends, to take attendances across week ends into account
                     if attendences and attendences[0]['action'] == 'sign_out':
                         attendences.insert(0, {'name': today.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
@@ -80,8 +80,8 @@ class report_custom(report_rml):
                             wh += (dt - ldt).hours
                         ldt = dt
                     # Week xml representation
-                    wh = hour2str(wh)
-                    today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, wh)
+#                    wh = hour2str(wh)
+                    today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, round(wh,2))
                     days_xml.append(today_xml)
                     today, tomor = tomor, tomor + one_day
                 user_xml.append(user_repr % '\n'.join(days_xml))
@@ -94,4 +94,4 @@ class report_custom(report_rml):
 
 report_custom('report.hr.attendance.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/report/bymonth.xsl b/addons/hr_attendance/report/bymonth.xsl
index 133602f1558..ea4e849cb07 100644
--- a/addons/hr_attendance/report/bymonth.xsl
+++ b/addons/hr_attendance/report/bymonth.xsl
@@ -10,7 +10,7 @@
 
     <xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Attendance By Month" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
 					<pageGraphics>
 						<drawRightString x="19.0cm" y="26.0cm"><xsl:value-of select="date"/></drawRightString>
@@ -18,8 +18,9 @@
 					<frame id="col1" x1="2.0cm" y1="2.5cm" width="22.7cm" height="18cm"/>
 				</pageTemplate>
 			</template>
-			
+
 			<stylesheet>
+				<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
 				<paraStyle name="name" fontName="Helvetica" textColor="green" fontSize="7"/>
 				<paraStyle name="normal" fontName="Helvetica" fontSize="6"/>
 				<blockTableStyle id="week">
@@ -29,6 +30,7 @@
 					<lineStyle kind="LINEABOVE" colorName="grey" start="0,0" stop="-1,0" />
 					<lineStyle kind="LINEBEFORE" colorName="grey" start="0,0" stop="-1,-1"/>
 					<lineStyle kind="LINEAFTER" colorName="grey" start="-1,0" stop="-1,-1"/>
+					<lineStyle kind="LINEBELOW" colorName="grey" start="0,0" stop="-1,-1"/>
 					<blockValign value="TOP"/>
 				</blockTableStyle>
 			</stylesheet>
@@ -40,8 +42,10 @@
     </xsl:template>
 
     <xsl:template name="story">
+		<para style="terp_header_Centre" t="1">Attendance By Month</para>
+		<spacer length="1cm" />
         <blockTable
-			colWidths="2cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm,0.79cm" style="week">
+			colWidths="3cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm,0.69cm" style="week">
             <tr>
 				<td><xsl:value-of select="/report/month" /><xsl:text> </xsl:text><xsl:value-of select="/report/year" /></td>
 				<td>1</td>
@@ -77,21 +81,23 @@
 				<td>31</td>
             </tr>
 			<xsl:apply-templates select="report/user"/>
-        </blockTable>
+      </blockTable>
     </xsl:template>
 
     <xsl:template match="user">
-		<tr></tr>
+<!--		<tr></tr>-->
 		<tr>
 			<td>
 				<para style="name"><xsl:value-of select="name" /></para>
 			</td>
-		</tr>
-		<tr>
-			<td>Worked</td>
 			<xsl:for-each select="day">
 				<td><xsl:value-of select="wh" /></td>
 			</xsl:for-each>
 		</tr>
+
+<!--		<tr>-->
+<!--			<td>Worked</td>-->
+<!--			-->
+<!--		</tr>-->
     </xsl:template>
 </xsl:stylesheet>

From 5d0022be5c5694c6563237b09dbfb6b80af458a3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 30 Aug 2010 12:35:41 +0530
Subject: [PATCH 22/73] [IMP]hr_timesheet:improved report.

bzr revid: apa@tinyerp.com-20100830070541-pf03io6pbta7h3t2
---
 addons/hr_timesheet/report/users_timesheet.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/report/users_timesheet.xsl b/addons/hr_timesheet/report/users_timesheet.xsl
index f229641c837..952af98e81a 100644
--- a/addons/hr_timesheet/report/users_timesheet.xsl
+++ b/addons/hr_timesheet/report/users_timesheet.xsl
@@ -59,7 +59,7 @@
 	</xsl:template>
 
 	<xsl:template name="story">
-		<para style="title" t="1">Timesheet</para>
+		<para style="title" t="1">Employees Timesheet</para>
 		<spacer length="1cm" />
 		<blockTable>
 			<xsl:attribute name="style">month</xsl:attribute>

From 9390d6d178361adaf5287435cb62477300f004eb Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 31 Aug 2010 10:41:50 +0530
Subject: [PATCH 23/73] [iMP]:hr_payroll:Salary structure report

bzr revid: apa@tinyerp.com-20100831051150-r8ozsv1mj8nrkhux
---
 addons/hr_payroll/report/report_emp_salary_structure.rml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index f23712f80ce..b171d700977 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -210,7 +210,7 @@
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" 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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="10" 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_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="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -246,7 +246,6 @@
       <tr>
         <td>
           <para style="terp_header_Centre">Salary Structure</para>
-          <para style="terp_header_Centre">For [[ employee.name ]]</para>
         </td>
       </tr>
     </blockTable>

From 2668f07f5400d84948d8e753ea5fbb94c9a4d97c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 31 Aug 2010 12:36:59 +0530
Subject: [PATCH 24/73] [iMP]:survey:Survey Analysis report

bzr revid: apa@tinyerp.com-20100831070659-l5j10nu67vp03i4r
---
 .../survey/report/survey_analysis_report.py   | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index da724586a4f..5a6c65a3266 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -24,14 +24,34 @@ import pooler
 from report.interface import report_rml
 from tools import to_xml
 import tools
+import time
+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')
+        rml_obj=report_sxw.rml_parse(cr, uid, surv_obj._name,context)
+        company=surv_obj.browse(cr,uid,ids,context)[0].responsible_id.company_id
+
         rml ="""<document filename="Survey Analysis Report.pdf">
-                <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>
+                <template pageSize="(595.0,842.0)" title="Survey Analysis" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+                        <pageTemplate>
+                        <frame id="first" x1="1.3cm" y1="1.5cm" width="18.4cm" height="26.5cm"/>
+                        <pageGraphics>
+                        <fill color="black"/>
+                        <stroke color="black"/>
+                        <setFont name="DejaVu Sans" size="8"/>
+                        <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>
+                        </pageTemplate>
                   </template>
                   <stylesheet>
                     <blockTableStyle id="Table1">
@@ -95,7 +115,7 @@ class survey_analysis(report_rml):
                   </stylesheet>
                   <images/>
                   <story>
-                    <para style="Title"><u>Answer Summary</u></para>
+                    <para style="Title">Answer Summary</para>
                     <para style="Standard"><font></font></para>
                     <para style="P2">
                       <font color="white"> </font>
@@ -103,7 +123,7 @@ class survey_analysis(report_rml):
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         if datas.has_key('form') and datas['form']['survey_ids']:
            ids =  datas['form']['survey_ids']
-            
+
         for survey in surv_obj.browse(cr, uid, ids):
             rml += """<blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
                       <tr>
@@ -130,13 +150,16 @@ class survey_analysis(report_rml):
                           <para style="terp_default_Centre_8">""" + str(survey.tot_comp_survey) + """</para>
                         </td>
                       </tr>
-                    </blockTable>"""
+                    </blockTable>
+                    <para style="P2">
+                      <font color="white"> </font>
+                    </para>"""
             for page in survey.page_ids:
                 rml += """ <blockTable colWidths="500" style="Table4">
-#                              <tr>
-#                                <td><para style="page">Page :- """ + to_xml(tools.ustr(page.title)) + """</para></td>
-#                              </tr>
-#                           </blockTable>"""
+                              <tr>
+                                <td><para style="page">Page :- """ + to_xml(tools.ustr(page.title)) + """</para></td>
+                              </tr>
+                           </blockTable>"""
                 for que in page.question_ids:
                     rml +="""<blockTable colWidths="500" style="Table5">
                               <tr>

From 858735862cc0be2e1609ea232a772ca320d30146 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 31 Aug 2010 18:02:59 +0530
Subject: [PATCH 25/73] [IMP]:hr_timesheet_invoice:invoice rate by user

bzr revid: apa@tinyerp.com-20100831123259-a06mjsehts1twfhe
---
 .../hr_timesheet_invoice/report/account_analytic_profit.rml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index 348f85b877a..0e6a12030f2 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
@@ -224,7 +224,7 @@
           <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</u></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_bold_U"><u>[[reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) and round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] %</u></para>
+          <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) and round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] %</u></para>
         </td>
       </tr>
     </blockTable>
@@ -255,7 +255,7 @@
             <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]]</u></para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) and  '%d' % (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0, 2)]] %</u></para>
+            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) and  (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0)]] %</u></para>
           </td>
         </tr>
       </blockTable>

From 26cc5042f65140e0e44c5abec70610dd25abe1fa Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 31 Aug 2010 18:39:26 +0530
Subject: [PATCH 26/73] [ADD]: marketing_campaign: Added constraint on
 transition object to prevent linking activities from different campaigns

bzr revid: rpa@tinyerp.com-20100831130926-tujbvryv605hjqkv
---
 addons/marketing_campaign/marketing_campaign.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index c147580e014..14350582d9c 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -526,7 +526,18 @@ class marketing_campaign_transition(osv.osv):
         'interval_type': 'days',
         'trigger': 'time',
     }
+    def _check_campaign(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            if obj.activity_from_id.campaign_id != obj.activity_to_id.campaign_id:
+                return False
+        return True
 
+    _constraints = [
+            (_check_campaign, _('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']),
+        ]
+ 
     _sql_constraints = [
         ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero')
     ]

From d3c3b194a98933a19fe9bb2df07080cb60e99c9b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 31 Aug 2010 18:42:50 +0530
Subject: [PATCH 27/73] [iMP]:point_of_sale:improved all report for
 point_of_sale

bzr revid: apa@tinyerp.com-20100831131250-ub3v4x6h92dzjvyk
---
 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          | 6 +++---
 addons/point_of_sale/report/pos_lines.py                    | 6 +++---
 addons/point_of_sale/report/pos_payment_report.py           | 2 +-
 addons/point_of_sale/report/pos_payment_report_date.py      | 6 +++---
 addons/point_of_sale/report/pos_payment_report_user.py      | 6 +++---
 addons/point_of_sale/report/pos_sales_user.py               | 6 +++---
 addons/point_of_sale/report/pos_sales_user_today.py         | 6 +++---
 .../report/pos_sales_user_today_current_user.py             | 6 +++---
 addons/point_of_sale/report/pos_users_product.py            | 6 +++---
 12 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
index fbfd72115ad..391adb7569f 100644
--- a/addons/point_of_sale/report/account_statement.py
+++ b/addons/point_of_sale/report/account_statement.py
@@ -37,4 +37,4 @@ class account_statement(report_sxw.rml_parse):
         for line in statement_line_ids:
             total += line.amount
         return total
-report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement)
+report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement,header='internal')
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 137a46c4b45..dcbba147b59 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
@@ -138,4 +138,4 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         res = self.cr.dictfetchall()
         return res[0]['net_total'] or 0.0
 
-report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
+report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day,header='internal')
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 44b73be6570..fd0eb54bc3f 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -207,7 +207,7 @@ class pos_details(report_sxw.rml_parse):
             'getinvoice':self._get_invoice,
         })
 
-report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header='external')
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 04e460ec6e5..2d1fd0b98c7 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.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/>.
 #
 ##############################################################################
 
@@ -128,7 +128,7 @@ report_sxw.report_sxw('report.pos.details_summary',
                                             'pos.order',
                                             'addons/point_of_sale/report/pos_details_summary.rml',
                                             parser=pos_details_summary,
-                                            header=None)
+                                            header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 3076e1b6741..ad855087cad 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.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/>.
 #
 ##############################################################################
 
@@ -52,7 +52,7 @@ class pos_lines(report_sxw.rml_parse):
         return res
 
 
-report_sxw.report_sxw('report.pos.lines', 'pos.order', 'addons/point_of_sale/report/pos_lines.rml', parser=pos_lines)
+report_sxw.report_sxw('report.pos.lines', 'pos.order', 'addons/point_of_sale/report/pos_lines.rml', parser=pos_lines,header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index d2f05f85a06..3d82025da89 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -61,7 +61,7 @@ class pos_payment_report(report_sxw.rml_parse):
         return self.total
 
 
-report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report)
+report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report,header='internal')
 
 
 
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 af64e45cff4..38f87d533f2 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.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/>.
 #
 ##############################################################################
 import time
@@ -59,7 +59,7 @@ class pos_payment_report_date(report_sxw.rml_parse):
         return res
 
 
-report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date)
+report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date,header='internal')
 
 
 
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 e84b3b792cc..48ea148d8d1 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.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/>.
 #
 ##############################################################################
 import time
@@ -58,7 +58,7 @@ class pos_payment_report_user(report_sxw.rml_parse):
         return res
 
 
-report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user)
+report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user,header='internal')
 
 
 
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index b110e4e2d00..4032f035bdf 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.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/>.
 #
 ##############################################################################
 import time
@@ -46,7 +46,7 @@ class pos_sales_user(report_sxw.rml_parse):
         data = self.cr.dictfetchall()
         return data
 
-report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user)
+report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user,header='internal')
 
 
 
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 4362cc8928c..7c9b9b5a563 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.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/>.
 #
 ##############################################################################
 import time
@@ -45,7 +45,7 @@ class pos_sales_user_today(report_sxw.rml_parse):
         data = self.cr.dictfetchall()
         return data
 
-report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today)
+report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today,header='internal')
 
 
 
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 bd728441be2..7f4a8f827f5 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
@@ -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/>.
 #
 ##############################################################################
 import time
@@ -63,7 +63,7 @@ class pos_sales_user_today_current_user(report_sxw.rml_parse):
     def _get_data_current_user_qty(self, user):
         return self.qty
 
-report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user)
+report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user,header='internal')
 
 
 
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index a61f753ce7d..3a284f1957f 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.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/>.
 #
 ##############################################################################
 import time
@@ -61,4 +61,4 @@ class pos_user_product(report_sxw.rml_parse):
     def _get_total(self):
         return self.total
 
-report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product)
+report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product,header='internal')

From 4dc8c1acfb24e6da01ab42761cff732b812019fa Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 31 Aug 2010 18:53:31 +0530
Subject: [PATCH 28/73] [IMP]: marketing_campaign: Make campaign_id stored on
 Followups, added Campaign in search view of Followups

bzr revid: rpa@tinyerp.com-20100831132331-086gz8ilbwvgj39z
---
 addons/marketing_campaign/marketing_campaign.py       | 2 +-
 addons/marketing_campaign/marketing_campaign_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 14350582d9c..c9383b53b15 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -592,7 +592,7 @@ class marketing_campaign_workitem(osv.osv):
         'activity_id': fields.many2one('marketing.campaign.activity','Activity',
              required=True, readonly=True),
         'campaign_id': fields.related('activity_id', 'campaign_id',
-             type='many2one', relation='marketing.campaign', string='Campaign', readonly=True),
+             type='many2one', relation='marketing.campaign', string='Campaign', readonly=True, store=True),
         'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
              type='many2one', relation='ir.model', string='Resource', select=1, readonly=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 1044755798a..cbcb7fe1b76 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -340,6 +340,7 @@
                 <field name="date"/>
                 <field name="state"/>
                 <field name="res_id" invisible="1"/>
+                <field name="campaign_id" invisible="1"/>
                 <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                 <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                 <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
@@ -404,7 +405,7 @@
                <field name="date" select="1"/>
                <newline/>
                <group expand="0" string="Group By..." colspan="10" col="12">
-                   <!--filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" /-->
+                   <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />

From f81b1b308a0e85d76ab44890ef331bd15a0e0ab1 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 10:51:18 +0530
Subject: [PATCH 29/73] [iMP]:survey:improved report

bzr revid: apa@tinyerp.com-20100901052118-lrtn9wedwn2hxu9p
---
 addons/survey/report/survey_analysis_report.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 5a6c65a3266..560212ccb09 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -31,8 +31,9 @@ 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)
-        company=surv_obj.browse(cr,uid,ids,context)[0].responsible_id.company_id
+        company=user_obj.browse(cr,uid,[uid],context)[0].company_id
 
         rml ="""<document filename="Survey Analysis Report.pdf">
                 <template pageSize="(595.0,842.0)" title="Survey Analysis" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
@@ -120,7 +121,7 @@ class survey_analysis(report_rml):
                     <para style="P2">
                       <font color="white"> </font>
                     </para>"""
-        surv_obj = pooler.get_pool(cr.dbname).get('survey')
+
         if datas.has_key('form') and datas['form']['survey_ids']:
            ids =  datas['form']['survey_ids']
 

From b7b6a7076944a65a8df9209ee40917d16d467c72 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 1 Sep 2010 12:15:19 +0530
Subject: [PATCH 30/73] [FIX] mrp: Fixed Bug 380529: Top Level BOM with
 Set/Phantom type incorrect behaviour.

bzr revid: uco@tinyerp.com-20100901064519-scqma00dfp5cof7o
---
 addons/mrp/mrp_workflow.xml |  3 +++
 addons/mrp/procurement.py   | 11 +++++++++++
 addons/sale/sale.py         |  8 ++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 0a55ccdd610..3a8ec11b353 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -142,6 +142,9 @@
             <field name="signal">subflow.done</field>
         </record>
         
+        <record id="procurement.trans_confirm_confirm_wait" model="workflow.transition">
+            <field name="condition">not test_cancel() and not get_phantom_bom_id()</field>
+        </record>
         
     </data>
 </openerp>
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 6425f6e84ac..29eb2d3bddf 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -48,6 +48,17 @@ class procurement_order(osv.osv):
             return False
         return True
     
+    def get_phantom_bom_id(self, cr, uid, ids, context=None):
+        for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.move_id and procurement.move_id.product_id.supply_method=='produce' \
+                 and procurement.move_id.product_id.procure_method=='make_to_order':
+                    phantom_bom_id = self.pool.get('mrp.bom').search(cr, uid, [
+                        ('product_id', '=', procurement.move_id.product_id.id),
+                        ('bom_id', '=', False),
+                        ('type', '=', 'phantom')]) 
+                    return phantom_bom_id 
+        return False
+    
     def action_produce_assign_product(self, cr, uid, ids, context={}):
         """ This is action which call from workflow to assign production order to procurements
         @return: True
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3fa024074dc..bf6b6cfcce5 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -694,15 +694,15 @@ class sale_order(osv.osv):
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
 
             val = {}
-            if picking_id:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-
             for proc_id in proc_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
 
+            if picking_id:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+                
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
 

From 54985d00032fe9a43ed2b26862a185762053b5ab Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 1 Sep 2010 12:37:24 +0530
Subject: [PATCH 31/73] [IMP]: email_template: Improvement in tooltips + Added
 icons on buttons

bzr revid: rpa@tinyerp.com-20100901070724-gogojuxsrsgbabl3
---
 addons/email_template/email_template.py          | 14 +++++++++-----
 .../email_template_account_view.xml              | 10 +++++-----
 addons/email_template/email_template_view.xml    |  6 +++---
 addons/email_template/i18n/en_US.po              | 16 ++++++++--------
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 3e10fc140e1..078cbdc475c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -133,22 +133,26 @@ class email_template(osv.osv):
                  'Recipient (To)',
                  size=250,
                  help="The Recipient of email. " 
-                 "Placeholders can be used here."),
+                 "Placeholders can be used here. "
+                 "e.g. ${object.email_to}"),
         'def_cc':fields.char(
                  'CC',
                  size=250,
                  help="Carbon Copy address(es), comma-separated."
-                 " Placeholders can be used here."),
+                    " Placeholders can be used here. "
+                    "e.g. ${object.email_cc}"),
         'def_bcc':fields.char(
                   'BCC',
                   size=250,
                   help="Blind Carbon Copy address(es), comma-separated."
-                  " Placeholders can be used here."),
+                    " Placeholders can be used here. "
+                    "e.g. ${object.email_bcc}"),
         'reply_to':fields.char('Reply-To', 
                     size=250, 
                     help="The address recipients should reply to,"
-                         " if different from the From address."
-                         " Placeholders can be used here."),
+                    " if different from the From address."
+                    " Placeholders can be used here. "
+                    "e.g. ${object.email_reply_to}"),
         'message_id':fields.char('Message-ID', 
                     size=250, 
                     help="Specify the Message-ID SMTP header to use in outgoing emails. Please note that this overrides the Resource tracking option! Placeholders can be used here."),
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 9ccf3e63800..201f32db726 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -25,7 +25,7 @@
                                 <field name="smtptls" select="2" />
                                 <field name="auto_delete" />
                             </group>
-                            <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" />
+                            <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network"/>
                             <separator string="User Information" colspan="4" />
                             <group col="2" colspan="2">
                                 <field name="email_id" select="1" colspan="2" />
@@ -41,10 +41,10 @@
                     </notebook>
                     <group colspan="4" col="10">
                         <field name="state" select="1"/>
-                        <button string="Approve Account" name="button_approval" states="draft" type="workflow"/>
-                        <button string="Suspend Account" name="button_suspended" states="approved" type="workflow"  />
-                        <button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" />
-                        <button string="Send/Receive" name="send_receive" states="approved" type="object" />
+                        <button string="Approve Account" name="button_approval" states="draft" type="workflow" icon="terp-camera_test"/>
+                        <button string="Suspend Account" name="button_suspended" states="approved" type="workflow" icon="gtk-cancel"/>
+                        <button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" icon="gtk-convert"/>
+                        <button string="Send/Receive" name="send_receive" states="approved" type="object" icon="terp-check"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 9de027cb4b2..8d851f17641 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -109,17 +109,17 @@
                                     </page>
                                 </notebook>
                                 <button name="%(wizard_email_template_preview)d" string="Preview Template"
-                                    type="action" colspan="4" target="new" />
+                                    type="action" colspan="4" target="new" icon="gtk-zoom-fit"/>
                             </group>
                         </page>
                         <page string="Advanced">
                             <group colspan="2" col="2">
                                 <group colspan="2" col="2">
                                     <separator string="Actions" colspan="2"/>
-                                    <button name="create_action" string="Create Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
+                                    <button name="create_action" string="Create Action" type="object" icon="gtk-execute"  colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
                                     <field name="ref_ir_act_window"/>
                                     <field name="ref_ir_value"/>
-                                    <button name="delete_action" string="Delete Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
+                                    <button name="delete_action" string="Delete Action" type="object" icon="gtk-delete" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
                                 </group>
                                 <group colspan="2" col="2">
                                     <separator string="Advanced Options" colspan="2"/>
diff --git a/addons/email_template/i18n/en_US.po b/addons/email_template/i18n/en_US.po
index 04475fb5fe5..be4a81a7954 100644
--- a/addons/email_template/i18n/en_US.po
+++ b/addons/email_template/i18n/en_US.po
@@ -221,8 +221,8 @@ msgstr "Download Full Mail"
 
 #. module: email_template
 #: help:email.template,def_to:0
-msgid "The recipient of email.Placeholders can be used here."
-msgstr "The recipient of email.Placeholders can be used here."
+msgid "The recipient of email. Placeholders can be used here. e.g. ${object.email_to}"
+msgstr "The recipient of email. Placeholders can be used here. e.g. ${object.email_to}"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -275,8 +275,8 @@ msgstr "Tip: Multiple emails are sent in the same language (the first one is pro
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 #: help:email_template.send.wizard,reply_to:0
-msgid "The address recipients should reply to, if different from the From address. Placeholders can be used here."
-msgstr "The address recipients should reply to, if different from the From address. Placeholders can be used here."
+msgid "The address recipients should reply to, if different from the From address. Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr "The address recipients should reply to, if different from the From address. Placeholders can be used here. e.g. ${object.email_reply_to}"
 
 #. module: email_template
 #: field:email_template.mailbox,subject:0
@@ -1127,8 +1127,8 @@ msgstr "Subject"
 
 #. module: email_template
 #: help:email.template,def_bcc:0
-msgid "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here."
-msgstr "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here."
+msgid "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_bcc}"
+msgstr "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_bcc}"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -1159,8 +1159,8 @@ msgstr "email-template"
 
 #. module: email_template
 #: help:email.template,def_cc:0
-msgid "Carbon Copy address(es), comma-separated. Placeholders can be used here."
-msgstr "Carbon Copy address(es), comma-separated. Placeholders can be used here."
+msgid "Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_cc}"
+msgstr "Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_cc}"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0

From d91be1e90825b0bcbbb78756c347ceecdb5cca4a Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 1 Sep 2010 14:43:08 +0530
Subject: [PATCH 32/73] [FIX] sale: Question:119827 : Corrected Workflow.

bzr revid: uco@tinyerp.com-20100901091308-zx5m4q5388cczcvs
---
 addons/mrp/stock.py               | 17 -----------------
 addons/procurement/procurement.py | 30 ++++++++++++++++++++++++++++++
 addons/sale/sale.py               |  1 -
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 3e158b4d0cf..248e39989d8 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -33,14 +33,8 @@ class StockMove(osv.osv):
     
     _columns = {
         'production_id': fields.many2one('mrp.production', 'Production', select=True),
-        'procurements': fields.one2many('procurement.order', 'move_id', 'Procurements'),
     }
     
-    def copy(self, cr, uid, id, default=None, context=None):
-        default = default or {}
-        default['procurements'] = []
-        return super(StockMove, self).copy(cr, uid, id, default, context)
-
     def _action_explode(self, cr, uid, move, context={}):
         """ Explodes pickings.
         @param move: Stock moves
@@ -152,17 +146,6 @@ StockMove()
 class StockPicking(osv.osv):
     _inherit = 'stock.picking'
 
-    def test_finnished(self, cursor, user, ids):
-        wf_service = netsvc.LocalService("workflow")
-        res = super(StockPicking, self).test_finnished(cursor, user, ids)
-        for picking in self.browse(cursor, user, ids):
-            for move in picking.move_lines:
-                if move.state == 'done' and move.procurements:
-                    for procurement in move.procurements:
-                        wf_service.trg_validate(user, 'procurement.order',
-                                procurement.id, 'button_check', cursor)
-        return res
-
     #
     # Explode picking by replacing phantom BoMs
     #
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 298d9b05449..e5375d6b9c1 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -60,6 +60,21 @@ class mrp_property(osv.osv):
         'composition': lambda *a: 'min',
     }
 mrp_property()
+
+class StockMove(osv.osv):
+    _inherit = 'stock.move'
+    
+    _columns= {
+        'procurements': fields.one2many('procurement.order', 'move_id', 'Procurements'),
+    }
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['procurements'] = []
+        return super(StockMove, self).copy(cr, uid, id, default, context)
+
+StockMove()
+
 class procurement_order(osv.osv):
     """
     Procurement Orders
@@ -471,6 +486,21 @@ class procurement_order(osv.osv):
 
 procurement_order()
 
+class StockPicking(osv.osv):
+    _inherit = 'stock.picking'
+
+    def test_finnished(self, cursor, user, ids):
+        wf_service = netsvc.LocalService("workflow")
+        res = super(StockPicking, self).test_finnished(cursor, user, ids)
+        for picking in self.browse(cursor, user, ids):
+            for move in picking.move_lines:
+                if move.state == 'done' and move.procurements:
+                    for procurement in move.procurements:
+                        wf_service.trg_validate(user, 'procurement.order',
+                                procurement.id, 'button_check', cursor)
+        return res
+    
+StockPicking()
 
 class stock_warehouse_orderpoint(osv.osv):
     """
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index bf6b6cfcce5..65abe223cad 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -697,7 +697,6 @@ class sale_order(osv.osv):
             for proc_id in proc_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
-                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
 
             if picking_id:
                 wf_service = netsvc.LocalService("workflow")

From f5419932bafe2a9671e6a5a8fb752c9d433d47df Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 1 Sep 2010 14:57:56 +0530
Subject: [PATCH 33/73] [REM] mrp: Removed access rule for osv_memory object.

bzr revid: uco@tinyerp.com-20100901092756-p2et4cz0mpprfe1p
---
 addons/mrp/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 41cbb5554c8..79c5de9a505 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -87,7 +87,6 @@
 "access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
 "access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
-"access_procurement_order_compute_all_user","procurement.order.compute.all.user","procurement.model_procurement_order_compute_all","mrp.group_mrp_user",1,0,0,0
 "access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,1,1,1
 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0

From 2e6106e80db1a98ef9ffe7210fec99811b252e16 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 16:06:32 +0530
Subject: [PATCH 34/73] [IMP]:sale,product,account:improved reports.

bzr revid: apa@tinyerp.com-20100901103632-8cfhq392e0r1ojhp
---
 addons/account/project/report/cost_ledger.rml |  45 ++--
 .../report/crossovered_analytic.py            |   6 +-
 .../report/crossovered_analytic.rml           | 207 ++++++++----------
 addons/product/product_report.xml             |   2 +-
 addons/product/report/product_pricelist.py    |   7 +-
 addons/product/report/product_pricelist.rml   |  40 ++--
 addons/product/wizard/product_price.py        |  12 +-
 addons/product/wizard/product_price_view.xml  |   8 +-
 addons/sale/report/sale_order.rml             |  38 +---
 9 files changed, 155 insertions(+), 210 deletions(-)

diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index b0f31b93031..2675aa33872 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -10,7 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Heading_Content">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -82,16 +82,16 @@
     <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="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <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="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.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="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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"/>
@@ -115,12 +115,12 @@
     <paraStyle name="terp_Default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_Default_Bold_Right_9_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_Default_Right_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_italic_Rignt" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_italic_Rignt" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Heading_Content">
+    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -137,15 +137,6 @@
         </td>
       </tr>
     </blockTable>
-    <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="161.0,161.0,161.0" style="Table_Date_Sub_detail">
       <tr>
         <td>
@@ -162,13 +153,13 @@
     <blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date1'],date = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date2'],date = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -306,4 +297,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 73fdb629f2c..e064ddc148b 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.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/>.
 #
 ##############################################################################
 
@@ -169,7 +169,7 @@ class crossovered_analytic(report_sxw.rml_parse):
                 final.append(item)
         return final
 
-report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser = crossovered_analytic, header = False)
+report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser = crossovered_analytic, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index df4334d03dd..62e85dd2dad 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -10,35 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_sub_header">
-      <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="Table_sub_content">
-      <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">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -57,13 +29,8 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table6">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -83,55 +50,57 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <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"/>
+      <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"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
+    </blockTableStyle>
+    <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"/>
+    </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="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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <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"/>
+      <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"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,0" stop="4,-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="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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <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="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="-8.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="-7.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" 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="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -142,7 +111,7 @@
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.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="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="11.0" leading="14" 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"/>
@@ -154,8 +123,8 @@
     <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="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" 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"/>
@@ -163,51 +132,65 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space_0.5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-    <para style="terp_header_Centre">Crossovered Analytic - [[ company.currency_id.name ]]</para>
-    <para style="terp_header_Centre">[[ company.name ]]</para>
-    <para style="terp_default_space_0.5">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="180.0,180.0,180.0" style="Table_sub_header">
+    <para style="terp_header_Centre">Crossovered Analytic</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">From Date</para>
+          <para style="terp_tblheader_General_Centre">From Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">To Date</para>
+          <para style="terp_tblheader_General_Centre">To Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Printing date</para>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Currency</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Printing date</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="180.0,180.0,180.0" style="Table_sub_content">
+    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">[[ data['form']['date1'] ]] </para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date=True) ]] </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">[[ data['form']['date2'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_space_0.5">
+    <para style="terp_header">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_Bold_9">Analytic Account Reference:</para>
-    <para style="terp_default_9">
+    <para style="P1">Analytic Account Reference:</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="155.0,125.0,92.0,65.0,101.0" style="Table5">
+    <blockTable colWidths="227.0,103.0,75.0,73.0,61.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">Account Name</para>
+          <para style="terp_tblheader_Details">Account Name</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Code</para>
@@ -223,45 +206,39 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[ repeatIn(ref_lines(data['form']),'a') ]]</para>
-      <blockTable colWidths="155.0,125.0,92.0,64.0,102.0" style="Table6">
+      <para style="terp_default_8">[[ repeatIn(ref_lines(data['form']),'a') ]]</para>
+      <blockTable colWidths="226.0,103.0,75.0,73.0,61.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_default_9">
-              <font face="Helvetica" size="10.0">[[ a['ref_name'] ]]</font>
-            </para>
+            <para style="terp_default_9">[[ a['ref_name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['ref_code'] ]]</para>
+            <para style="terp_default_Centre_9">[[ a['ref_code'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % a['ref_qty'] ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % a['ref_amt'] ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt']) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">100.00%</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2"/>
     </section>
-    <para style="terp_default_space_0.5">
+    <para style="terp_header">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_Bold_9">Analytic Account :</para>
-    <para style="terp_default_Bold_9">
+    <para style="P2">Analytic Account :</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="155.0,126.0,91.0,65.0,101.0" style="Table3">
+    <blockTable colWidths="226.0,103.0,77.0,72.0,61.0" repeatRows="1" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">Account Name</para>
+          <para style="terp_tblheader_Details">Account Name</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Code</para>
@@ -277,27 +254,24 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[ repeatIn(lines(data['form']),'a') ]]</para>
-      <blockTable colWidths="156.0,126.0,91.0,66.0,101.0" style="Table4">
+      <para style="terp_default_8">[[ repeatIn(lines(data['form']),'a') ]]</para>
+      <blockTable colWidths="227.0,103.0,77.0,72.0,60.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[ a['acc_name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['code'] ]]</para>
+            <para style="terp_default_Centre_9">[[ a['code'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % a['qty'] ]]</para>
+            <para style="terp_default_Right_9">[[formatLang(a['qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % a['amt'] ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['amt']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % a['perc'] ]]%</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['perc']) ]]%</para>
           </td>
         </tr>
       </blockTable>
@@ -305,8 +279,5 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml
index ca4c3f4f356..6135fe64bca 100644
--- a/addons/product/product_report.xml
+++ b/addons/product/product_report.xml
@@ -4,7 +4,7 @@
         <report id="report_product_label" model="product.product" name="product.product.label" string="Products Labels" xml="product/report/product_label.xml" xsl="product/report/product_label.xsl"/>
         <report
             id="report_product_pricelist"
-            string="Product Pricelist"
+            string="Pricelist"
             model="product.product"
             name="product.pricelist"
             rml="product/report/product_pricelist.rml"
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index d5faa4f0065..47979dfd71c 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.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/>.
 #
 ##############################################################################
 
@@ -44,7 +44,8 @@ class product_pricelist(report_sxw.rml_parse):
         qtys = 1
 
         for i in range(1,6):
-            vals['qty'+str(qtys)] = form['qty'+str(i)]
+            if form['qty'+str(i)]!=0:
+                vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' units'
             qtys += 1
         lst.append(vals)
         return lst
diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 2deef94a319..65d0c671fa8 100644
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Products Price List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Price List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -62,11 +62,16 @@
     <blockTableStyle id="Table3">
       <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>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -125,7 +130,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header_Centre">Products Price List</para>
+    <para style="terp_header_Centre">Price List</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -161,26 +166,26 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="165.0,78.0,74.0,73.0,72.0,76.0" style="Table7">
+    <blockTable colWidths="255.0,57.0,57.0,57.0,57.0,57.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
           <para style="terp_default_1">[[repeatIn(get_titles(data['form']), 'k')]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ k['qty1'] or removeParentNode('para') ]] units</para>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty1') and k['qty1']) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ k['qty2'] or removeParentNode('para') ]] units</para>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty2') and k['qty2']) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ k['qty3'] or removeParentNode('para') ]] units</para>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty3') and k['qty3']) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ k['qty4'] or removeParentNode('para') ]] units</para>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty4') and k['qty4']) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ k['qty5'] or removeParentNode('para') ]] units</para>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty5') and k['qty5']) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -202,26 +207,26 @@
         <font color="white"> </font>
       </para>
       <section>
-        <para style="terp_default_8">[[repeatIn(c['products'], 'p')]]</para>
-        <blockTable colWidths="166.0,78.0,75.0,73.0,73.0,74.0" style="Table3">
+        <para style="terp_default_1">[[repeatIn(c['products'], 'p')]]</para>
+        <blockTable colWidths="255.0,57.0,57.0,57.0,57.0,57.0" style="Table3">
           <tr>
             <td>
               <para style="terp_default_9">[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ p['qty1'] or removeParentNode('para') ]]</para>
+              <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty1') and p['qty1']) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ p['qty2'] or removeParentNode('para') ]]</para>
+              <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty2') and p['qty2']) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ p['qty3'] or removeParentNode('para') ]]</para>
+              <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty3') and p['qty3']) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ p['qty4'] or removeParentNode('para') ]]</para>
+              <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty4') and p['qty4']) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ p['qty5'] or removeParentNode('para') ]]</para>
+              <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty5') and p['qty5']) or '' ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -229,9 +234,6 @@
           <font color="white"> </font>
         </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index efca2fb6cc1..5863f0000b9 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -21,11 +21,11 @@
 
 from osv import osv, fields
 from tools.translate import _
-  
+
 
 class product_price_list(osv.osv_memory):
     _name = 'product.price_list'
-    _description = 'Product Price List'
+    _description = 'Price List'
 
     _columns = {
         'price_list': fields.many2one('product.pricelist', 'PriceList', required=True),
@@ -36,9 +36,9 @@ class product_price_list(osv.osv_memory):
         'qty5': fields.integer('Quantity-5'),
     }
     _defaults = {
-        'qty1': lambda *a: 0,
-        'qty2': lambda *a: 0,
-        'qty3': lambda *a: 0,
+        'qty1': lambda *a: 1,
+        'qty2': lambda *a: 5,
+        'qty3': lambda *a: 10,
         'qty4': lambda *a: 0,
         'qty5': lambda *a: 0,
     }
@@ -58,6 +58,6 @@ class product_price_list(osv.osv_memory):
             'report_name': 'product.pricelist',
             'datas': datas,
        }
-product_price_list()        
+product_price_list()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index bd5b06e30a1..91fb931b6fa 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -9,7 +9,7 @@
 		      <field name="model">product.price_list</field>
 		      <field name="type">form</field>
 		      <field name="arch" type="xml">
-				<form string="Price per Unit">
+				<form string="Price List">
                     <separator colspan="4" string="Calculate Product Price per unit base on pricelist version."/>
 				    <field name="price_list" widget="selection"/>
 				    <field name="qty1" colspan="2" />
@@ -27,9 +27,9 @@
     	</record>
 
         <act_window id="action_product_price_list"
-    		key2="client_print_multi" 
-            name="Price Per Unit"
-    		res_model="product.price_list" 
+    		key2="client_print_multi"
+            name="Price List"
+    		res_model="product.price_list"
             src_model="product.product"
     		view_mode="form" target="new" view_type="form" />
 
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 6eb62ddfe01..9ce79bb55ed 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -68,7 +68,6 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -76,14 +75,12 @@
       <lineStyle kind="LINEABOVE" colorName="#ffffff" 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="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -218,7 +215,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="203.0,94.0,68.0,59.0,43.0,70.0" repeatRows="1" style="Table4">
+    <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -236,13 +233,13 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,49.0,21.0" style="Table5">
+      <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,70.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -263,10 +260,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
           </td>
         </tr>
         <tr>
@@ -303,15 +297,10 @@
               <font color="white"> </font>
             </para>
           </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="387.0,56.0,73.0,21.0" style="Table6">
+    <blockTable colWidths="387.0,56.0,93.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -322,10 +311,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
         </td>
       </tr>
       <tr>
@@ -338,10 +324,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
         </td>
       </tr>
       <tr>
@@ -354,10 +337,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.code ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -380,4 +360,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From e09926f4e02d93fee4bb58a64c1173dbbc7bf5eb Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 16:20:44 +0530
Subject: [PATCH 35/73] [IMP]:purchase:improved reports.

bzr revid: apa@tinyerp.com-20100901105044-x0x9xai7affnf9xe
---
 addons/purchase/report/order.rml             | 37 +++++---------------
 addons/purchase/report/request_quotation.rml | 34 +++++++++---------
 2 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index a7f6337323e..d836d2cd04e 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -72,7 +72,6 @@
       <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="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"/>
@@ -80,7 +79,6 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table_All_Total_Detail">
       <blockAlignment value="LEFT"/>
@@ -88,10 +86,8 @@
       <lineStyle kind="LINEABOVE" colorName="#ffffff" 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="1,2" stop="1,2"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Outer_Notes">
       <blockAlignment value="LEFT"/>
@@ -264,7 +260,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="179.0,82.0,73.0,44.0,20.0,58.0,56.0,23.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="179.0,82.0,73.0,44.0,20.0,58.0,79.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -273,7 +269,7 @@
             <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang( line.date_planned, date_time=True) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang( line.date_planned, date=True) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] </para>
@@ -285,10 +281,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
           </td>
         </tr>
         <tr>
@@ -325,15 +318,10 @@
               <font color="white"> </font>
             </para>
           </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="391.0,55.0,66.0,23.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="391.0,55.0,88.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -344,10 +332,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
         </td>
       </tr>
       <tr>
@@ -360,10 +345,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id.code ]]</para>
         </td>
       </tr>
       <tr>
@@ -376,10 +358,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total ) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9_Right">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -397,4 +376,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index c691eb9cdc6..ed2f1859f79 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -33,16 +33,16 @@
     <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="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"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <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="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <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="12.0" spaceAfter="6.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"/>
@@ -66,8 +66,8 @@
     <paraStyle name="terp_default_8_italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Space bet user and signature" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
     <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
@@ -80,7 +80,7 @@
           <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street) or '']]</para>
           <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or '']]</para>
           <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]]</para>
-          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.state_id and order.dest_address_id.state_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or '']] [[(order.dest_address_id and order.dest_address_id and order.dest_address_id.country_id and order.dest_address_id.country_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name]] [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]]</para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -88,7 +88,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ order.partner_id.name ]] [[ order.partner_id.title or '' ]]</para>
+          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] </para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
@@ -124,13 +124,13 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[repeatIn(order.order_line,'order_line')]]</para>
-      <blockTable colWidths="371.0,100.0,39.0,20.0" style="Table_Product_Line">
+      <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date_time = True) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date = True) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(order_line.product_qty )]]</para>
@@ -146,9 +146,7 @@
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_9"/>
     <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
@@ -162,4 +160,4 @@
     </para>
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 04b396bd01245f00fcf882b55526e87b093e8717 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 16:44:38 +0530
Subject: [PATCH 36/73] [IMP]:delivery:improved reports.

bzr revid: apa@tinyerp.com-20100901111438-bf3v1wdsx55jdsn9
---
 addons/delivery/report/shipping.rml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index c07395a3662..80dd4ab2ff5 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Delivery" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Delivery Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="30.0" y1="27.0" width="508" height="815"/>
     </pageTemplate>
@@ -72,12 +72,12 @@
     <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="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" 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="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" 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="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -103,8 +103,8 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_9">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">
@@ -114,8 +114,7 @@
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">[[ o.sale_id and o.sale_id.partner_invoice_id and 'Invoiced to' or '' ]]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.partner_id.name or '']]</para>
+          <para style="terp_default_Bold_9">Invoiced to</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']]</para>
@@ -123,7 +122,7 @@
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.address_id and o.address_id.name or '']]</para>
           <para style="terp_default_9">[[ o.address_id and o.address_id.street or '']]</para>
           <para style="terp_default_9">[[ o.address_id and o.address_id.zip or '']]</para>
@@ -161,7 +160,7 @@
           <para style="terp_default_Centre_8">[[ o.sale_id and o.sale_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.sale_id and formatLang(o.sale_id.date_order,date_time = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(o.date,date_time=True) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(o.min_date,date_time = True) ]]</para>
@@ -219,4 +218,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 7a06b949525ffa484e6d5965034290d0aeb0c482 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 16:56:32 +0530
Subject: [PATCH 37/73] [IMP]:stock:improved inventory report

bzr revid: apa@tinyerp.com-20100901112632-cuu0vn5r9u80ol7b
---
 addons/stock/report/stock_inventory_move.rml | 84 ++++++++++++--------
 1 file changed, 49 insertions(+), 35 deletions(-)

diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index 155be7ed416..285c9bf3a86 100755
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Stock inventory move" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Inventory" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -18,20 +18,27 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </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="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <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"/>
+      <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="Table4">
       <blockAlignment value="LEFT"/>
@@ -61,7 +68,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.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"/>
@@ -98,9 +105,6 @@
     <paraStyle name="Table" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Untitled1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="14.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_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-	<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -113,35 +117,45 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_header_Centre">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="260.0,260.0" style="Table1">
+    <blockTable colWidths="539.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">Inventory</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Date</para>
-        </td>
-        </tr>
-        <tr>
-        <td>
-         <para style="terp_default_Centre_9">[[ o.name ]]</para></td>
-        <td> <para style="terp_default_Centre_9"> [[ formatLang(o.date,date=True) ]]</para>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_Bold_9">
+    <blockTable colWidths="268.0,271.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Inventory</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,271.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(o.date,date_time=True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_Bold_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="114.0,93.0,195.0,66.0,71.0" style="Table4">
+    <blockTable colWidths="114.0,93.0,194.0,66.0,71.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Location</para>
@@ -165,7 +179,7 @@
     </para>
     <section>
       <para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
-      <blockTable colWidths="114.0,93.0,195.0,66.0,71.0" style="Table8">
+      <blockTable colWidths="114.0,93.0,194.0,66.0,71.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ p.location_id.name ]]</para>
@@ -208,4 +222,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 3fd8ddc9e3a5abf44c8b2e228a1595645eeaaeef Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 17:34:41 +0530
Subject: [PATCH 38/73] [IMP]:hr_timesheet_sheet:add description

bzr revid: apa@tinyerp.com-20100901120441-s8y6mzyzlqt56tib
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index eff72612710..acbe668df25 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -93,6 +93,7 @@ class hr_timesheet_sheet(osv.osv):
     _name = "hr_timesheet_sheet.sheet"
     _table = 'hr_timesheet_sheet_sheet'
     _order = "id desc"
+    _description="Timesheet"
 
     def _total_day(self, cr, uid, ids, name, args, context=None):
         res = {}
@@ -147,7 +148,7 @@ class hr_timesheet_sheet(osv.osv):
                 sheet_id = link_emp[emp.id]
                 result[sheet_id] = emp.state
         return result
-    
+
     def check_employee_attendance_state(self, cr, uid, sheet_id, context=None):
         ids_signin = self.pool.get('hr.attendance').search(cr,uid,[('sheet_id', '=', sheet_id),('action','=','sign_in')])
         ids_signout = self.pool.get('hr.attendance').search(cr,uid,[('sheet_id', '=', sheet_id),('action','=','sign_out')])

From 86d85418a9984192920560dfdcde0a7ad5049e13 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 17:43:31 +0530
Subject: [PATCH 39/73] [IMP]:sale,purchase:improved reports.

bzr revid: apa@tinyerp.com-20100901121331-qln2ziblv3mdor4v
---
 addons/purchase/report/order.rml  | 8 ++++----
 addons/sale/report/sale_order.rml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index d836d2cd04e..c104f0db0e0 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -281,7 +281,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -332,7 +332,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -345,7 +345,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -358,7 +358,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 9ce79bb55ed..fc652b0de4f 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -260,7 +260,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -311,7 +311,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -324,7 +324,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -337,7 +337,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.code ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]] </para>
         </td>
       </tr>
     </blockTable>

From 09b5a6512e5cfcd83d764da9553ace23c9827e12 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 1 Sep 2010 17:56:56 +0530
Subject: [PATCH 40/73] [IMP] Configuration wizards: Improved text, tooltips
 and views.

bzr revid: uco@tinyerp.com-20100901122656-seo554egnr462lcm
---
 addons/account/account_installer.xml          | 22 +++++++--------
 addons/account/installer.py                   |  7 +++--
 addons/base_setup/base_setup_installer.xml    |  3 +--
 addons/base_setup/installer.py                | 12 ++++-----
 addons/crm/crm_installer.py                   | 12 ++++-----
 addons/crm/crm_installer_view.xml             |  2 +-
 addons/hr/hr_installer.xml                    |  2 +-
 addons/hr/installer.py                        |  7 ++---
 addons/knowledge/installer.py                 |  6 ++---
 addons/mrp/installer.py                       |  4 +--
 addons/mrp/mrp_installer.xml                  |  2 +-
 addons/outlook/installer.py                   | 24 ++++++++---------
 addons/outlook/outlook_installer.xml          |  6 ++---
 addons/profile_tools/misc_tools_installer.xml |  2 +-
 addons/purchase/wizard/purchase_installer.py  |  2 +-
 addons/report_designer/installer.py           |  4 +--
 .../report_designer_installer.xml             |  2 +-
 addons/sale/sale_installer.py                 |  4 +--
 addons/sale/sale_installer.xml                |  2 +-
 addons/thunderbird/installer.py               | 27 +++++++++----------
 addons/thunderbird/thunderbird_installer.xml  |  6 ++---
 21 files changed, 75 insertions(+), 83 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 3e8be7dc2e6..f55b5d0ae7d 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -8,13 +8,13 @@
             <field name="arch" type="xml">
             <data>
                 <form position="attributes">
-                    <attribute name="string">Accounting System Configuration</attribute>
+                    <attribute name="string">Accounting Modules Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
                     <attribute name="string">Configure Your Accounting System</attribute>
                 </separator>
                 <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
+                    <attribute name="string">Configure your accounting system. By default, Chart of Account is matching to your country. If there are not chart of account certified for your county, you can install the generic chart of account.</attribute>
                 </xpath>
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
@@ -66,7 +66,7 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Extra Accounting Modules Installation</attribute>
+                        <attribute name="string">Extra Accounting Modules</attribute>
                     </form>
                     <separator string="title" position="attributes">
                         <attribute name="string">Install Extra Accounting Modules In Your Accounting System</attribute>
@@ -75,19 +75,15 @@
                         <attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
                     </xpath>
                     <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                        <attribute name='rowspan'>23</attribute>
                         <attribute name='string'></attribute>
                     </xpath>
                     <group colspan="8">
-                        <group colspan="4" height="450" width="600">
-                            <group colspan="4">
-                                <field name="account_analytic_plans"/>
-                                <field name="account_payment"/>
-                                <field name="account_followup"/>
-                                <field name="account_voucher"/>
-<!--                                <field name="account_voucher_payment"/>-->
-                            </group>
-                        </group>
+                        <field name="account_voucher"/>
+                        <field name="account_followup"/>
+                        <field name="account_payment"/>
+                        <field name="account_analytic_plans"/>
+                        <field name="account_anglo_saxon"/>
+<!--                    <field name="account_voucher_payment"/>-->
                     </group>
                 </data>
             </field>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 54ef92b8fb9..17a97204c13 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -53,7 +53,7 @@ class account_installer(osv.osv_memory):
     _columns = {
         # Accounting
         'charts':fields.selection(_get_charts, 'Chart of Accounts',
-            required=False,
+            required=True,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
                  "country."),
@@ -609,7 +609,10 @@ class account_installer_modules(osv.osv_memory):
                  "per-partner policies."),
         'account_voucher':fields.boolean('Voucher Management',
             help="Account Voucher module includes all the basic requirements of "
-                 "Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... "),
+                 "Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
+        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
+            help="This module will support the Anglo-Saxons accounting methodology by "
+                "changing the accounting logic with stock transactions."),
 #        'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
 #            help="Extension Account Voucher module includes allows to link payment / receipt "
 #                 "entries with voucher, also automatically reconcile during the payment and receipt entries."),
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index cdaf66100ac..5a48b418caf 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -12,8 +12,7 @@
           </form>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string"
-                       >The most common applications have been pre selected. You can directly install them. You can either choose generic modules, or select modules for specific business sectors and industries. If you do not think you need any of these right now, you can easily install them later.</attribute>
+            <attribute name="string">Select applications you want to install. If you don't think you need any of these right now, you can easily install them later.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 2886857a45d..708d9877297 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -59,9 +59,7 @@ class base_setup_installer(osv.osv_memory):
             help="Helps you manage your purchase-related processes such as "
                  "requests for quotations, supplier invoices, etc..."),
         'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your "
-                 "employee structure, generating work sheets, tracking "
-                 "attendance and more."),
+            help="Add as to employee, it is employees structure"),
         'point_of_sale':fields.boolean('Point of Sales',
             help="Helps you get the most out of your points of sales with "
                  "fast sale encoding, simplified payment mode encoding, "
@@ -69,16 +67,16 @@ class base_setup_installer(osv.osv_memory):
         'marketing':fields.boolean('Marketing',
             help="Helps you manage your marketing campaigns step by step."),
         'misc_tools':fields.boolean('Miscellaneous Tools',
-            help="Lets you install various interesting but non-essential "
-                 "tools like Survey, Lunch,..."),
+            help="Lets you install various interesting but non-essential tools "
+                "like Survey, Lunch and Ideas box."),
         'report_designer':fields.boolean('Advanced Reporting',
             help="Lets you install various tools to simplify and enhance "
                  "OpenERP's report creation."),
         'thunderbird' :fields.boolean('Thunderbird'),
         # Vertical modules
         'product_expiry':fields.boolean('Food Industry',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage foods."),
+            help="Installs a preselected set of OpenERP applications "
+                "which will help you manage your insdustry"),
         'association':fields.boolean('Associations',
             help="Installs a preselected set of OpenERP "
                  "applications which will help you manage your association "
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 39620c44139..7bba2bd6f3b 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -34,13 +34,13 @@ class crm_installer(osv.osv_memory):
     _columns = {
         'name': fields.char('Name', size=64),
         'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."),
-        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale to opportunity cases in the CRM."),
+        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
+        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
         'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
-        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),
-        'outlook': fields.boolean('MS-Outlook', help="Microsoft Office Outlook Interface."),
+        'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP' documents. You can attach it to any existing one in OpenERP or create a new one"),
+        'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP' documents. You can attach it to any existing one in OpenERP or create a new one"),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."),
     }
 
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 0b5b87ff485..910027763a1 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -39,7 +39,7 @@
           		<field name="fetchmail" />
           	</group>
           	<group colspan="2" col="2">
-			<separator string="Plugins" colspan="4" />
+			<separator string="Plug-In" colspan="4" />
           		<field name="thunderbird" />
           		<field name="outlook" />
           	</group>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 934f5889ab3..50e858e6a80 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -19,7 +19,7 @@
                 <attribute name='string'></attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
+                <attribute name="string">TYou can enhance the base HR addon by installing a few HR-related applications.</attribute>
             </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 15bf615c920..7977d09e784 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -26,10 +26,7 @@ class hr_installer(osv.osv_memory):
     _columns = {
         # Human Resources Management
         'hr_holidays': fields.boolean('Holidays / Leaves Management',
-            help="Tracks employee leaves allocations, requests and planning."
-                 "\n\nCan also plug into OpenERP's agendas and calendars "
-                 "applications in order to display accepted leaves requests on"
-                 " OpenERP's calendars."),
+            help="Tracks employee leaves, allocation requests and planning."),
         'hr_expense': fields.boolean('Expenses',
             help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
@@ -45,7 +42,7 @@ class hr_installer(osv.osv_memory):
             help="Lets you create and manage the periodic evaluation and "
                  "performance review of employees."),
         'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
-            help="Simplifies the management of employee attendances."),
+            help="Simplifies the management of employee's attendances."),
         'hr_payroll': fields.boolean('Payroll',
             help="Generic Payroll system"),
         'hr_payroll_account': fields.boolean('Payroll Accounting',
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index f3ee456944d..7840ffbc276 100644
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -27,9 +27,9 @@ class knowledge_installer(osv.osv_memory):
     _columns = {
         # Knowledge Management
         'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through a standard FTP client."),
+            help="Provides an FTP access to your OpenERP's "
+                "Document Management System. It lets you access attachments "
+                "and virtual documents through a standard FTP client."),
         'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
             help="Provides a WebDAV access to your OpenERP's Document "
                  "Management System. Lets you access attachments and "
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index 361998f50bd..e1dc79e5d32 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -37,10 +37,10 @@ class mrp_installer(osv.osv_memory):
                  "procurement scheduler manually."),
         'mrp_operations': fields.boolean('Manufacturing Operations',
             help="Enhances production orders with readiness states as well "
-                 "as the dates of start and end of execution of the order."),
+                 "as the date of start and end of execution of the order."),
         'mrp_subproduct': fields.boolean('MRP Subproducts',
             help="Enables multiple product output from a single production "
-                 "order: without this, a productio order can have only one "
+                 "order : without this, a production order can have only one "
                  "output product."),
         'mrp_repair': fields.boolean('Repairs',
             help="Enables warranty and repair management (and their impact "
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index e960a8069c9..bcec9af75f6 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">MRP Modules Installation</attribute>
+            <attribute name="string">MRP Modules Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index b0459ccbaeb..6961a868684 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -50,21 +50,21 @@ class outlook_installer(osv.osv_memory):
         'outlook' : True,
         'name' : 'OpenERP-Outlook-PlugIn.zip',
         'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
-        'description' : """ * Save the outlook plug­in.
-* Follows the step to install outlook plug­in.
+        'description' : """ * Save the Outlook plug­-in.
+* Follows these steps to install outlook plug­in.
 Pre-requirements :
-    1) Python 2.6+ .
-    2) Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
+    1. Python 2.6+ .
+    2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
 
 How to install openerp-outlook plug-in?
-    1) Extract zip file  “openerp-outlook-plugin.zip” .
-    2) Open the folder openerp-outlook-plugin.
-    3) And Run “Register-plugin.bat” file.
-    4) Run Outlook and Check addin has been registered.
-    5) Tools->OpenERP Configuration and test your connection.
-    6) See User Guide for More. 
-    7) Keep All extratced files in some safe palce
-        (e.g. python installation Directory "C:\pythonXX\\" or Windows installation Directory "C:\Program Files\\"  ).
+    1. Extract zip file  “openerp-outlook-plugin.zip” .
+    2. Open the folder openerp-outlook-plugin.
+    3. Run “Register-plugin.bat” file.
+    4. Run Outlook and Check addon has been registered.
+    5. Tools->OpenERP Configuration and test your connection.
+    6. See User Guide for more information. 
+    7. Keep All extratced files in some safe places
+        (e.g. python installation Directory "C:\pythonXX\" or Windows installation Directory "C:\Program Files\"  ).
 """
         }
 outlook_installer()
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 85e923512f6..1b20945d816 100755
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -9,13 +9,13 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Outlook Plug-In Installation</attribute>
+                        <attribute name="string">Outlook Plug-In Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
                         <attribute name="string">Outlook</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">This Module allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, a task, a project, an analytical account, or any other object and Archived selected mail in mailgate.messages with attachments.</attribute>
+                        <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="attributes">
                         <attribute name="string">Configure</attribute>
@@ -34,7 +34,7 @@
                                 <newline/>
                             <field name="doc_file" filename="doc_name"/>
                                 <newline/>
-                            <separator string="Outlook plugin installation note." colspan="4"/>
+                            <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
                     </group>
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 9499518ee25..ad2784ad6cb 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -19,7 +19,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
+            <attribute name="string">Here are applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index 010f847ad99..bf106adc3ac 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -25,7 +25,7 @@ class purchase_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allow you to easily keep track and manage all your purchase orders."),
+        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
         'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
     }
 purchase_installer()
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index d67ebabb77e..e8b45db1248 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -29,14 +29,14 @@ class report_designer_installer(osv.osv_memory):
         'base_report_designer':fields.boolean('OpenOffice Report Designer',help="This module adds wizards to import/export .SXW report that "
                                 "you can modify in OpenOffice.Once you have modified it you can "
                                 "upload the report using the same wizard."),
-        'base_report_creator':fields.boolean('Query Builder',help="his module allows you to create any statistic "
+        'base_report_creator':fields.boolean('Query Builder',help="Query Builder allows you to create any statistic "
                                 "reports  on several objects. It's a SQL query builder and browser for and users. "
                                 "After installation, it adds a menu to define custom report in the Dashboard menu."),
         'olap':fields.boolean('Business Intelligence Report',help="Olap module is used to install BI module in client. Olap provides Online "
                                 "Analytical Process with the mdx query. BI provides Cube Browsing and Cube Designing. "
                                 "After installation you will get Cube Browser and Cube Desinger in Reporting Menu. "
                                 "Cube Browser is used to generate the reports with table view (mdx view) of mdx query "
-                                "and Cube designer is used to make cubes in BI."),
+                                "and Cube Designer is used to make cubes in BI."),
     }
 report_designer_installer()
 
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 3afd23f45ed..79381691d32 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Report Modules Installation</attribute>
+            <attribute name="string">Report Modules Configuration</attribute>
           </form>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index 92758559439..2bf00b80885 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -26,8 +26,8 @@ class sale_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'sale_analytic_plans': fields.boolean('Sales Analytic Distribution Management',
-            help="The base module to manage analytic distribution and sales orders."),
+        'sale_analytic_plans': fields.boolean('Sales Analytic Distribution',
+            help="The base module to manage analytic distribution and sale orders."),
         'sale_journal': fields.boolean('Sales and deliveries by journal',
             help="The sale journal modules allows you to categorise your "
                 "sales and deliveries (picking lists) between different journals. "
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 71f26f6dcd7..a68af46bd73 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Sale Management Modules Configuration</attribute>
+            <attribute name="string">Sale Modules Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 8f852e9ebff..14a819aa2c7 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -52,20 +52,19 @@ class thunderbird_installer(osv.osv_memory):
         'name' : 'openerp_plugin.xpi',
         'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf',
         'description' : """* Save the Thunderbird plug-­in.
-* Follow the following steps to install Thunderbird plug-­in.
-    1. From Menu Bar of Thunderbird, open Tools ­> Add-ons.
-    2. Click install button and a browser window appears.
-    3. Select the plug-in(openerp_plugin.xpi file) and click Ok.
-    4. A software installation window appears and within a short time “Install Now” button will be enabled.
-    5. Click "Install Now".
-    6. Restart Thunderbird.
-* Follow the steps to configure OpenERP in Thunderbird.
-    1. Go to Tools > OpenERP Configuration.
-    2. Check  data (configured by default).
-    3. Click "Connect".
-    4. A message appears with state of your connection.
-    5. If your connection failed, check if your database is open, and check your data again.
-    6. If your database is connected successfully, you can start to archive your e-mail in OpenERP. """
+        * Follow these steps to install Thunderbird plug-­in.
+            1. From Menu Bar of Thunderbird, open Tools ­> Add-ons.
+            2. Click install button.
+            3. Select the plug-in(openerp_plugin.xpi file)
+            5. Click "Install Now".
+            6. Restart Thunderbird.
+        * Follow the steps to configure OpenERP in Thunderbird.
+            1. Go to Tools > OpenERP Configuration.
+            2. Check data (configured by default).
+            3. Click "Connect".
+            4. A message appears with the state of your connection.
+            5. If your connection failed, check if your database is opened, and check data again.
+            6. If your database is connected successfully, you can start to archive your e-mail in OpenERP. """
     }
 
 thunderbird_installer()
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index b12656ba08b..0b30e8addce 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,13 +9,13 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Thunderbird Module Installation</attribute>
+                  <attribute name="string">Thunderbird Plug-In Configuration</attribute>
               </form>
               <separator string="title" position="attributes">
                    <attribute name="string">Thunderbird</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
-                  <attribute name="string">This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more.</attribute>
+                  <attribute name="string">This plug-in allows you to link your e-mail to OpenERP' documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
 	      <xpath expr="//button[@string='Install Modules']" position="attributes">
 	        <attribute name="string">Configure</attribute>
@@ -84,7 +84,7 @@
 		                  <newline/>
 		                  <field name="pdf_file" filename="pdf_name"/>
 		                  <newline/>
-		                  <separator string="Thunderbird plugin installation note." colspan="4"/>
+		                  <separator string="Installation and Configuration Steps" colspan="4"/>
 		                  <field name="description" nolabel="1" colspan="8"/>
 		               </group>
                    </group>

From 5954cf4883f1b80392092abc928c619dcb38dae5 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 19:01:39 +0530
Subject: [PATCH 41/73] [IMP]:stock:Location Content

bzr revid: apa@tinyerp.com-20100901133139-e8v8jhc37l4izh8f
---
 addons/stock/report/lot_overview_all.py  |  10 +-
 addons/stock/report/lot_overview_all.rml | 347 ++++++++---------------
 2 files changed, 121 insertions(+), 236 deletions(-)

diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index 5e6bba84d23..c523b9775d1 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.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/>.
 #
 ##############################################################################
 import pooler
@@ -44,12 +44,12 @@ class lot_overview_all(report_sxw.rml_parse):
         return [data]
 
     def _price_total(self):
-        return str( self.price_total)
+        return self.price_total
 
     def _grand_total(self):
-        return str( self.grand_total)
+        return self.grand_total
 
-report_sxw.report_sxw('report.lot.stock.overview_all', 'stock.location', 'addons/stock/report/lot_overview_all.rml', parser=lot_overview_all)
+report_sxw.report_sxw('report.lot.stock.overview_all', 'stock.location', 'addons/stock/report/lot_overview_all.rml', parser=lot_overview_all,header='internal')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index ac3207a5b6e..c21ccb5e3eb 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="All Lot Overview" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Location Content" 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>
@@ -18,21 +18,11 @@
       <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-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"/>
-      <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="#999999" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -42,12 +32,14 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <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="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
@@ -58,38 +50,20 @@
       <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"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" 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" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.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="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" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.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="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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"/>
@@ -105,180 +79,116 @@
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_9" rightIndent="0.0" leftIndent="0.0" 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>
-  <images/>
   <story>
+    <para style="terp_header_Centre">Location Content</para>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-      <section>
-        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
-        <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" style="Table1">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Code</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Product</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Variants</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Amount</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">UoM</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Unit Price</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Value</para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" 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>
-            <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>
-            <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_8">[[ repeatIn(ob['product'],'p') ]]</para>
-          <blockTable colWidths="20.0,120.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" style="Table4">
-            <tr>
-              <td>
-                <para style="P2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ p['code'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ p['prod_name'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ p['variants'] ]]</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>
-              <td>
-                <para style="terp_default_Right_9">[[ p['price'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ p['price_value'] ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </section>
-        <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" 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">
-                <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>
-            <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_Right">[[ price_total() ]]</para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-      </section>
+      <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
+      <blockTable colWidths="240.0,55.0,64.0,59.0,65.0" repeatRows="1" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Location / Product</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Variants</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Unit Price</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Value([[ o.company_id.currency_id.name ]])</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="240.0,55.0,64.0,59.0,65.0" repeatRows="1" style="Table3">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ 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>
+          <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_8">[[ repeatIn(ob['product'],'p') ]]</para>
+        <blockTable colWidths="34.0,206.0,56.0,64.0,59.0,65.0" repeatRows="1" style="Table4">
+          <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['variants'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(p['price_value'] )]] [[ o.company_id.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <blockTable colWidths="34.0,206.0,128.0,115.0" repeatRows="1" style="Table5">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Total:</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+      </blockTable>
     </section>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="73.0,36.0,133.0,46.0,58.0,34.0,56.0,47.0" repeatRows="1" style="Table2">
+    <blockTable colWidths="239.0,128.0,115.0" repeatRows="1" style="Table2">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Grand Total:</para>
@@ -289,32 +199,7 @@
           </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>
-        <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_Right">[[ grand_total_price() ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -322,4 +207,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From b830e763cc4539e1e64dde29add5d74bef0c26a0 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 1 Sep 2010 19:49:37 +0530
Subject: [PATCH 42/73] [IMP]:stock:Location Content

bzr revid: apa@tinyerp.com-20100901141937-89hjh7k3o0jmpx73
---
 addons/stock/report/lot_overview_all.rml | 202 ++++++++++++-----------
 1 file changed, 103 insertions(+), 99 deletions(-)

diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index c21ccb5e3eb..5fb67ca24c1 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -10,7 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -19,27 +19,26 @@
       <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="Table3">
+    <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table8">
       <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"/>
-      <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="#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="Table5">
+    <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <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="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
@@ -87,62 +86,96 @@
     <images/>
   </stylesheet>
   <story>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <para style="terp_header_Centre">Location Content</para>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="233.0,60.0,59.0,59.0,72.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Location / Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Variants</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Value([[ company.currency_id.name ]])</para>
+        </td>
+      </tr>
+    </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
-      <blockTable colWidths="240.0,55.0,64.0,59.0,65.0" repeatRows="1" style="Table1">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Location / Product</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Variants</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Quantity</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Unit Price</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Value([[ o.company_id.currency_id.name ]])</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="240.0,55.0,64.0,59.0,65.0" repeatRows="1" style="Table3">
-        <tr>
-          <td>
-            <para style="terp_default_Bold_9">[[ 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>
-          <td>
-            <para style="terp_tblheader_Details">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
+      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
-        <blockTable colWidths="34.0,206.0,56.0,64.0,59.0,65.0" repeatRows="1" style="Table4">
+        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
+        <blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
+          <tr>
+            <td>
+              <para style="terp_default_Bold_9">[[ ob['location_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Bold_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
+          <blockTable colWidths="38.0,196.0,60.0,59.0,58.0,72.0" style="Table8">
+            <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_Centre_9">[[ p['variants'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+        <blockTable colWidths="38.0,366.0,78.0" style="Table10">
           <tr>
             <td>
               <para style="terp_default_9">
@@ -150,51 +183,22 @@
               </para>
             </td>
             <td>
-              <para style="terp_default_9">[ [[ p['code'] ]] ] [[ p['prod_name'] ]]</para>
+              <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ p['variants'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_9">[[ formatLang(p['price_value'] )]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
-      <blockTable colWidths="34.0,206.0,128.0,115.0" repeatRows="1" style="Table5">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details">Total:</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
-          </td>
-        </tr>
-      </blockTable>
     </section>
-    <blockTable colWidths="239.0,128.0,115.0" repeatRows="1" style="Table2">
+    <blockTable colWidths="71.0,334.0,77.0" repeatRows="1" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Grand Total:</para>
+          <para style="terp_default_Bold_9">Grand Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
@@ -203,7 +207,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>

From a2517b2184b05fe0edac1642250a3497c33bb8e1 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 3 Sep 2010 10:58:48 +0530
Subject: [PATCH 43/73] [IMP]:account:invoice report

bzr revid: apa@tinyerp.com-20100903052848-vs1of421twpl02vj
---
 addons/account/report/invoice.rml | 108 ++++++------------------------
 1 file changed, 21 insertions(+), 87 deletions(-)

diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index a445a32c374..e13d5097951 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -61,8 +61,6 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Format_2">
       <blockAlignment value="LEFT"/>
@@ -82,10 +80,8 @@
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
       <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="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="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="0,1"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
@@ -94,10 +90,8 @@
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,4" stop="0,4"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,4" stop="1,4"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,4" stop="2,4"/>
     </blockTableStyle>
     <blockTableStyle id="Table_format_Table_Line_total">
       <blockAlignment value="LEFT"/>
@@ -114,7 +108,6 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Taxes_Total">
       <blockAlignment value="LEFT"/>
@@ -125,33 +118,10 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <!--lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="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="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="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" 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="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="LINEBEFORE" colorName="#ffffff" start="0,4" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,4" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/-->
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -230,15 +200,16 @@
         </td>
         <td>
           <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street2 or '' ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or removeParentNode('para') ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
+          <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
           <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
@@ -269,20 +240,20 @@
     <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
       <tr>
         <td>
-          <para style="terp_default_Centre_9">[[ o.name ]]</para>
+          <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="211.0,62.0,63.0,63.0,43.0,83.0" style="Table_Header_Invoice_Line">
+    <blockTable colWidths="211.0,74.0,62.0,59.0,51.0,68.0" style="Table_Header_Invoice_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -306,7 +277,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="211.0,62.0,41.0,22.0,63.0,42.0,59.0,23.0" style="Table_Invoice_Line_Content">
+      <blockTable colWidths="211.0,70.0,60.0,58.0,49.0,74.0" style="Table_Invoice_Line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ l.name ]]</para>
@@ -315,10 +286,7 @@
             <para style="terp_default_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
@@ -327,10 +295,7 @@
             <para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -365,16 +330,6 @@
               <font color="white"> </font>
             </para>
           </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
         </tr>
       </blockTable>
     </section>
@@ -397,48 +352,39 @@
           </blockTable>
         </td>
         <td>
-          <blockTable colWidths="62.0,62.0,22.0" style="Table_eclu_Taxes_Total">
+          <blockTable colWidths="62.0,84.0" style="Table_eclu_Taxes_Total">
             <tr>
               <td>
                 <para style="terp_default_9">Net Total:</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
-          <blockTable colWidths="63.0,61.0,23.0" style="Table_Taxes_Total">
+          <blockTable colWidths="63.0,84.0" style="Table_Taxes_Total">
             <tr>
               <td>
                 <para style="terp_default_9">Taxes:</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
-          <blockTable colWidths="63.0,61.0,23.0" style="Table_Total_Include_Taxes">
+          <blockTable colWidths="63.0,84.0" style="Table_Total_Include_Taxes">
             <tr>
               <td>
                 <para style="terp_default_Bold_9">Total:</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+                <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -461,9 +407,6 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
         </td>
       </tr>
       <tr>
@@ -484,13 +427,6 @@
           </blockTable>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
     </blockTable>
     <blockTable colWidths="530.0" style="Table3">
       <tr>
@@ -516,8 +452,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
+
   </story>
-</document>
+</document>
\ No newline at end of file

From d08f3c25c6563bd9b58ba972afca12e4a571da9e Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 3 Sep 2010 11:09:15 +0530
Subject: [PATCH 44/73] [IMP]:account:account balance report

bzr revid: apa@tinyerp.com-20100903053915-emaur6fmwazjnfda
---
 addons/account/report/account_balance.rml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 65d8b1186ea..eb221a6427b 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -246,10 +246,10 @@
             </tr>
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para>
+                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para>
+                <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -287,16 +287,16 @@
       <tr noRowsplits="1">
         <td><para style="P12a">Code</para></td>
         <td><para style="P12a">Account</para></td>
-        <td><para style="P10">Debit</para></td>
-        <td><para style="P10">Credit</para></td>
-        <td><para style="P10">Balance</para></td>
+        <td><para style="P10">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10">Credit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10">Balance([[ company.currency_id.code]])</para></td>
       </tr>
       <tr>
 		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
-        <td><para style="P14"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
-        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
-        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
-        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
+        <td><para style="P14"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
       </tr>
     </blockTable>
     <para style="P11">

From 7387a60a24bd046effef23462e8d3efceffbb349 Mon Sep 17 00:00:00 2001
From: "apa,saz" <>
Date: Fri, 3 Sep 2010 12:59:19 +0530
Subject: [PATCH 45/73] [IMP]:improved reports

bzr revid: apa@tinyerp.com-20100903072919-hbhrv3st8ebbftqs
---
 addons/delivery/report/shipping.rml | 19 ++++++-------
 addons/mrp/report/order.rml         | 44 ++++++++---------------------
 addons/mrp/report/price.py          |  2 +-
 addons/sale/report/sale_order.rml   | 25 ++++++++--------
 addons/stock/report/picking.rml     | 22 +++++++--------
 5 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 80dd4ab2ff5..2c7107c2386 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -67,7 +67,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -117,16 +116,17 @@
           <para style="terp_default_Bold_9">Invoiced to</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ (o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street2) or removeParentNode('para')]]</para>
+          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']] [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ (o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.state_id and o.sale_id.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]</para>
         </td>
         <td>
           <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.name or '']]</para>
           <para style="terp_default_9">[[ o.address_id and o.address_id.street or '']]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.zip or '']]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.city or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.street2 or removeParentNode('para')]]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.zip or '']] [[ o.address_id and o.address_id.city or '']]</para>
+          <para style="terp_default_9">[[ (o.address_id and o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '']]</para>
         </td>
       </tr>
@@ -194,7 +194,7 @@
     </para>
     <section>
       <para style="terp_default_9">[[repeatIn(o.move_lines,'line')]]</para>
-      <blockTable colWidths="370.0,85.0,59.0,24.0" style="Table4">
+      <blockTable colWidths="370.0,85.0,83.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]</para>
@@ -203,10 +203,7 @@
             <para style="terp_default_Centre_9">[[ (line.prodlot_id and (line.prodlot_id.name + (line.prodlot_id.ref and ('/' + line.prodlot_id.ref) or ''))) or ' ' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.product_qty) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.product_uom and line.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.product_qty) ]] [[ line.product_uom and line.product_uom.name ]]</para>
           </td>
         </tr>
       </blockTable>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 35e509b9033..e1e23205cfd 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -17,12 +17,9 @@
       <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="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="Table5">
       <blockAlignment value="LEFT"/>
@@ -31,12 +28,9 @@
       <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="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="Table1">
       <blockAlignment value="LEFT"/>
@@ -127,7 +121,6 @@
       <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -136,7 +129,6 @@
       <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"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -175,7 +167,7 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]] </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -183,7 +175,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,93.0,242.0" style="Table3">
+    <blockTable colWidths="399.0,128.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Product </para>
@@ -191,12 +183,9 @@
         <td>
           <para style="terp_tblheader_General_Centre">Quantity</para>
         </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Note</para>
-        </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="193.0,93.0,242.0" style="Table5">
+    <blockTable colWidths="399.0,129.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
@@ -204,9 +193,6 @@
         <td>
           <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ o.product_uom.name ]]</para>
         </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.product_id.description or '' ]]</para>
-        </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
@@ -249,7 +235,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_Bold_8">Work Orders <font face="Helvetica" size="10.0">[[ o.workcenter_lines ==[] and removeParentNode('para')]]</font></para>
+    <para style="terp_default_Bold_8">Work Orders [[ o.workcenter_lines ==[] and removeParentNode('para')]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -259,7 +245,7 @@
           <para style="terp_tblheader_General_Centre">Sequence</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Name <font face="Helvetica" size="10.0">[[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]</font></para>
+          <para style="terp_tblheader_Details_Centre">Name [[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">WorkCenter</para>
@@ -304,7 +290,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="250.0,66.0,107.0,104.0" style="Table8">
+    <blockTable colWidths="256.0,61.0,107.0,104.0" style="Table8">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product </para>
@@ -324,16 +310,13 @@
       <para style="terp_default_Bold_9">Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]</para>
       <section>
         <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
-        <blockTable colWidths="250.0,42.0,23.0,109.0,104.0" style="Table9">
+        <blockTable colWidths="250.0,65.0,108.0,104.0" style="Table9">
           <tr>
             <td>
               <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] </para>
-            </td>
-            <td>
-              <para style="terp_default_9">[[line.product_uom.name]]</para>
+              <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] [[ line.product_uom.name]] </para>
             </td>
             <td>
               <para style="terp_default_Centre_9">[[ line.location_id.name ]]</para>
@@ -349,16 +332,13 @@
       <para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</para>
       <section>
         <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>
-        <blockTable colWidths="251.0,41.0,23.0,109.0,104.0" style="Table10">
+        <blockTable colWidths="251.0,66.0,106.0,104.0" style="Table10">
           <tr>
             <td>
               <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] </para>
-            </td>
-            <td>
-              <para style="terp_default_9">[[line2.product_uom.name]]</para>
+              <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] [[ line2.product_uom.name]] </para>
             </td>
             <td>
               <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 8890ed533d7..b639edb18ea 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -130,7 +130,7 @@ class report_custom(report_rml):
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                 </row>
-        """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
+        """ % (_('Component'), _('Component suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
 
         company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
         for product in product_pool.browse(cr, uid, ids, context=context):
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index fc652b0de4f..4dc61188e19 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -133,19 +133,21 @@
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
           <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.street ]] </para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2)) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]][[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -154,11 +156,10 @@
         </td>
         <td>
           <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -311,7 +312,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -324,7 +325,7 @@
           <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>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -337,7 +338,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -360,4 +361,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 35067f0b482..86d4405838c 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -128,19 +128,17 @@
         <td>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
-
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
+		  <para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (  picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
@@ -195,7 +193,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ 'weight' in picking._columns.keys() and picking.weight or '']] </para>
+          <para style="terp_tblheader_Details_Centre">[[ 'weight' in picking._columns.keys() and picking.weight or '']] </para>
         </td>
       </tr>
     </blockTable>
@@ -247,7 +245,7 @@
             <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -283,7 +281,7 @@
             <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>

From 3db8f8fd6d203d2f48488eabc547a6500b8fb776 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Fri, 3 Sep 2010 15:17:11 +0530
Subject: [PATCH 46/73] [IMP] mrp: Improved yaml.

bzr revid: uco@tinyerp.com-20100903094711-rvmbd333mavm8muq
---
 addons/mrp/__openerp__.py                |  3 +-
 addons/mrp/test/mrp_packs.yml            | 11 ++++++-
 addons/mrp/test/mrp_phantom_bom.yml      | 37 +++++++++++++++++++++---
 addons/mrp/test/mrp_procurement.yml      |  4 +--
 addons/mrp/test/mrp_production_order.yml |  4 ++-
 5 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index cdc5dd6b5ac..f8630065598 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -88,10 +88,11 @@
          'board_manufacturing_demo.xml'
     ],
     'test': [
+         'test/mrp_procurement.yml',
          'test/mrp_packs.yml',
          'test/mrp_phantom_bom.yml',
          'test/mrp_production_order.yml',
-         'test/mrp_procurement.yml'
+         
     ],
     'installable': True,
     'active': False,
diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
index 6b3fbd08fba..76e3eb58f2c 100644
--- a/addons/mrp/test/mrp_packs.yml
+++ b/addons/mrp/test/mrp_packs.yml
@@ -8,6 +8,10 @@
     categ_id: product.cat1
     name: Beers
     procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_agrolait
+        min_qty: 2.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit
@@ -19,6 +23,10 @@
     categ_id: product.cat1
     name: Beers Pack
     procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        min_qty: 2.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit
@@ -87,8 +95,9 @@
   converted to a picking of 24 beers and a pack of beer, so that my
   stock of beers remains exact.
 -
-  !assert {model: stock.picking, id: picking_out, string:pack_of_beer_splitted}:
+  !assert {model: stock.picking, id: picking_out, string: pack_of_beer_splitted}:
     - len(move_lines) == 2
     - move_lines[0].product_id.id <> move_lines[1].product_id.id
     - move_lines[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
     - move_lines[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
+    
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 1cb7aa9b631..05b5984dbee 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -67,7 +67,11 @@
   !record {model: product.product, id: product_product_water0}:
     categ_id: product.cat1
     name: Water
-    procure_method: make_to_stock
+    procure_method: make_to_order
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_agrolait
+        min_qty: 2.0
     supply_method: buy
     type: consu
     uom_id: product_uom_litre0
@@ -196,7 +200,7 @@
 -
   !python {model: procurement.order}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
+    proc_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
@@ -256,7 +260,7 @@
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
+     picking_ids = pick_obj.search(cr, uid, [('type','=','in'),('state','=','assigned')])
      partial = self.browse(cr, uid, 1, context)
      partial_datas = {
             'delivery_date': partial.date         
@@ -274,4 +278,29 @@
                         'product_currency': m.product_currency
                     })
      pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
-
+-
+  Again the scheduler runs.
+-
+  !function {model: procurement.order, name: run_scheduler}:
+    - model: procurement.order
+      search: "[('state','!=','confirmed')]"
+-
+  I check my internal picking of "Orange Juice" is done.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('type','=','internal'),('state','=','done')])
+    assert pick_ids, _('Internal Picking is not done yet!')
+-
+  I check my manufacturing order for "Orange Juice" is ready or not.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('state','=','ready'),('id','=',ref('mrp_production_mo0'))])
+    assert pick_ids, _('Manufacturing order is not ready!')
+-
+  I start the production order.
+-
+  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+    
+    
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 5ce256ab7d9..f85b8cbcee3 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -162,7 +162,7 @@
 -
   !function {model: procurement.order, name: run_scheduler}:
     - model: procurement.order
-      search: "[]"
+      search: "[('state','=','confirmed')]"
 -
   I check that there is one purchase order for Cloth.
 -
@@ -286,7 +286,7 @@
 -
   !function {model: procurement.order, name: run_scheduler}:
     - model: procurement.order
-      search: "[]"
+      search: "[('state','!=','confirmed')]"
 -
   Check state of manufacturing order for Shirt.
 -
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 0ceebfab107..476d79f7fab 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -86,7 +86,7 @@
 -
   !python {model: procurement.order}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
+    proc_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
@@ -110,6 +110,8 @@
     assert order_ids, _('No manufacturing order!')
 -
   I start producing that product first. So I marked it as started.
+-
+  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
 -
   I create record for producing products with quantity 5.00.
 -

From 30a7baee0ae3913b098664c6788f18e88655ebab Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Fri, 3 Sep 2010 15:18:32 +0530
Subject: [PATCH 47/73] [IMP] mrp: Load demo data without running Schedulers
 manually.

bzr revid: uco@tinyerp.com-20100903094832-19vlmiyibjpzi7xj
---
 addons/mrp/mrp_demo.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index fa54dc0096f..f454a8d14a8 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -713,6 +713,9 @@
             <field name="product_qty">12.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>
+    
+    <!-- Run Scheduler -->
+    <function model="procurement.order" name="run_scheduler"/>
 
     </data>
 </openerp>

From a3fe51e16438f274571478626fde433053fa4735 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@credativ.co.uk>
Date: Fri, 3 Sep 2010 12:14:55 +0100
Subject: [PATCH 48/73] Make 'Maximum Communication History' actually be a
 maximum.

bzr revid: daniel.watkins@credativ.co.uk-20100903111455-52oi01hlfj0wewzg
---
 addons/crm/crm_action_rule.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 1ca37a426a2..6805131155a 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -96,7 +96,7 @@ this if you want the rule to send an email to the partner."),
         res_count = True
         if action.trg_max_history:
             res_count = False
-            if len(obj.message_ids) >= action.trg_max_history:
+            if len(obj.message_ids) <= action.trg_max_history:
                 res_count = True
         ok = ok and res_count
         return ok

From 0cd651e4211880b493b558d8f26c0b335b55bfbf Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Fri, 3 Sep 2010 16:54:47 +0530
Subject: [PATCH 49/73] [IMP] mrp: Production Lot field should not be readonly.
 Improved alignment.

bzr revid: uco@tinyerp.com-20100903112447-ns238b37z3om6ryk
---
 addons/mrp/mrp.py       |  4 ++--
 addons/mrp/mrp_view.xml | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fd9f8335987..fad20da2589 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -459,9 +459,9 @@ class mrp_production(osv.osv):
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
         'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))], readonly=True),
+        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
         'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))], readonly=True),
+        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 058cc99a7b6..ec58b6627fb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -611,11 +611,11 @@
                                    <tree colors="red:scraped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                    <field name="product_uom" readonly="1" string="UOM"/>
-                                    <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
-                                    <field name="prodlot_id" />
-                                    <field name="state" invisible="1"/>
-                                    <field name="scraped" invisible="1"/>
+                                       <field name="product_uom" readonly="1" string="UOM"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+                                       <field name="prodlot_id" />
+                                       <field name="state" invisible="1"/>
+                                       <field name="scraped" invisible="1"/>
                                        <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
@@ -661,11 +661,11 @@
                                    <tree colors="red:scraped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                    <field name="product_uom" readonly="1" string="UOM"/>
-                                    <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+                                       <field name="product_uom" readonly="1" string="UOM"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                                        <field name="prodlot_id" />
-                                    <field name="state" invisible="1"/>
-                                    <field name="scraped" invisible="1"/>
+                                       <field name="state" invisible="1"/>
+                                       <field name="scraped" invisible="1"/>
                                        <button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                                        <button name="%(stock.move_scrap)d"

From 86a1d32b6e777d8efefc98cf7f147df3c0d17964 Mon Sep 17 00:00:00 2001
From: "apa,saz" <>
Date: Fri, 3 Sep 2010 18:03:25 +0530
Subject: [PATCH 50/73] [IMP]:improved reports

bzr revid: apa@tinyerp.com-20100903123325-rfl0juxifkm1l6n7
---
 .../account/report/account_general_ledger.rml | 38 ++++-----
 .../account_general_ledger_landscape.rml      | 83 +++++++++----------
 addons/stock/report/picking.rml               | 33 ++------
 3 files changed, 67 insertions(+), 87 deletions(-)

diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index ac940d13d34..cc0a7826647 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -146,7 +146,7 @@
     <paraStyle name="P3" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3_centre" fontName="Helvetica" fontSize="8.3" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P4_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -246,9 +246,9 @@
           <td><para style="P3">Ref</para></td>
           <td><para style="P3">Move</para></td>
           <td><para style="P3">Entry Label</para></td>
-          <td><para style="P4">Debit</para></td>
-          <td><para style="P4">Crebit</para></td>
-          <td><para style="P9">Balance</para></td>
+          <td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Crebit([[ company.currency_id.code]])</para></td>
+          <td><para style="P9">Balance([[ company.currency_id.code]])</para></td>
         </tr>
      </blockTable>
       <section>
@@ -260,9 +260,9 @@
 			<tr>
 			  <td><para style="Standard">[[ o.code or '']] [[ o.name or '']]</para></td>
 			  <td><para style="Standard"></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]]</u></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]]</u></para></td>
-			  <td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]]</u></para></td>
+			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  <td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
 			</tr>
 			</blockTable>
 			</td>
@@ -280,9 +280,9 @@
 			  <td><para style="P3">[[ line['lref'] or '']]</para></td>
 			  <td><para style="P3">[[ line['move'] or '']]</para></td>
 			  <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
-			  <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']) ]]</para></td>
+			  <td><para style="P4">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+			  <td><para style="P4">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
+			  <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
 	   </tr>
 	  </blockTable>
      </section>
@@ -296,9 +296,9 @@
           <td><para style="P3">Ref</para></td>
           <td><para style="P3">Move</para></td>
           <td><para style="P3">Entry Label</para></td>
-          <td><para style="P4">Debit</para></td>
-          <td><para style="P4">Crebit</para></td>
-          <td><para style="P4">Balance</para></td>
+          <td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
           <td><para style="P4">Currency</para></td>
         </tr>
      </blockTable>
@@ -311,9 +311,9 @@
 			<tr>
 			  <td><para style="Standard">[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
 			  <td><para style="Standard"></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]]</u></para></td>
-			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]]</u></para></td>
-			  <td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]]</u></para></td>
+			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  <td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
 			 <td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]</u></para></td>
 			</tr>
 			</blockTable>
@@ -333,9 +333,9 @@
 		   <td><para style="P3">[[ line['lref'] or '']]</para></td>
 		   <td><para style="P3">[[ line['move'] or '' ]]</para></td>
 		   <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
-		   <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']) ]]</para></td>
+		   <td><para style="P4">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+		   <td><para style="P4">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</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>
 		 </tr>
 	</blockTable>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 7fbf9269320..ab338c43c32 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -142,12 +142,12 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="date" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="date" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
     <paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P4_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -160,7 +160,7 @@
     <paraStyle name="terp_default_Centre_8a" fontName="Helvetica" 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="P11" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="14.0" leading="17"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="0"/>
     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P15" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -194,9 +194,6 @@
     </para>
    <para>[[ repeatIn(objects, 'a') ]]</para>
 
-   <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -246,9 +243,6 @@
     <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>
@@ -256,16 +250,16 @@
    	<blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,330.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
        <tr>
           <td><para style="date">Date</para></td>
-          <td><para style="P12"></para><para style="P2">JNRL</para></td>
-          <td><para style="P12"></para><para style="P2">Partner</para></td>
-          <td><para style="P12"></para><para style="P2">Ref</para></td>
-          <td><para style="P12"></para><para style="P2">Move</para></td>
-          <td><para style="P12"></para><para style="P3">Entry Label</para></td>
-          <td><para style="P12"></para><para style="P3">Counterpart</para></td>
-          <td><para style="P12"></para><para style="P4">Debit</para></td>
-          <td><para style="P12"></para><para style="P4">Credit</para></td>
-          <td><para style="P12"></para><para style="P4">Balance</para></td>
-          <td><para style="P12"></para><para style="P4">Currency</para></td>
+          <td><para style="P2">JNRL</para></td>
+          <td><para style="P2">Partner</para></td>
+          <td><para style="P2">Ref</para></td>
+          <td><para style="P2">Move</para></td>
+          <td><para style="P3">Entry Label</para></td>
+          <td><para style="P3">Counterpart</para></td>
+          <td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Currency</para></td>
        </tr>
     </blockTable>
      <section>
@@ -279,9 +273,9 @@
 	        		<tr>
 		    			<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]]</u></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
 			  			<td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
@@ -305,9 +299,9 @@
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 			<td><para style="P3_content">[[ strip_name(line['line_corresp'],15) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['debit']) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['credit']) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['progress']) ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[  formatLang(line['amount_currency'] or '')]] [[  line['currency_code'] or '' ]]</para></td>
 		</tr>
 	  </blockTable>
@@ -316,16 +310,16 @@
 
     <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
        <tr>
-          <td><para style="P12"><font color="white"> </font></para><para style="P2">JNRL</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="date">Date</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P2">Partner</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P2">Ref</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P2">Move</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P3">Entry Label</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P3">Counterpart</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P4">Debit</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P4">Credit</para></td>
-          <td><para style="P12"><font color="white"> </font></para><para style="P4">Balance</para></td>
+          <td><para style="P2">Date</para></td>
+          <td><para style="date">JNRL</para></td>
+          <td><para style="P2">Partner</para></td>
+          <td><para style="P2">Ref</para></td>
+          <td><para style="P2">Move</para></td>
+          <td><para style="P3">Entry Label</para></td>
+          <td><para style="P3">Counterpart</para></td>
+          <td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
+          <td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
        </tr>
 	</blockTable>
 
@@ -340,9 +334,9 @@
 						<tr>
 			 	 			<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
 			  				<td><para style="Standard"></para></td>
-						  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]]</u></para></td>
-					  		<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]]</u></para></td>
-			  				<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]]</u></para></td>
+						  	<td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+					  		<td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  				<td><para style="P9b"><u>[[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]]</u></para></td>
 						</tr>
 					</blockTable>
 		 		</td>
@@ -365,12 +359,15 @@
 				<td><para style="P2_content">[[ line['move'] ]]</para></td>
 				<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 				<td><para style="P3_content">[[ strip_name(line['line_corresp'],15) ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['debit']) ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['credit']) ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['progress']) ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
 			</tr>
 		</blockTable>
 
 	</section>
+	<para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
  </story>
 </document>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 86d4405838c..3b837f51844 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -97,7 +97,7 @@
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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_Centre_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="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table Contents" fontName="Times-Roman"/>
@@ -200,7 +200,7 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,58.0,61.0,73.0,70.0" repeatRows="1" style="Move_Line_Header">
+    <blockTable colWidths="256.0,58.0,64.0,74.0,70.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -212,22 +212,16 @@
           <para style="terp_tblheader_Details">State</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Location</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
-      <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">[[ picking.move_lines or removeParentNode('blockTable')]]
+      <blockTable colWidths="257.0,58.0,61.0,54.0,20.0,70.0" style="Move_Line_Contect_Assign_State">[[ picking.move_lines or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]  </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
@@ -242,28 +236,20 @@
             <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-        <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-        <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
+
 
   </section>
 	<para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft'  or line.state=='waiting' )])  and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
-      <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">[[ picking.move_lines or removeParentNode('blockTable')]]
+      <blockTable colWidths="257.0,57.0,62.0,54.0,20.0,70.0" style="Move_Line_Content_Other_State">[[ picking.move_lines or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]  </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
@@ -278,16 +264,13 @@
             <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
     <para style="terp_default_9">
       <font color="white"> </font>

From ff3296c56d430b65970d4c08a3da15b88ca939ba Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 3 Sep 2010 18:39:42 +0530
Subject: [PATCH 51/73] [FIX]: Fixed typos + Improvements

bzr revid: rpa@tinyerp.com-20100903130942-tay736c8hdltc56c
---
 addons/crm/crm_installer.py                  | 4 ++--
 addons/hr/hr_installer.xml                   | 2 +-
 addons/profile_tools/installer.py            | 8 ++++----
 addons/report_designer/installer.py          | 2 +-
 addons/thunderbird/installer.py              | 2 +-
 addons/thunderbird/thunderbird_installer.xml | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 7bba2bd6f3b..6797afc62e0 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -39,8 +39,8 @@ class crm_installer(osv.osv_memory):
         'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
         'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
-        'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP' documents. You can attach it to any existing one in OpenERP or create a new one"),
-        'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP' documents. You can attach it to any existing one in OpenERP or create a new one"),
+        'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one"),
+        'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one"),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."),
     }
 
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 50e858e6a80..49151fce68b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -19,7 +19,7 @@
                 <attribute name='string'></attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">TYou can enhance the base HR addon by installing a few HR-related applications.</attribute>
+                <attribute name="string">You can enhance the base HR addon by installing few HR-related applications.</attribute>
             </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 1a793352b6e..9a5780acd05 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -25,10 +25,10 @@ class misc_tools_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'),
-        'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'),
-        'survey':fields.boolean('Survey',help='Installs tools for survey module'),
-        'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'),
+        'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders'),
+        'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents'),
+        'survey':fields.boolean('Survey',help='Manages Custom Surveys'),
+        'audittrail':fields.boolean('Audit Trail',help="Lets you to track user's operations on specific Objects."),
     }
     _defaults = {
         'lunch': True,
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index e8b45db1248..4dd35fd4560 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -34,7 +34,7 @@ class report_designer_installer(osv.osv_memory):
                                 "After installation, it adds a menu to define custom report in the Dashboard menu."),
         'olap':fields.boolean('Business Intelligence Report',help="Olap module is used to install BI module in client. Olap provides Online "
                                 "Analytical Process with the mdx query. BI provides Cube Browsing and Cube Designing. "
-                                "After installation you will get Cube Browser and Cube Desinger in Reporting Menu. "
+                                "After installation you will get Cube Browser and Cube Designer in Reporting Menu. "
                                 "Cube Browser is used to generate the reports with table view (mdx view) of mdx query "
                                 "and Cube Designer is used to make cubes in BI."),
     }
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 14a819aa2c7..11e185dbf77 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -54,7 +54,7 @@ class thunderbird_installer(osv.osv_memory):
         'description' : """* Save the Thunderbird plug-­in.
         * Follow these steps to install Thunderbird plug-­in.
             1. From Menu Bar of Thunderbird, open Tools ­> Add-ons.
-            2. Click install button.
+            2. Click "Install" button.
             3. Select the plug-in(openerp_plugin.xpi file)
             5. Click "Install Now".
             6. Restart Thunderbird.
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 0b30e8addce..b7a66d4e122 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -15,7 +15,7 @@
                    <attribute name="string">Thunderbird</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
-                  <attribute name="string">This plug-in allows you to link your e-mail to OpenERP' documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
+                  <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
 	      <xpath expr="//button[@string='Install Modules']" position="attributes">
 	        <attribute name="string">Configure</attribute>
@@ -35,7 +35,7 @@
                   <newline/>
                   <field name="pdf_file" filename="pdf_name"/>
                   <newline/>
-                  <separator string="Thunderbird plugin installation note." colspan="4"/>
+                  <separator string="Installation and Configuration Steps" colspan="4"/>
                   <field name="description" nolabel="1" colspan="8"/>
               </group>
               </group>

From e3d4d4fa52ff37c3dcd326ac57409446208e5ab6 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 3 Sep 2010 18:44:55 +0530
Subject: [PATCH 52/73] [IMP]:improved the purchase order report

bzr revid: apa@tinyerp.com-20100903131455-7yo1t5qxncj12unb
---
 addons/purchase/report/order.rml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 4f864863be2..bc34008d6f8 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -150,7 +150,6 @@
                 <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
                 <para style="terp_default_9">[[ addr.partner_id.title or '' ]] [[ addr.partner_id.name ]]</para>
-                <para style="terp_default_9">[[ addr.title or '' ]] [[ addr.name ]]</para>
                 <para style="terp_default_9">[[ addr.street ]]</para>
                 <para style="terp_default_9">[[ addr.street2 or removeParentNode('para') ]]</para>
                 <para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>

From 3aa4446439c96aa650af28b96b338e2c4f0806d9 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <>
Date: Fri, 3 Sep 2010 18:45:30 +0530
Subject: [PATCH 53/73] [IMP]: Usability Improvements in Calendar

bzr revid: rpa@tinyerp.com-20100903131530-wqq4bb67nh9anr35
---
 addons/base_calendar/base_calendar.py         | 30 +++++++++++--------
 addons/base_calendar/base_calendar_view.xml   |  4 +--
 .../wizard/base_calendar_set_exrule_view.xml  |  8 ++---
 addons/crm/crm_meeting_view.xml               |  4 +--
 addons/project_caldav/project_caldav_view.xml |  4 +--
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 1beb7e90d41..6547676dc2b 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -403,6 +403,7 @@ property or property parameter."),
             else:
                 return datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
         try:
+            # FIXME: why isn't this in CalDAV?
             import vobject
         except ImportError:
             return res
@@ -1113,8 +1114,8 @@ class calendar_event(osv.osv):
                         ('cancelled', 'Cancelled')], 'State', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
 defines the list of date/time exceptions for a recurring calendar component."),
-        'exrule': fields.char('Exception Rule', size=352, help="defines a \
-rule or repeating pattern for an exception to a recurrence set"),
+        'exrule': fields.char('Exception Rule', size=352, help="Defines a \
+rule or repeating pattern of time to exclude from the recurring rule."),
         'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
                                     string='Recurrent Rule', store=True, \
                                     fnct_inv=_set_rrulestring, help='Defines a\
@@ -1123,8 +1124,11 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency', states={'done': [('readonly', True)]}),
-        'alarm_id': fields.many2one('res.alarm', 'Alarm', states={'done': [('readonly', True)]}),
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 
+                            'Recurrency', states={'done': [('readonly', True)]},
+                            help="Let the event automatically repeat at that interval"),
+        'alarm_id': fields.many2one('res.alarm', 'Alarm', states={'done': [('readonly', True)]},
+                        help="Set an alarm at this time, before the event occurs" ),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
         'recurrent_uid': fields.integer('Recurrent ID'),
         'recurrent_id': fields.datetime('Recurrent ID date'),
@@ -1133,15 +1137,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
         'freq': fields.selection([('None', 'No Repeat'), \
-                                ('secondly', 'Secondly'), \
-                                ('minutely', 'Minutely'), \
-                                ('hourly', 'Hourly'), \
-                                ('daily', 'Daily'), \
-                                ('weekly', 'Weekly'), \
-                                ('monthly', 'Monthly'), \
-                                ('yearly', 'Yearly')], 'Frequency'),
-        'interval': fields.integer('Interval'),
-        'count': fields.integer('Count'),
+                                ('hourly', 'Hours'), \
+                                ('daily', 'Days'), \
+                                ('weekly', 'Weeks'), \
+                                ('monthly', 'Months'), \
+                                ('yearly', 'Years'), \
+                                ('secondly', 'Seconds'), \
+                                ('minutely', 'Minutes') ], 'Frequency'),
+        'interval': fields.integer('Interval', help="Repeat every x"),
+        'count': fields.integer('Count', help="Repeat max that times"),
         'mo': fields.boolean('Mon'),
         'tu': fields.boolean('Tue'),
         'we': fields.boolean('Wed'),
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 3a665b8a8ae..05bf60888bd 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -245,7 +245,7 @@
                                    attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                    name="open_event" icon="gtk-edit"
                                    type="object" />
-                               <button string="ExRule"
+                               <button string="Exclude range" groups="base.group_extended"
                                     help="Add Exception Rule"
                                     name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
                                     context="{'model' : 'calendar.event'}"
@@ -255,8 +255,8 @@
                     <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
                         <separator string="Select data for Custom Rule" colspan="8"/>
                         <group col="8" colspan="4">
-                            <field name="freq" />
                             <field name="interval" />
+                            <field name="freq" />
                             <field name="count" />
                             <field name="end_date" />
                         </group>
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml b/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
index bc663e0835f..2a2d6412d4b 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="view_base_calendar_set_exrule" model="ir.ui.view">
+        <record id="view_base_calendar_set_exrule" model="ir.ui.view">
             <field name="name">base.calendar.set.exrule.form</field>
             <field name="model">base.calendar.set.exrule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Set Exrule">
-	  			<separator string="Select data for ExRule" colspan="8"/>
+                    <separator string="Select range to Exclude" colspan="8"/>
                     <group col="8" colspan="6">
-                        <field name="freq" />
                         <field name="interval" />
+                        <field name="freq" />
                         <field name="count" />
                         <field name="end_date" />
                     </group>
@@ -60,7 +60,7 @@
 	</record>
 
         <record id="action_base_calendar_set_exrule" model="ir.actions.act_window">
-            <field name="name">Set Exrule</field>
+            <field name="name">Set Exclude range</field>
             <field name="res_model">base.calendar.set.exrule</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 1e36e7f43cd..716607dfb38 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -59,10 +59,10 @@
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                    <separator string="Data for Custom Rule" colspan="8"/>
+                    <separator string="Custom Recurrency Rule" colspan="8"/>
                     <group col="8" colspan="4">
-                        <field name="freq" />
                         <field name="interval" />
+                        <field name="freq" />
                         <field name="count" />
                         <field name="end_date" />
                     </group>
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 01133108b6d..f5c157e4bf6 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -80,10 +80,10 @@
                     </group>
                     <newline/>
                     <group col="4" colspan="6" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                        <separator string="Data for Custom Rule" colspan="8"/>
+                        <separator string="Custom Recurrency Rule" colspan="8"/>
                         <group col="8" colspan="4">
-                        <field name="freq" />
                         <field name="interval" />
+                        <field name="freq" />
                         <field name="count" />
                         <field name="end_date" />
                         </group>

From 75a721349805481bfa31c11b761fa777dedffbed Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 3 Sep 2010 19:04:50 +0530
Subject: [PATCH 54/73] [IMP]: base_calendar, crm: Minor Improvements in view

bzr revid: rpa@tinyerp.com-20100903133450-1g0mahcm9mjgfoc9
---
 addons/base_calendar/base_calendar.py          |  2 +-
 addons/base_calendar/base_calendar_view.xml    | 16 ++++++++++++++++
 .../wizard/base_calendar_invite_attendee.py    |  3 ++-
 addons/crm/crm_meeting_view.xml                | 18 +++++++++++++++++-
 addons/project_caldav/project_caldav_view.xml  |  2 +-
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 6547676dc2b..11bd22e6134 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -942,7 +942,7 @@ class calendar_event(osv.osv):
         if not start_date:
             return value
         if not end_date and not duration:
-            duration = 8.00
+            duration = 1.00
             value['duration'] = duration
 
         if allday: # For all day event
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 05bf60888bd..35e3f794571 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -339,6 +339,22 @@
                                     <field name="email" />
                                     <field name="role" width="200" select="1" />
                                     <field name="state" />
+                                    <button name="do_tentative"
+                                        states="needs-action,declined,accepted"
+                                        string="Uncertain" type="object"
+                                        icon="terp-crm" />
+                                    <button name="do_accept" string="Accept"
+                                        states="needs-action,tentative,declined"
+                                        type="object" icon="gtk-apply" />
+                                    <button name="do_decline" string="Decline"
+                                        states="needs-action,tentative,accepted"
+                                        type="object" icon="gtk-cancel" />
+                                    <button
+                                        name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                        string="Delegate" type="action"
+                                        icon="gtk-sort-descending"
+                                        states="needs-action,tentative,declined,accepted"
+                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                                 </tree>
                                 <form string="Invitation details">
                                     <notebook colspan="4">
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 15763da202d..f60139c0600 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -48,7 +48,8 @@ send an Email to Invited Person')
     }
 
     _defaults = {
-        'type': lambda *x: 'internal'
+        'type': 'internal',
+        'send_mail': True
     }
 
     def do_invite(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 716607dfb38..5dbadcd26e1 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -51,7 +51,7 @@
                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
-                           <button string="ExRule"
+                           <button string="Exclude range" groups="base.group_extended"
                                 help="Add Exception Rule"
                                 name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
                                 context="{'model' : 'crm.meeting'}"
@@ -161,6 +161,22 @@
                                 <field name="email" string="Mail TO"/>
                                 <field name="role" select="1" />
                                 <field name="state" />
+                                <button name="do_tentative"
+                                    states="needs-action,declined,accepted"
+                                    string="Uncertain" type="object"
+                                    icon="terp-crm" />
+                                <button name="do_accept" string="Accept"
+                                    states="needs-action,tentative,declined"
+                                    type="object" icon="gtk-apply" />
+                                <button name="do_decline" string="Decline"
+                                    states="needs-action,tentative,accepted"
+                                    type="object" icon="gtk-cancel" />
+                                <button
+                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                    string="Delegate" type="action"
+                                    icon="gtk-sort-descending"
+                                    states="needs-action,tentative,declined,accepted"
+                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
                             <form string="Invitation details">
                                 <notebook colspan="4">
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index f5c157e4bf6..259d336c398 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -72,7 +72,7 @@
                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
-                           <button string="ExRule"
+                           <button string="Exclude range" groups="base.group_extended"
                                 help="Add Exception Rule"
                                 name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
                                 context="{'model' : 'project.task'}"

From 0c7c47db187c5d054140d82907200cead8a6ce91 Mon Sep 17 00:00:00 2001
From: Renato Lima <renato@renato-laptop>
Date: Fri, 3 Sep 2010 19:38:14 -0300
Subject: [PATCH 55/73] Added in delivery module new field net weight in
 stock.move and stock.picking, because in some delivery documents you need
 specific the gross weight and net weight. Update methods calculate using
 multi parameter

bzr revid: renato@renato-laptop-20100903223814-w22ajtb2dvoazn2p
---
 addons/delivery/delivery_view.xml | 12 ++++++++-
 addons/delivery/stock.py          | 41 +++++++++++++++++++++++++------
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index fdef01e2ef2..22ed5ef6eab 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -144,6 +144,7 @@
                     <field name="carrier_tracking_ref" groups="base.group_extended"/>
                     <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </field>
             </field>
         </record>
@@ -156,6 +157,7 @@
             <field name="arch" type="xml">
                 <field name="type" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </field>
             </field>
         </record>
@@ -168,6 +170,7 @@
             <field name="arch" type="xml">
                 <field name="type" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </field>
             </field>
         </record>
@@ -183,6 +186,7 @@
                     <field name="carrier_tracking_ref" groups="base.group_extended"/>
                     <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </field>
             </field>
         </record>
@@ -207,6 +211,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </xpath>
             </field>
         </record>
@@ -219,6 +224,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </xpath>
             </field>
         </record>
@@ -230,7 +236,8 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
-                    <field name="weight"/>
+                	<field name="weight"/>
+                    <field name="weight_net"/>
                 </xpath>
             </field>
         </record>
@@ -243,6 +250,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </xpath>
             </field>
         </record>
@@ -255,6 +263,7 @@
             <field name="arch" type="xml">
                 <field name="product_uom" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </field>
             </field>
         </record>
@@ -267,6 +276,7 @@
             <field name="arch" type="xml">
                 <field name="product_uom" position="after">
                     <field name="weight"/>
+                    <field name="weight_net"/>
                 </field>
             </field>
         </record>
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 76897d46e58..49d0364086b 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -32,10 +32,19 @@ class stock_picking(osv.osv):
         res = {}
         uom_obj = self.pool.get('product.uom')
         for picking in self.browse(cr, uid, ids, context):
-            total_weight = 0.00
+            total_weight = total_weight_net = 0.00
+            
             for move in picking.move_lines:
                 total_weight += move.weight
-            res[picking.id] = total_weight
+                total_weight_net += move.weight_net
+            
+            res[picking.id] = {
+                              'weight': total_weight,
+                              'weight_net': total_weight_net,
+                               } 
+            
+            total_weight
+            
         return res
 
 
@@ -48,7 +57,12 @@ class stock_picking(osv.osv):
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
-        'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'),
+        'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+                  store={
+                 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
+                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
+                 }),
+        'weight_net': fields.function(_cal_weight, method=True, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
@@ -128,7 +142,7 @@ class stock_move(osv.osv):
         res = {}
         uom_obj = self.pool.get('product.uom')
         for move in self.browse(cr, uid, ids, context):
-            weight = 0.00
+            weight = weight_net = 0.00
             if move.product_id.weight > 0.00:
                 converted_qty = move.product_qty
                 
@@ -136,14 +150,27 @@ class stock_move(osv.osv):
                     converted_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.product_id.uom_id.id)
 
                 weight = (converted_qty * move.product_id.weight)
-            res[move.id] = weight
+                
+                if move.product_id.weight_net > 0.00:
+                    weight_net = (converted_qty * move.product_id.weight_net)
+                
+            res[move.id] =  {
+                            'weight': weight,
+                            'weight_net': weight_net,
+                            }
+            
         return res
     
     _columns = {
-        'weight': fields.function(_cal_move_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'),
+        'weight': fields.function(_cal_move_weight, method=True, string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={
-                 'stock.move': (lambda self, cr, uid, ids, c={}: ids, ['product_id', 'product_qty', 'product_uom'], 20),
+                 'stock.move': (lambda self, cr, uid, ids, c={}: ids, ['product_id', 'product_qty', 'product_uom'], 10),
                  }),
+        'weight_net': fields.function(_cal_move_weight, method=True, string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+                  store={
+                 'stock.move': (lambda self, cr, uid, ids, c={}: ids, ['product_id', 'product_qty', 'product_uom'], 10),
+                 }),
+                 
         }
 
 stock_move()

From 73249fc97b9af882eccb8030ceac4faace6338eb Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 6 Sep 2010 05:03:01 +0000
Subject: [PATCH 56/73] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100906050301-71u04wdtiqkxol9z
---
 addons/account/i18n/da.po                     |  4 +--
 addons/account/i18n/hr.po                     |  8 +++---
 addons/account/i18n/hu.po                     |  4 +--
 addons/account/i18n/it.po                     |  6 ++---
 addons/account/i18n/lt.po                     |  4 +--
 addons/account/i18n/pl.po                     |  4 +--
 addons/account/i18n/sq.po                     |  4 +--
 addons/account/i18n/sv.po                     |  4 +--
 addons/account/i18n/tr.po                     |  4 +--
 addons/account/i18n/zh_CN.po                  |  4 +--
 addons/account_analytic_analysis/i18n/bg.po   |  4 +--
 addons/account_analytic_analysis/i18n/fi.po   |  4 +--
 addons/account_analytic_analysis/i18n/lt.po   |  4 +--
 addons/account_analytic_analysis/i18n/tr.po   |  4 +--
 addons/account_analytic_default/i18n/lt.po    |  4 +--
 addons/account_analytic_default/i18n/tr.po    |  4 +--
 addons/account_analytic_plans/i18n/lt.po      |  4 +--
 addons/account_analytic_plans/i18n/tr.po      |  4 +--
 addons/account_budget/i18n/lt.po              |  4 +--
 addons/account_budget/i18n/tr.po              |  4 +--
 addons/account_coda/i18n/ar.po                |  4 +--
 addons/account_followup/i18n/lt.po            |  4 +--
 addons/account_followup/i18n/tr.po            |  4 +--
 addons/account_invoice_layout/i18n/lt.po      |  4 +--
 addons/account_invoice_layout/i18n/tr.po      |  4 +--
 addons/account_payment/i18n/lt.po             |  4 +--
 addons/account_payment/i18n/tr.po             |  4 +--
 addons/account_report/i18n/lt.po              |  4 +--
 addons/account_report/i18n/tr.po              |  4 +--
 addons/account_reporting/i18n/lt.po           |  4 +--
 addons/account_reporting/i18n/tr.po           |  4 +--
 addons/account_tax_include/i18n/nb.po         |  4 +--
 addons/account_tax_include/i18n/tr.po         |  4 +--
 addons/account_voucher/i18n/lt.po             |  4 +--
 addons/account_voucher/i18n/tr.po             |  4 +--
 .../analytic_journal_billing_rate/i18n/tr.po  |  4 +--
 addons/analytic_user_function/i18n/tr.po      |  4 +--
 addons/auction/i18n/lt.po                     |  4 +--
 addons/auction/i18n/nl.po                     |  4 +--
 addons/auction/i18n/tr.po                     |  4 +--
 addons/audittrail/i18n/lt.po                  |  4 +--
 addons/audittrail/i18n/tr.po                  |  4 +--
 addons/audittrail/i18n/zh_CN.po               |  4 +--
 addons/base_contact/i18n/lt.po                |  4 +--
 addons/base_contact/i18n/tr.po                |  4 +--
 addons/base_contact/i18n/zh_CN.po             |  4 +--
 addons/base_iban/i18n/tr.po                   |  4 +--
 addons/base_module_quality/i18n/tr.po         |  4 +--
 addons/base_module_record/i18n/tr.po          |  4 +--
 addons/base_report_creator/i18n/tr.po         |  4 +--
 addons/base_report_designer/i18n/tr.po        |  4 +--
 addons/base_setup/i18n/tr.po                  |  4 +--
 addons/base_vat/i18n/tr.po                    |  4 +--
 addons/board/i18n/tr.po                       |  4 +--
 addons/crm/i18n/fi.po                         |  4 +--
 addons/crm/i18n/lt.po                         |  4 +--
 addons/crm/i18n/pl.po                         |  4 +--
 addons/crm/i18n/pt.po                         |  4 +--
 addons/crm/i18n/sk.po                         |  4 +--
 addons/crm/i18n/tr.po                         |  4 +--
 addons/crm_profiling/i18n/tr.po               |  4 +--
 addons/delivery/i18n/ru.po                    |  4 +--
 addons/delivery/i18n/tr.po                    |  4 +--
 addons/document/i18n/mn.po                    |  4 +--
 addons/document/i18n/ru.po                    |  4 +--
 addons/document/i18n/tr.po                    |  4 +--
 addons/document/i18n/zh_CN.po                 |  4 +--
 addons/document_ics/i18n/tr.po                |  4 +--
 addons/document_ics/i18n/zh_CN.po             |  4 +--
 addons/hr/i18n/lt.po                          |  4 +--
 addons/hr/i18n/pt_BR.po                       |  4 +--
 addons/hr/i18n/tr.po                          |  4 +--
 addons/hr/i18n/zh_CN.po                       |  4 +--
 addons/hr_attendance/i18n/fi.po               |  4 +--
 addons/hr_attendance/i18n/pt_BR.po            |  4 +--
 addons/hr_attendance/i18n/tr.po               |  4 +--
 addons/hr_contract/i18n/tr.po                 |  4 +--
 addons/hr_expense/i18n/pt_BR.po               |  4 +--
 addons/hr_expense/i18n/tr.po                  |  4 +--
 addons/hr_holidays/i18n/lt.po                 |  4 +--
 addons/hr_holidays/i18n/tr.po                 |  4 +--
 addons/hr_holidays/i18n/zh_CN.po              |  4 +--
 addons/hr_timesheet/i18n/tr.po                |  4 +--
 addons/hr_timesheet_invoice/i18n/tr.po        |  4 +--
 addons/hr_timesheet_sheet/i18n/lt.po          |  4 +--
 addons/hr_timesheet_sheet/i18n/tr.po          |  4 +--
 addons/idea/i18n/lt.po                        |  4 +--
 addons/idea/i18n/zh_CN.po                     |  4 +--
 addons/l10n_be/i18n/tr.po                     |  4 +--
 addons/l10n_ch/i18n/it.po                     |  4 +--
 addons/l10n_ch/i18n/tr.po                     |  4 +--
 addons/l10n_ch_chart_c2c_pcg/i18n/tr.po       |  4 +--
 addons/l10n_chart_uk_minimal/i18n/tr.po       |  4 +--
 addons/l10n_fr/i18n/tr.po                     |  4 +--
 addons/l10n_lu/i18n/tr.po                     |  4 +--
 addons/membership/i18n/tr.po                  |  4 +--
 addons/mrp/i18n/pt_BR.po                      |  4 +--
 addons/mrp/i18n/tr.po                         |  4 +--
 addons/mrp/i18n/zh_TW.po                      |  4 +--
 addons/mrp_operations/i18n/tr.po              |  4 +--
 addons/mrp_repair/i18n/tr.po                  |  4 +--
 addons/mrp_subproduct/i18n/tr.po              |  4 +--
 addons/point_of_sale/i18n/lt.po               |  4 +--
 addons/point_of_sale/i18n/tr.po               |  4 +--
 addons/process/i18n/tr.po                     |  4 +--
 addons/product/i18n/lt.po                     |  4 +--
 addons/product/i18n/mn.po                     |  4 +--
 addons/product/i18n/pt_BR.po                  |  4 +--
 addons/product/i18n/sr.po                     |  4 +--
 addons/product/i18n/tr.po                     |  4 +--
 addons/product/i18n/zh_CN.po                  |  4 +--
 addons/product_margin/i18n/pt_BR.po           |  4 +--
 addons/product_margin/i18n/tr.po              |  4 +--
 addons/project/i18n/lt.po                     |  4 +--
 addons/project/i18n/ru.po                     |  4 +--
 addons/project/i18n/tr.po                     |  4 +--
 addons/project_gtd/i18n/tr.po                 |  4 +--
 addons/project_mrp/i18n/tr.po                 |  4 +--
 addons/project_retro_planning/i18n/tr.po      |  4 +--
 addons/project_scrum/i18n/tr.po               |  4 +--
 addons/project_timesheet/i18n/tr.po           |  4 +--
 addons/purchase/i18n/lt.po                    |  4 +--
 addons/purchase/i18n/tr.po                    |  4 +--
 addons/report_intrastat/i18n/pt_BR.po         |  4 +--
 addons/report_intrastat/i18n/tr.po            |  4 +--
 addons/sale/i18n/ar.po                        | 26 +++++++++----------
 addons/sale/i18n/pt_BR.po                     |  4 +--
 addons/sale/i18n/sr.po                        |  4 +--
 addons/sale/i18n/sv.po                        |  4 +--
 addons/sale/i18n/tr.po                        |  4 +--
 addons/sale/i18n/uk.po                        |  4 +--
 addons/sale/i18n/vi.po                        |  4 +--
 addons/sale_journal/i18n/pl.po                |  4 +--
 addons/sale_journal/i18n/tr.po                |  4 +--
 addons/stock/i18n/bs.po                       |  4 +--
 addons/stock/i18n/it.po                       |  4 +--
 addons/stock/i18n/pl.po                       |  4 +--
 addons/stock/i18n/pt_BR.po                    |  4 +--
 addons/stock/i18n/tr.po                       |  4 +--
 addons/stock/i18n/zh_CN.po                    |  4 +--
 addons/stock_invoice_directly/i18n/tr.po      |  4 +--
 addons/stock_location/i18n/tr.po              |  4 +--
 addons/stock_no_autopicking/i18n/tr.po        |  4 +--
 addons/subscription/i18n/tr.po                |  4 +--
 addons/warning/i18n/tr.po                     |  4 +--
 addons/wiki/i18n/tr.po                        |  4 +--
 addons/wiki_quality_manual/i18n/it.po         |  6 ++---
 147 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 2c7eb73ba1a..ccdea36cd6a 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:36+0000\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index d0a85b2f3b0..d5db4cc6cd5 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:02+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2010-09-05 20:10+0000\n"
+"Last-Translator: dejan.radocaj@zg.t-com.hr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -50,7 +50,7 @@ msgstr "Potvrdi izvode iz pripreme"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Sredstvo"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 8a39e278191..1445b4d234a 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:39+0000\n"
+"PO-Revision-Date: 2010-09-05 08:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index c7d35595228..7b3cb032825 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 22:56+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 868879a3c4a..8109c619cca 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:40+0000\n"
+"PO-Revision-Date: 2010-09-05 08:43+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index d0a7479b70b..f55e887625b 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:40+0000\n"
+"PO-Revision-Date: 2010-09-05 08:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index b0a7d2ce096..502b595a336 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:42+0000\n"
+"PO-Revision-Date: 2010-09-05 08:27+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 3413ce08def..c5fad836860 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:38+0000\n"
+"PO-Revision-Date: 2010-09-05 08:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index c62b99b7a49..3b8a2990482 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:37+0000\n"
+"PO-Revision-Date: 2010-09-05 08:42+0000\n"
 "Last-Translator: Omer Barlas <omer@barlas.com.tr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 798ca2a05a4..0983428e01b 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 4e844be1880..6001f71dfcb 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:44+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index 9e45b018c57..c6b18f0b724 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:22+0000\n"
+"PO-Revision-Date: 2010-09-05 08:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index d6a2cb22563..71787ab9945 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 8c95736a03e..d4dacd69200 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:44+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 203af434cce..50da6cfcd93 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:44+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index b0a3aef71c5..4235e199b37 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 2346fe93d0e..b847e08af3c 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:44+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index b099f20f434..466df3be011 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 5fc649d9610..121f4a3664a 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index f00062a1ef2..b2ce0c33819 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:14+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 5f93580b202..29294219336 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 428fd57f14e..70d7bfa4448 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 848a0c050ba..20258a439ba 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index b684c520ddf..76468437cd1 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index 79be5e7e77e..1ca6a647f88 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:34+0000\n"
+"PO-Revision-Date: 2010-09-05 08:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index a7d17ef40c5..090a2b7f983 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:19+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 057d2b08618..9ad40a482b8 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:10+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index e610db8c5e4..192790003f6 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:33+0000\n"
+"PO-Revision-Date: 2010-09-05 08:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 76ca6a91724..94f44db1ab0 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:36+0000\n"
+"PO-Revision-Date: 2010-09-05 08:40+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 13fa7181592..cb523864ca7 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:37+0000\n"
+"PO-Revision-Date: 2010-09-05 08:41+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index 4e9b4134fab..13e1bd1e357 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:37+0000\n"
+"PO-Revision-Date: 2010-09-05 08:41+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/i18n/nb.po b/addons/account_tax_include/i18n/nb.po
index 84185e05e6e..45b9963ffd4 100644
--- a/addons/account_tax_include/i18n/nb.po
+++ b/addons/account_tax_include/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"PO-Revision-Date: 2010-09-05 08:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 7257fe964c3..cbbbf91b165 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:34+0000\n"
+"PO-Revision-Date: 2010-09-05 08:36+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 1cd3053867d..f84fcc59b9d 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index a28dac344db..191a3825812 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:34+0000\n"
+"PO-Revision-Date: 2010-09-05 08:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 67e874319fe..afa4b364055 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:16+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 6f7dbb9b910..35bb15554de 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index ccc4de1ff37..11f09210791 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 749015db944..689160504f9 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:34+0000\n"
+"PO-Revision-Date: 2010-09-05 08:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 3ac7cd0b802..6a78e4982c6 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 292c0fe0c9a..925529da070 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 4e93a4bd532..7e62203aea4 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 34361b3d37f..ea978f9a34a 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:36+0000\n"
+"PO-Revision-Date: 2010-09-05 08:40+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index c09035f5f33..5c6987bb66c 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:41+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index fa7b70ed0dc..c127057f661 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:42+0000\n"
+"PO-Revision-Date: 2010-09-05 08:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index 71836fbf339..8ceb1659fd5 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:37+0000\n"
+"PO-Revision-Date: 2010-09-05 08:42+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 164a9a5e2b5..5f5abaef39e 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:37+0000\n"
+"PO-Revision-Date: 2010-09-05 08:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 1e31ff3c62b..905ef276e9c 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:42+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 256c2b5d0f9..de21cb915c3 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index cff8bd2faa1..ade865f8b19 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:42+0000\n"
+"PO-Revision-Date: 2010-09-05 08:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 288c8dde92b..54ab979fbea 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index e5a16689b02..362a65e5892 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index eaeede631f2..8efd1454f1f 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index c332204030e..4ba22683d4b 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 71263ee49c9..825b1d41e12 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 53209ea0a7f..8ec49056f26 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 328d132b74e..2ec98379d58 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 3406a2d328b..5ae4c305e6f 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-04 08:49+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index cfdeb7fbdf3..7080c6c6224 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-04 08:52+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 4e46a221abe..308b7c0e0af 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-04 08:55+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index f69582b4542..1dd435bd5bc 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:40+0000\n"
+"PO-Revision-Date: 2010-09-05 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 8d470e9ce51..f5f3608aa63 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 48efd778cf5..8380bbdef45 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:44+0000\n"
+"PO-Revision-Date: 2010-09-05 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 7e0d6fdad4b..3224f91e144 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:02+0000\n"
+"PO-Revision-Date: 2010-09-05 08:58+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 0e8ce2939b1..d8a536ae78e 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:13+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: devcode <klaider@yandex.ru>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index c745444591e..28b951869cb 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:39+0000\n"
+"PO-Revision-Date: 2010-09-05 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index d351999c1e2..4d4bfea5681 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 43875f9e4e1..2686aaccdd9 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:50+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index e72672976c3..482b27e3c91 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:52+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 05dd56f034a..4b217aa76b1 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 49c72c31dd7..9aa0420e295 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 0f2e6a1454d..009bb5c04d4 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 0bbe3c139b5..eb8c1549788 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index 2ecb46ae06d..126bfba0657 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 76a1b263dd6..78d19235457 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 4c4736019b4..24ff66e9bba 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:56+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 7adf746c0c8..c4c894a8821 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index ceed72db255..83d30c292f0 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index b57d7650be5..2f2eb46469b 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:58+0000\n"
+"PO-Revision-Date: 2010-09-05 08:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 5fa29242673..12cd247890a 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 93562e0cf1b..92328db54b8 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:32+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index c9508c15058..b92b79ac601 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:23+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 94a7cfc2987..c3940394a59 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index c48ea45743f..538eb38e953 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:58+0000\n"
+"PO-Revision-Date: 2010-09-05 08:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 46b00e2c17c..84ad75c1603 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 85b44b1a29e..6b9e7f7367c 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index cda49bbe70e..445f3bc05ee 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index 67e5716b874..64a3c875afa 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:49+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index b7df0bb2463..5a7294fa61f 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index a600a64acb7..68bf4a419ed 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 00afce20559..363824d2b32 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index aa2e375323e..3d72a68bc92 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 5a3453783df..6f6e7aad801 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index bbe227eb991..ae5045ff50a 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:24+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 6974746ecd2..1cc8fe402b8 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 526f9c7a632..698b543fb07 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 3914722a261..fbdd4b0ba3b 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 3de1c0c98d1..a3ca44160a3 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index c03db62c6df..fbf5b9e8c0b 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 08b8fa14116..e6e4fa26d35 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:47+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index c56701b7b74..71f0883a4f2 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:58+0000\n"
+"PO-Revision-Date: 2010-09-05 08:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index f73e254260a..0d008a02b43 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:56+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index f48f0c80453..ffe6add7f57 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:27+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 9043f65b81c..dd5d339aaa6 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:49+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index a1c5c7c88e4..866f71d380d 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 687febfb392..ab87f499aa8 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 15593a25795..da88de49cf0 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:58+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 5dd69944e05..9f884d60951 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:59+0000\n"
+"PO-Revision-Date: 2010-09-05 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 9240bcb4e96..59b7cc2f3db 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 3fa01a2c986..c0b15548800 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:00+0000\n"
+"PO-Revision-Date: 2010-09-05 08:55+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index dd67721d0be..3f8d191dd14 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:01+0000\n"
+"PO-Revision-Date: 2010-09-05 08:57+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 421be662930..65b0c55b162 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:59+0000\n"
+"PO-Revision-Date: 2010-09-05 08:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 86455840f1c..b14c0db3dca 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:47+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 86084b1863b..8dba27cd442 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index f7c5595ae17..0421f0647e6 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:59+0000\n"
+"PO-Revision-Date: 2010-09-05 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 1fe4ca3e3b0..38835cdb9d7 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:59+0000\n"
+"PO-Revision-Date: 2010-09-05 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 73ab2820ca3..00e9f6229ae 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 8d6a9256490..4dc0b49ef97 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 578184c1edc..e15f44ab8cb 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 1823c0f0998..3e8357cf633 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:43+0000\n"
+"PO-Revision-Date: 2010-09-05 08:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 50f58c9f5bc..41cec5b1977 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:58+0000\n"
+"PO-Revision-Date: 2010-09-05 08:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index bab43bf3832..794052e3ffd 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:49+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 118222f7b9d..53d38f96e50 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 9a8c0c4c6c8..c025e100db0 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 08df3ea09c5..71624f4c34a 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:47+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index df9e6611bdb..7c53ee5c4a1 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:34+0000\n"
-"Last-Translator: hamada_away <mohammed_away@hotmail.com>\n"
+"PO-Revision-Date: 2010-09-05 05:17+0000\n"
+"Last-Translator: Hsn <hh-shwaf@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -49,7 +49,7 @@ msgstr "اسم النموذج غير صالح في تعريف العمل."
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "بإنتظار الجدول"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr ""
+msgstr "توصيل, من المخزن الى الزبون."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -213,7 +213,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "المنتجات الصادرة"
 
 #. module: sale
 #: view:sale.order:0
@@ -223,7 +223,7 @@ msgstr "المرجع"
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "الكل في وقتاَ واحد"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -234,7 +234,7 @@ msgstr ""
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "تحليل الحساب"
 
 #. module: sale
 #: rml:sale.order:0
@@ -289,7 +289,7 @@ msgstr "مؤكد"
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr ""
+msgstr "شروط الدفع الافتراضية"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
@@ -305,12 +305,12 @@ msgstr "تأكيد"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "عنوان الشحن"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "العدد المطلوب"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
@@ -321,12 +321,12 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "محل البيع"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "المخزن"
 
 #. module: sale
 #: rml:sale.order:0
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a669c4732c5..91af3dfac87 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:00+0000\n"
+"PO-Revision-Date: 2010-09-05 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 9f2fe820642..43d70e75d83 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 7b5e83dbc8e..3aac8e5a224 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:51+0000\n"
+"PO-Revision-Date: 2010-09-05 08:49+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 7087e544a7a..af95fc93b95 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 5a808600c3c..33c12c5589b 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:48+0000\n"
+"PO-Revision-Date: 2010-09-05 08:48+0000\n"
 "Last-Translator: Jay (OpenERP) <jvo@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 84552190a5a..e1851a14017 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index f9dad180a5a..f652f7a4903 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:59+0000\n"
+"PO-Revision-Date: 2010-09-05 08:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 8f2b3e548d1..2b5736228a4 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:54+0000\n"
+"PO-Revision-Date: 2010-09-05 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 048b359f850..5d50fde997c 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:59+0000\n"
+"PO-Revision-Date: 2010-09-05 08:55+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index b4335cd0645..2ed70590cb3 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:43+0000\n"
+"PO-Revision-Date: 2010-09-05 08:31+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 925a397f61c..d9b0d800bad 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:46+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 3f4247533b6..81681ff3482 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:58+0000\n"
+"PO-Revision-Date: 2010-09-05 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index f1cbc95807a..96c86ad7569 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:53+0000\n"
+"PO-Revision-Date: 2010-09-05 08:51+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 525cf11be0b..c9061a8a22b 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 09:02+0000\n"
+"PO-Revision-Date: 2010-09-05 08:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index a6841dff3b0..df79325e9c5 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:44+0000\n"
+"PO-Revision-Date: 2010-09-05 08:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 2fe4fb37bb5..86cf2df9188 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:17+0000\n"
+"PO-Revision-Date: 2010-09-05 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index c90eb21369a..b540376b482 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:42+0000\n"
+"PO-Revision-Date: 2010-09-05 08:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 8ec31c9c87f..b7599c97bd9 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:35+0000\n"
+"PO-Revision-Date: 2010-09-05 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 404202c9717..282f300d9e7 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+"PO-Revision-Date: 2010-09-05 08:32+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index b4ebde239d8..9b4445988fa 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-04 08:37+0000\n"
+"PO-Revision-Date: 2010-09-05 08:40+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki_quality_manual/i18n/it.po b/addons/wiki_quality_manual/i18n/it.po
index e428e95102d..426348590d0 100644
--- a/addons/wiki_quality_manual/i18n/it.po
+++ b/addons/wiki_quality_manual/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:48+0000\n"
-"PO-Revision-Date: 2010-09-04 23:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-09-05 08:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual

From e1f13521fa1389d8e7eb5739890ada6c560c53cf Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 6 Sep 2010 10:51:13 +0530
Subject: [PATCH 57/73] [FIX]: base_calendar, crm: Fixed error in yml

bzr revid: rpa@tinyerp.com-20100906052113-ax1aqnoax75ljd2p
---
 addons/base_calendar/test/base_calendar_test.yml | 1 +
 addons/crm/test/test_crm_meeting.yml             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml
index 14bf162f23a..5ea382babb4 100644
--- a/addons/base_calendar/test/base_calendar_test.yml
+++ b/addons/base_calendar/test/base_calendar_test.yml
@@ -60,6 +60,7 @@
 - 
   !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
     type: internal
+    send_mail: False
     partner_id: base.res_partner_9 # Put bcz of problem in read
     user_ids:
       - base.user_demo
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index ef86261f091..07a05caa09a 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -78,6 +78,7 @@
 - 
   !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
     type: internal
+    send_mail: False
     partner_id: base.res_partner_9
     user_ids:
       - base.user_demo

From 06eddc2b436cd0af37eeca09ac5405b5c9704a3a Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 6 Sep 2010 11:18:54 +0530
Subject: [PATCH 58/73] [REF] Base_contact : Improvements

bzr revid: jvo@tinyerp.com-20100906054854-877tg1n6fugs10g2
---
 addons/base_contact/base_contact_installer.py       | 2 +-
 addons/base_contact/base_contact_installer_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index e1ed709dd11..31cebb61ba5 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -29,7 +29,7 @@ class base_contact_installer(osv.osv_memory):
     _columns = {
         'name': fields.char('Name', size=64),
         'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
-        'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will be not migrated."),
+        'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will not be migrated."),
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 646d3918e9f..87a8033d837 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -27,7 +27,7 @@
                     </xpath>
                     <group colspan="8">
                         <group colspan="2" col="2">
-                            <label string="Due to changes in Address and Partner's relation, some of the details from address are needed to migrated into contact information." colspan="4"/>
+                            <label string="Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information." colspan="4"/>
                             <label string="Otherwise these details will not be visible from address/contact."  colspan="4"/>
                             <label string="Do you want to migrate your Address data in Contact Data?" colspan="4" />
                             <group colspan="6">

From 5ffb9036080a5f35a74e572c67f1746a9cd419df Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 6 Sep 2010 11:24:26 +0530
Subject: [PATCH 59/73] [IMP]: Typo + Improvements

bzr revid: rpa@tinyerp.com-20100906055426-jrjl7llor09ivevi
---
 addons/account/account_installer.xml | 4 ++--
 addons/account/installer.py          | 3 +++
 addons/hr/installer.py               | 2 +-
 addons/mrp/installer.py              | 2 +-
 addons/outlook/installer.py          | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index f55b5d0ae7d..acd1141cbf8 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -66,10 +66,10 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Extra Accounting Modules</attribute>
+                        <attribute name="string">Accounting Modules Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Install Extra Accounting Modules In Your Accounting System</attribute>
+                        <attribute name="string">Extra Accounting Modules</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index c97b89271ec..cd128ca4976 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -634,6 +634,9 @@ class account_installer_modules(osv.osv_memory):
 #                 "entries with voucher, also automatically reconcile during the payment and receipt entries."),
                  }
 
+    _defaults = {
+        'account_voucher': True,
+        }
 account_installer_modules()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 7977d09e784..f4ee1e99aba 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -41,7 +41,7 @@ class hr_installer(osv.osv_memory):
         'hr_evaluation': fields.boolean('Periodic Evaluations',
             help="Lets you create and manage the periodic evaluation and "
                  "performance review of employees."),
-        'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
+        'hr_attendance': fields.boolean('Attendances',
             help="Simplifies the management of employee's attendances."),
         'hr_payroll': fields.boolean('Payroll',
             help="Generic Payroll system"),
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index e1dc79e5d32..31a683fd3d9 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -40,7 +40,7 @@ class mrp_installer(osv.osv_memory):
                  "as the date of start and end of execution of the order."),
         'mrp_subproduct': fields.boolean('MRP Subproducts',
             help="Enables multiple product output from a single production "
-                 "order : without this, a production order can have only one "
+                 "order: without this, a production order can have only one "
                  "output product."),
         'mrp_repair': fields.boolean('Repairs',
             help="Enables warranty and repair management (and their impact "
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 6961a868684..092ff2a6574 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -50,8 +50,8 @@ class outlook_installer(osv.osv_memory):
         'outlook' : True,
         'name' : 'OpenERP-Outlook-PlugIn.zip',
         'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
-        'description' : """ * Save the Outlook plug­-in.
-* Follows these steps to install outlook plug­in.
+        'description' : """* Save the Outlook plug­-in.
+* Follow these steps to install outlook plug­in.
 Pre-requirements :
     1. Python 2.6+ .
     2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.

From cdc87602088153c5ebd993597372e485ff984899 Mon Sep 17 00:00:00 2001
From: "apa,saz" <>
Date: Mon, 6 Sep 2010 11:28:32 +0530
Subject: [PATCH 60/73] [IMP]:Imprved reports.

bzr revid: apa@tinyerp.com-20100906055832-qi0gbtz1aar4peh7
---
 .../account/report/account_balance_sheet.rml  | 14 +++---
 .../account_balance_sheet_horizontal.rml      | 16 +++----
 .../report/account_central_journal.rml        | 34 +++++++-------
 .../report/account_general_journal.rml        | 46 +++++++++----------
 addons/account/report/account_journal.rml     | 36 +++++++--------
 .../report/account_partner_balance.rml        | 24 +++++-----
 .../account/report/account_partner_ledger.rml |  2 +-
 .../report/account_profit_horizontal.rml      | 16 +++----
 addons/account/report/account_profit_loss.rml | 10 ++--
 addons/account/report/tax_report.rml          |  6 +--
 10 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 79fbaed79e6..42e3913a473 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -197,8 +197,8 @@
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
 	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
@@ -239,13 +239,13 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
         </td>
         <td>
           <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_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0  ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0  ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -255,7 +255,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -283,7 +283,7 @@
           <para style="terp_default_9">[[ a['code'] ]]<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_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -293,7 +293,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index 2de52ddf134..39ca95412ea 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -217,8 +217,8 @@
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
 	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data)]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[get_end_date(data) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
@@ -260,7 +260,7 @@
           <para style="terp_default_Bold_9">Assets</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]])</para>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data) ]]) </para>
         </td>
       </tr>
 	  <tr>
@@ -272,7 +272,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_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or '' ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
 	      </td>
 	      <td>
 	        <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code1'] ]]</font></para>
@@ -281,23 +281,23 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
 	      </td>
 	   </tr>
       </blockTable>
     <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]]) </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
         </td>
 		<td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
          </tr>
     </blockTable>
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index a1d36fcdcc8..a32c13af31e 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -287,9 +287,9 @@
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</para></td>
-        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
-        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
-  		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
+        <td><para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para></td>
+  		<td><para style="terp_tblheader_Details_Right">Balance([[ company.currency_id.code]])</para></td>
       </tr>
     </blockTable>
    <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
@@ -304,20 +304,20 @@
     </blockTable>
     <blockTable colWidths="50.0,200.0,94.0,92.0,69.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">Total:([[ company.currency_id.code]])</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>
-		<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) ) ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+		<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,150.0,95.0,92.0,69.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">Total:([[ company.currency_id.code]])</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>
-		<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) ) ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+		<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>
 		 <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
@@ -327,18 +327,18 @@
         <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']) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]] [[ company.currency_id.symbol ]]</para></td>
+ 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
         </tr>
       </blockTable>
       <blockTable colWidths="50.0,150.0,95.0,92.0,69.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']) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]] [[ company.currency_id.symbol ]]</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>
         </tr>
       </blockTable>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 7bdcf6e3ba3..209d4c8de6e 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -268,16 +268,16 @@
       <tr>
         <td><para style="terp_tblheader_Details">Code</para></td>
         <td><para style="terp_tblheader_Details">Journal Name</para></td>
-        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
-        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
-  		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
+        <td><para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para></td>
+  		<td><para style="terp_tblheader_Details_Right">Balance([[ company.currency_id.code]])</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:</para></td>
+        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</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>
- 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit()) ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
+ 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
@@ -290,11 +290,11 @@
         <td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:</para></td>
+        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</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>
-		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()- sum_debit()) ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
+		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()- sum_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
 
@@ -309,13 +309,13 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
 
           </td>
      		<td>
@@ -335,13 +335,13 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -356,13 +356,13 @@
             <para style="terp_default_9">[[ line['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['debit'] )]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
       		<td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -373,9 +373,9 @@
         <tr>
           <td><para style="terp_default_9"><font>[[ repeatIn(lines(o.id),'line')]]</font> [[ 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'] ) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]] [[ company.currency_id.symbol ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</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>
         </tr>
       </blockTable>
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 728afa2bbba..88b93e06429 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -253,9 +253,9 @@
         <td><para style="P10">A/c No.</para></td>
         <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Entry label</para></td>
-        <td><para style="P10b">Debit</para></td>
-        <td><para style="P10b">Credit</para></td>
-        <td><para style="P10b">Balance</para></td>
+        <td><para style="P10b">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10b">Credit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10b">Balance([[ company.currency_id.code]])</para></td>
       </tr>
        <tr>
         <td><para style="P11">[[o.period_id.name ]]</para></td>
@@ -263,9 +263,9 @@
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td> <para style="P12"><u>[[ formatLang((sum_credit(o.period_id.id, o.journal_id.id) - sum_debit(o.period_id.id, o.journal_id.id))) ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td> <para style="P12"><u>[[ 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 ]]</u></para></td>
       </tr>
       <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
       <tr>
@@ -274,9 +274,9 @@
         <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
         <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
         <td><para style="terp_default_8">[[ line.name ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
 
@@ -288,9 +288,9 @@
         <td><para style="P10">A/c No.</para></td>
         <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Entry label</para></td>
-        <td><para style="P10b">Debit</para></td>
-        <td><para style="P10b">Credit</para></td>
-   		<td><para style="P10b">Balance</para></td>
+        <td><para style="P10b">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="P10b">Credit([[ company.currency_id.code]])</para></td>
+   		<td><para style="P10b">Balance([[ company.currency_id.code]])</para></td>
 		<td><para style="P10b">Currency</para></td>
       </tr>
        <tr>
@@ -299,9 +299,9 @@
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-		<td> <para style="P12"><u>[[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+		<td> <para style="P12"><u>[[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]</u></para></td>
       </tr>
        <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
       <tr>
@@ -310,9 +310,9 @@
         <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
         <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
         <td><para style="terp_default_8">[[ line.name ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
 		<td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.code or '']]</para></td>
 
       </tr>
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index 5c8d98a1a94..92adb65898e 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -237,24 +237,24 @@
       <tr>
         <td><para style="P12a">Code</para></td>
         <td><para style="P12a">(Account/Partner) Name</para></td>
-        <td><para style="P12b">Debit</para></td>
-        <td><para style="P12b">Credit</para></td>
-        <td><para style="P12b">Balance</para></td>
-        <td><para style="P12b">In dispute</para></td>
+        <td><para style="P12b">Debit([[ company.currency_id.code]])</para></td>
+        <td><para style="P12b">Credi([[ company.currency_id.code]])</para></td>
+        <td><para style="P12b">Balance([[ company.currency_id.code]])</para></td>
+        <td><para style="P12b">In dispute([[ company.currency_id.code]])</para></td>
       </tr>
       <tr>
-        <td><para style="P7">Grand total</para></td>
+        <td><para style="P7">Grand total([[ company.currency_id.code]])</para></td>
         <td><para style="P8"></para></td>
-        <td><para style="P8"><u>[[ formatLang(sum_debit()) ]]</u></para></td>
-        <td><para style="P8"><u>[[ formatLang(sum_credit()) ]]</u></para></td>
-        <td><para style="P8"><u>[[ formatLang((solde_debit()-solde_credit())) ]]</u></para></td>
-        <td><para style="P8"><u>[[ formatLang(sum_litige()) ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_credit()) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang((solde_debit()-solde_credit())) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]</u></para></td>
       </tr>
       <tr>
-        <td><para style="P7">Balance</para></td>
+        <td><para style="P7">Balance([[ company.currency_id.code]])</para></td>
         <td><para style="P8"></para></td>
-        <td><para style="P8">[[ formatLang(solde_debit()) ]]</para></td>
-        <td><para style="P8">[[ formatLang(solde_credit()) ]]</para></td>
+        <td><para style="P8">[[ formatLang(solde_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(solde_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8"></para></td>
         <td><para style="P8"></para></td>
       </tr>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 23453145800..57ebc6f44e3 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -515,4 +515,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index d22e2e18a20..6b48ab14014 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -274,7 +274,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -287,7 +287,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or '' ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -300,7 +300,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
@@ -309,7 +309,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -317,16 +317,16 @@
     <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
+          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]] )</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
+          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 316ffb1b795..5a9b81a82f6 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -267,7 +267,7 @@
           </para>
         </td>
          <td>
-          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -280,7 +280,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -290,7 +290,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -322,7 +322,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -345,7 +345,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 9a3926be67b..bbe7fd9e595 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -120,9 +120,9 @@
 	<blockTable colWidths="347.0,64.0,59.0,71.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</para></td>
-	    <td><para style="P12a">Debit</para></td>
-	    <td><para style="P12a">Credit</para></td>
-	    <td><para style="P12a">Tax Amount</para></td>
+	    <td><para style="P12a">Debit([[ company.currency_id.code]])</para></td>
+	    <td><para style="P12a">Credit([[ company.currency_id.code]])</para></td>
+	    <td><para style="P12a">Tax Amount([[ company.currency_id.code]])</para></td>
 	  </tr>
 	  <tr>
 	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font><font>[[ o['code'] ]]  [[ o['name'] ]]</font></para></td>

From 7cc2e27105820c4bc9b726b11ab400a9adf30d93 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 6 Sep 2010 12:45:37 +0530
Subject: [PATCH 61/73] [MOD/IMP] survey : Usability Improvements

bzr revid: vir@tinyerp.com-20100906071537-q5o6icri0z9ifc08
---
 addons/survey/security/ir.model.access.csv    | 10 ++--
 addons/survey/survey.py                       |  7 +--
 addons/survey/survey_demo.xml                 |  2 +
 addons/survey/survey_report.xml               |  6 +--
 addons/survey/survey_view.xml                 | 50 ++++++++++++-------
 addons/survey/wizard/survey_browse_answer.py  |  2 +-
 addons/survey/wizard/survey_selection.py      |  2 +-
 .../survey/wizard/survey_send_invitation.py   |  8 +--
 .../survey/wizard/survey_send_invitation.xml  |  4 +-
 9 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 8d50471fd03..10c07dc0b08 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,10 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
 "access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_tool_manager",1,0,0,0
+"access_survey_manager","survey","model_survey","base.group_tool_manager",1,1,1,1
 "access_survey_system","survey","model_survey","base.group_system",1,0,0,0
 "access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,0,0,0
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
 "access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
 "access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
@@ -18,7 +18,7 @@
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
 "access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
 "access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,0,0,0
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
 "access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
 "access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
 "access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
@@ -38,8 +38,10 @@
 "access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
 "access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,0,0,0
+"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,1,1,1
 "access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
 "access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
 "access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
 "access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
+"access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
+"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index a78fe55ea2d..5a080e5bfb4 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -55,7 +55,8 @@ class survey(osv.osv):
         'page_ids': fields.one2many('survey.page', 'survey_id', 'Page'),
         'date_open': fields.datetime('Survey Open Date', readonly=1),
         'date_close': fields.datetime('Survey Close Date', readonly=1),
-        'max_response_limit': fields.integer('Maximum Answer Limit'),
+        'max_response_limit': fields.integer('Maximum Answer Limit',
+                     help="Set to one if survey is answerable only once"),
         'response_user': fields.integer('Maximum Answer per User',
                      help="Set to one if  you require only one Answer per user"),
         'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
@@ -569,7 +570,7 @@ class survey_answer(osv.osv):
         'in_visible_answer_type': fields.boolean('Is Answer Type Invisible??')
     }
     _defaults = {
-         'sequence' : lambda * a: 1,
+#         'sequence' : lambda * a: 1,
          'type' : lambda * a: 'char',
          'in_visible_answer_type':_get_in_visible_answer_type,
     }
@@ -691,7 +692,7 @@ class survey_request(osv.osv):
     }
     _defaults = {
         'state': lambda * a: 'draft',
-        'date_deadline': lambda * a :  (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
+#        'date_deadline': lambda * a :  (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
     }
     def survey_req_waiting_answer(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 855cb2b7ce7..a4ae0d44be3 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -25,6 +25,7 @@
             <field name="tot_comp_survey">1</field>
             <field name="tot_start_survey">1</field>
             <field name="response_user">5</field>
+            <field name="date_open">2010-03-03 14:25:03</field>
            </record>
 
         <record id="survey_page_who_are_you" model="survey.page">
@@ -500,6 +501,7 @@
             <field name="tot_comp_survey">1</field>
             <field name="tot_start_survey">1</field>
             <field name="response_user">5</field>
+            <field name="date_open">2010-03-03 14:25:03</field>
            </record>
 
         <record id="survey_page_odoo_who_are_you" model="survey.page">
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index 3ca05f6ba63..ebb52ce285c 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -6,20 +6,20 @@
 				id="report_survey_form"
 				model="survey"
 				name="survey.form"
-				string="Surveys"/>
+				string="Survey"/>
 
 		<report auto="True"
 				id="survey_analysis"
 				model="survey"
 				name="survey.analysis"
 				rml=""
-				string="Surveys Statistics"/>
+				string="Survey Statistics"/>
 
 		<report auto="True"
 				id="survey_browse_response"
 				model="survey"
 				name="survey.browse.response"
 				rml=""
-				string="Surveys Answers"/>
+				string="Survey Answers"/>
 	</data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 166c46dca93..ec3b1677db6 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
 
-            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_tool_manager,base.group_tool_user"/>
+            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_manager,base.group_tool_user,base.group_system" sequence="2"/>
+                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
                  groups="base.group_tool_manager,base.group_tool_user,base.group_system"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -196,7 +196,7 @@
                         </page>
                         <page string="Other">
                             <group colspan="6" col='4'>
-                                <field name="max_response_limit" select="1"
+                                <field name="max_response_limit"
                                     attrs="{'readonly':[('state','in',('open','close'))]}"/>
                                 <field name="response_user"
                                     attrs="{'readonly':[('state','in',('open','close'))]}"/>
@@ -260,8 +260,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter string="Open" icon="terp-check" domain="[('state','=','open')]"/>
+                        <filter icon="terp-document-new" string="Current" domain="[('state','in', ('draft', 'open'))]"/>
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
@@ -271,8 +270,9 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-	                   <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
 	                   <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
+                        <separator orientation="vertical"/>
+	                   <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
 	                   <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                    </group>
                </search>
@@ -476,6 +476,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
+                        <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'title'}"/>                        
                     </group>
                 </search>
             </field>
@@ -489,7 +490,7 @@
             <field name="view_id" ref="survey_page_tree"></field>
         </record>
 
-        <menuitem name="Pages" id="menu_survey_page_form1"
+        <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
             groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
@@ -679,6 +680,10 @@
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'page_id'}"/>
+                    </group>
                </search>
             </field>
         </record>
@@ -864,9 +869,10 @@
             <field name="model">survey.answer</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree editable="top" string="Survey Answer">
+                <tree editable="bottom" string="Survey Answer">
                     <field name="sequence" string="Seq"/>
                     <field name="answer" select="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -1087,15 +1093,23 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-emblem-important" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
-                        <filter icon="terp-gtk-media-pause" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection" select="1"/>
                         <field name="email" select="1"/>
-                        <field name="user_id" select="1" widget="selection" default="1">
+                        <field name="user_id" select="1" default="1">
                         <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
-                   </group>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+	                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+	                    <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'survey_id'}"/>
+                        <separator orientation="vertical"/>
+	                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                    </group>
                </search>
             </field>
         </record>
@@ -1151,32 +1165,32 @@
 
         <act_window domain="[('survey_id', '=', active_id)]"
             id="act_survey_pages"
-            name="Survey Pages"
+            name="Pages"
             res_model="survey.page"
             src_model="survey"/>
 
         <act_window domain="[('survey', '=', active_id)]"
             id="act_survey_question"
-            name="All Questions"
+            name="Questions"
             res_model="survey.question"
             src_model="survey"/>
 
 
         <act_window domain="[('page_id', '=', active_id)]"
             id="act_survey_page_question"
-            name="Survey Questions"
+            name="Questions"
             res_model="survey.question"
             src_model="survey.page"/>
 
         <act_window domain="[('question_id', '=', active_id)]"
             id="act_survey_answer"
-            name="Survey Answers"
+            name="Answers"
             res_model="survey.answer"
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system" icon="STOCK_INDEX"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 4b74021b8a1..cf047a0930c 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -46,7 +46,7 @@ class survey_browse_answer(osv.osv_memory):
 
     _columns = {
         'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'response_id': fields.many2one("survey.response", "Survey Answer", help="If you want to print all answer of selected survey then don't select survey answer and if you select survey answer then print only selected survey answer."),
+        'response_id': fields.many2one("survey.response", "Survey Answers", help="If you want to print all answers of selected survey then don't select survey answer and if you select survey answer then print only selected survey answer."),
     }
 
     def action_next(self, cr, uid, ids, context=None):
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 2a9438594b2..92097d99333 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -62,7 +62,7 @@ class survey_name_wiz(osv.osv_memory):
             for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
                 result.append((sur.id, sur.title))
             return result
-        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Survey / Manager','Survey / User'))])
+        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User'))])
         user_obj = self.pool.get('res.users')
         user_rec = user_obj.read(cr, uid, uid)
         for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index b34d97c6b03..d0bb7ed87cc 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -41,8 +41,8 @@ class survey_send_invitation(osv.osv_memory):
                                 'survey_id', "Answer", required=1),
         'send_mail': fields.boolean('Send mail for new user'),
         'send_mail_existing': fields.boolean('Send reminder for existing user'),
-        'mail_subject': fields.char('Subject', size=256, required=1),
-        'mail_subject_existing': fields.char('Subject', size=256, required=1),
+        'mail_subject': fields.char('Subject', size=256),
+        'mail_subject_existing': fields.char('Subject', size=256),
         'mail_from': fields.char('From', size=256, required=1),
         'mail': fields.text('Body')
     }
@@ -100,7 +100,7 @@ class survey_send_invitation(osv.osv_memory):
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
-        group_id = model_data_obj._get_id(cr, uid, 'survey', 'base.group_tool_user')
+        group_id = model_data_obj._get_id(cr, uid, 'base', 'group_tool_user')
         group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')
@@ -212,4 +212,4 @@ class survey_send_invitation_log(osv.osv_memory):
 
 survey_send_invitation_log()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 3762475e420..8f82d816954 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -41,7 +41,7 @@
 		</record>
 
     	<act_window id="action_act_view_survey_send_invitation"
-    		key2="client_action_multi" name="Send Invitation"
+    		key2="client_action_multi" name="Send Invitations"
     		res_model="survey.send.invitation" src_model="survey"
     		view_mode="form" target="new" view_type="form" />
 
@@ -74,4 +74,4 @@
 			<field name="target">new</field>
 		</record>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>

From 2c90e1db4eaea7aac2d31cf4178ec236ba1a1338 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 6 Sep 2010 14:57:49 +0530
Subject: [PATCH 62/73] [IMP] sale: Removed demo data creating two companies
 with same name.

bzr revid: uco@tinyerp.com-20100906092749-ixc1tgkktepjgmot
---
 addons/sale/sale_demo.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 31ab58eb60b..cd0fdbd682f 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -2,15 +2,6 @@
 <openerp>
     <data noupdate="1">
     
-		<!--Resource: res.company-->
-		
-		<record id="res_company_shop_sale0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
-            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
-            <field name="parent_id" ref="stock.res_company_shop0"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-        </record>
-
         <!--Resource: sale.order-->
         
         <record id="order" model="sale.order">

From ba24ca5c3ffeb8bc77c2863d3435e104699aaee5 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 6 Sep 2010 15:19:34 +0530
Subject: [PATCH 63/73] [IMP] company: Set priorities to Company views in
 mrp,sale,procurement and purchase modules.

bzr revid: uco@tinyerp.com-20100906094934-1n9f5iu19af1ib8u
---
 addons/mrp/company_view.xml         | 1 +
 addons/procurement/company_view.xml | 1 +
 addons/purchase/company_view.xml    | 1 +
 addons/sale/company_view.xml        | 1 +
 4 files changed, 4 insertions(+)

diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index e94324f8195..f5f06518565 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -6,6 +6,7 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 543e36fe02f..e046fd4faee 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -6,6 +6,7 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index d7707fe32c7..d9d2fb9f9ee 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -6,6 +6,7 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 4088c38db08..96ff91e8e90 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -5,6 +5,7 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">

From f85a63e1ba8677b22896b7f0d16a767e8b02c37a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Mon, 6 Sep 2010 12:05:50 +0200
Subject: [PATCH 64/73] [FIX] document: Assign False to the local variable
 'result'

bzr revid: stephane@openerp.com-20100906100550-e5twhz3ffwm9e49a
---
 addons/document/document.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/document/document.py b/addons/document/document.py
index 084d4bcd88d..c19fe0a55b6 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -144,6 +144,7 @@ class document_file(osv.osv):
         return super(document_file, self).copy(cr, uid, id, default, context)
 
     def write(self, cr, uid, ids, vals, context=None):
+        result = False
         if not isinstance(ids, list):
             ids = [ids]
         res = self.search(cr, uid, [('id', 'in', ids)])

From 1e32fa1bb997afe81861ecee3eaa82bfbc654d24 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 6 Sep 2010 16:10:54 +0530
Subject: [PATCH 65/73] [REF] Document

bzr revid: jvo@tinyerp.com-20100906104054-cucn9vpywxyum3oo
---
 addons/document/document.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index c19fe0a55b6..624af24c1fb 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -20,9 +20,7 @@
 ##############################################################################
 
 import base64
-
 from osv import osv, fields
-
 import os
 
 # from psycopg2 import Binary
@@ -48,12 +46,12 @@ class document_file(osv.osv):
         result = {}
         bin_size = context.get('bin_size', False)
         for fbro in fbrl:
-                fnode = nodes.node_file(None, None, nctx, fbro)
-                if not bin_size:
-                        data = fnode.get_data(cr, fbro)
-                        result[fbro.id] = base64.encodestring(data or '')
-                else:
-                        result[fbro.id] = fnode.get_data_len(cr, fbro)
+            fnode = nodes.node_file(None, None, nctx, fbro)
+            if not bin_size:
+                    data = fnode.get_data(cr, fbro)
+                    result[fbro.id] = base64.encodestring(data or '')
+            else:
+                    result[fbro.id] = fnode.get_data_len(cr, fbro)
 
         return result
 
@@ -166,7 +164,6 @@ class document_file(osv.osv):
                 dbro = None
                 dnode = None
             ids2 = []
-            result = False
             for fbro in self.browse(cr, uid, ids, context=context):
                 if ('parent_id' not in vals or fbro.parent_id.id == vals['parent_id']) \
                     and ('name' not in vals or fbro.name == vals['name']) :
@@ -193,7 +190,7 @@ class document_file(osv.osv):
         return result
 
     def create(self, cr, uid, vals, context=None):
-        if not context:
+        if context is None:
             context = {}
         vals['parent_id'] = context.get('parent_id', False) or vals.get('parent_id', False)
         if not vals['parent_id']:

From 27d6500225f512fc2868cdf75b1ff838db849c64 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 6 Sep 2010 16:50:27 +0530
Subject: [PATCH 66/73] [MOD/IMP] Idea : Usability Improvements. hr :
 department set in simplified view

bzr revid: vir@tinyerp.com-20100906112027-i1khvcoa616fwg0x
---
 addons/hr/hr_department_view.xml        |  2 +-
 addons/idea/idea.py                     |  3 ++-
 addons/idea/idea_view.xml               | 11 +++++++----
 addons/idea/idea_workflow.xml           | 12 ------------
 addons/idea/report/report_vote.py       | 12 ++++++------
 addons/idea/report/report_vote_view.xml | 20 ++++++++++----------
 addons/lunch/lunch_view.xml             |  2 +-
 7 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d1e6f2e8d52..c2bb6ac7390 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -76,7 +76,7 @@
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_extended"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6"/>
 
         <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 4b6dbd4d039..310a852684b 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -157,6 +157,7 @@ class idea_idea(osv.osv):
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
         'created_date': fields.datetime('Creation date', readonly=True),
+        'open_date': fields.datetime('Open date', readonly=True, help="Date when an idea opened"),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
         'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
         'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
@@ -260,7 +261,7 @@ class idea_idea(osv.osv):
         return True
 
     def idea_open(self, cr, uid, ids):
-        self.write(cr, uid, ids, { 'state': 'open' })
+        self.write(cr, uid, ids, { 'state': 'open' ,'open_date': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def idea_close(self, cr, uid, ids):
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index d5506d9a677..b6e8b926a0c 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -197,6 +197,7 @@
             <group col="6" colspan="4">
                 <field name="name" select="1" />
                 <field name="category_id" select="1"/>
+                <field name="open_date" select="1"/>
                 <field name="user_id" attrs="{'invisible':[('visibility','=',False)]}"/>
                 <field name="vote_avg" widget="progressbar"/>
                 <group col="4" colspan="2">
@@ -265,11 +266,12 @@
         <field name="arch" type="xml">
         <tree colors="blue:state in ('draft');black:state in ('open','close');gray:state in('cancel')" string="Ideas">
             <field name="name"/>
-            <field name="category_id" />
+            <field name="category_id"/>
+            <field name="user_id"/>
             <field name="created_date"/>
             <field name="vote_avg" widget="progressbar"/>
-            <field name="count_comments" />
-            <field name="count_votes" />
+            <field name="count_comments"/>
+            <field name="count_votes"/>
             <field name="state"/>
              <button name="idea_open" string="Open" states="draft" icon="terp-gtk-go-back-rtl"/>
             <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" type="action" states="open" string="Submit Vote"/>
@@ -299,8 +301,9 @@
                 <newline/>
                 <group expand="0" string="Group By..." colspan="12" col="10">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
-                    <filter icon="terp-stock_effects-object-colorize" string="State" help="By States" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
+                    <filter icon="terp-stock_effects-object-colorize" string="State" help="By States" context="{'group_by':'state'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/idea/idea_workflow.xml b/addons/idea/idea_workflow.xml
index 230f36f61e1..649541ae349 100644
--- a/addons/idea/idea_workflow.xml
+++ b/addons/idea/idea_workflow.xml
@@ -50,23 +50,11 @@
             <field name="signal">idea_close</field>
         </record>
 
-        <record model="workflow.transition" id="t3">
-            <field name="act_from" ref="act_draft" />
-            <field name="act_to" ref="act_cancel" />
-            <field name="signal">idea_cancel</field>
-        </record>
-
         <record model="workflow.transition" id="t4">
             <field name="act_from" ref="act_open" />
             <field name="act_to" ref="act_cancel" />
             <field name="signal">idea_cancel</field>
         </record>
 
-        <record model="workflow.transition" id="t5">
-            <field name="act_from" ref="act_cancel" />
-            <field name="act_to" ref="act_draft" />
-            <field name="signal">idea_draft</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/idea/report/report_vote.py b/addons/idea/report/report_vote.py
index 008cb3ed711..ea55ab9048d 100644
--- a/addons/idea/report/report_vote.py
+++ b/addons/idea/report/report_vote.py
@@ -54,10 +54,10 @@ class report_vote(osv.osv):
                select
                     min(iv.id) as id,
                     count(*) as nbr,
-                    to_date(to_char(iv.date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
-                    to_char(iv.date, 'YYYY') as year,
-                    to_char(iv.date, 'MM') as month,
-                    to_char(iv.date, 'YYYY-MM-DD') as day,
+                    to_date(to_char(ii.open_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+                    to_char(ii.open_date, 'YYYY') as year,
+                    to_char(ii.open_date, 'MM') as month,
+                    to_char(ii.open_date, 'YYYY-MM-DD') as day,
                     iv.user_id as user_id,
                     iv.idea_id as idea_id,
                     ii.state as idea_state,
@@ -68,8 +68,8 @@ class report_vote(osv.osv):
                     idea_vote as iv
                     left join idea_idea as ii on (ii.id = iv.idea_id)
                 group by
-                    iv.id ,to_char(iv.date, 'dd-MM-YYYY'),to_char(iv.date, 'YYYY'),
-                    to_char(iv.date, 'MM'),to_char(iv.date, 'YYYY-MM-DD'),ii.state,
+                    iv.id ,to_char(ii.open_date, 'dd-MM-YYYY'),to_char(ii.open_date, 'YYYY'),
+                    to_char(ii.open_date, 'MM'),to_char(ii.open_date, 'YYYY-MM-DD'),ii.state,
                     iv.user_id,ii.user_id,ii.category_id,iv.idea_id
             )
             """)
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 0b0fa7edb12..201bdd40721 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -29,16 +29,16 @@
             <field name="arch" type="xml">
                 <search string="Idea Vote Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="  365 Days  "
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                        <filter icon="terp-go-year" string="  Year  "
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Idea Vote created last 365 days"/>
-                        <filter icon="terp-go-month" string="   30 Days   "
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                        <filter icon="terp-go-month" string="   Month   "
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                             help="Idea Vote created in last 30 days"/>
-                        <filter icon="terp-go-week"
-                             string="    7 Days    "
+                        <filter icon="terp-go-month"
+                             string="    Month-1    "
                              separator="1"
-                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                             domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created last 7 days"/>
                          <separator orientation="vertical"/>
                          <filter icon="terp-go-today"
@@ -60,15 +60,15 @@
                             domain="[('idea_state','=',('cancel'))]"/>
                         <separator orientation="vertical"/>
                         <field name="idea_id" string="Idea"/>
-                        <field name="creater_id" string="Creater"/>
+                        <field name="creater_id" string="creater"/>
                         <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="10" col="12">
-                        <filter string="Creater" icon="terp-personal" context="{'group_by':'creater_id'}"/>
+                        <filter string="creater" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Idea" icon="terp-personal" context="{'group_by':'idea_id'}"/>
+                        <filter string="Idea" icon="terp-idea" context="{'group_by':'idea_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 3c33dcd247e..6b0e4c4b8c7 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -371,7 +371,7 @@
                         name="month"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                         help="Box amount in current month"/>
-                        <filter icon="terp-go-week"
+                        <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
                          domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"

From 13109194c94f490098e79ec966987f6adc8855c6 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 6 Sep 2010 17:38:19 +0530
Subject: [PATCH 67/73] [IMP] mrp: Improved Production Order report.

bzr revid: uco@tinyerp.com-20100906120819-pm9x1fw0evvs2fjt
---
 addons/mrp/report/order.rml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index e1e23205cfd..1a190bbb1b4 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -201,7 +201,7 @@
     <blockTable colWidths="193.0,92.0,114.0,129.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Planned Date</para>
+          <para style="terp_tblheader_General_Centre">Scheduled Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Printing date</para>
@@ -328,6 +328,9 @@
         </blockTable>
       </section>
     </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <section>
       <para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</para>
       <section>

From d6c2fcefe7d62ea57c1bd7c4690760762012680f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 6 Sep 2010 18:06:50 +0530
Subject: [PATCH 68/73] [FIX] document: remove unused fields from report object

bzr revid: hmo@tinyerp.com-20100906123650-xz8hygmxpsp4mf36
---
 addons/document/report/document_report.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 55af96b3926..f10ca30263d 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -72,7 +72,6 @@ class report_files_partner(osv.osv):
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
-        'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
         'file_size': fields.integer('File Size', readonly=True),
         'nbr':fields.integer('# of Files', readonly=True),

From 89f90363560012bc6fe6df5a75420d0e2d1fb606 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 6 Sep 2010 18:08:59 +0530
Subject: [PATCH 69/73] [IMP] mrp: Improved Production Order report.

bzr revid: uco@tinyerp.com-20100906123859-mxjag0x5xsiyju4t
---
 addons/mrp/report/order.rml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 1a190bbb1b4..03bd0377cc5 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -175,8 +175,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="399.0,128.0" style="Table3">
+    <blockTable colWidths="200.0,199.0,128.0" style="Table2">
       <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Source Document</para>
+        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Product </para>
         </td>
@@ -185,8 +188,11 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="399.0,129.0" style="Table5">
+    <blockTable colWidths="200.0,199.0,129.0" style="Table2">
       <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.origin ]]</para>
+        </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
         </td>

From 08a8e64ca90f709a4b39e6b9f89bd2cd3a7daa90 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 6 Sep 2010 18:12:37 +0530
Subject: [PATCH 70/73] [FIX] document: remove unused fields from report
 object.

bzr revid: hmo@tinyerp.com-20100906124237-dz6cqthkady7fu6s
---
 addons/document/report/document_report.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index f10ca30263d..bccc46d463b 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -71,11 +71,7 @@ class report_files_partner(osv.osv):
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
-        'directory': fields.char('Directory',size=64,readonly=True),
-        'change_date': fields.datetime('Modified Date', readonly=True),
-        'file_size': fields.integer('File Size', readonly=True),
         'nbr':fields.integer('# of Files', readonly=True),
-        'type':fields.char('Directory Type',size=64,readonly=True),
         'partner':fields.char('Partner',size=64,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),

From 8c8d8e5bd479d98426e9327996c42ed1485e807c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 6 Sep 2010 18:22:07 +0530
Subject: [PATCH 71/73] [FIX] mail_gateway: form view

bzr revid: hmo@tinyerp.com-20100906125207-ipc135nbmn0w7aez
---
 addons/mail_gateway/mail_gateway_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index f30416ed8fe..203d9a942bf 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -76,9 +76,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Mailgateway Thread">
-                    <group col="6" colspan="4">
-                        <field name="thread" select="1" colspan="3"/>
-                    </group>
                     <separator string="History" colspan="4"/>
                     <field name="message_ids" nolabel="1" colspan="4" mode="tree,form">
                         <tree string="Mailgateway History">
@@ -117,7 +114,6 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Mailgateway Thread">
-                    <field name="thread" select="1" />
                     <field name="message_ids" />
                 </tree>
             </field>

From b85057b22c181878a628845ed60236bdd5e20a85 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 6 Sep 2010 18:42:19 +0530
Subject: [PATCH 72/73] [FIX] account_report: view

bzr revid: hmo@tinyerp.com-20100906131219-5ylh96sxb8m36omv
---
 addons/account_report/account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index f607f195d00..dba6d5d24c7 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -17,8 +17,8 @@
                             <field name="sequence"/>
                             <field name="type" select="1"/>
                             <newline/>
-                            <field name="color_font"/>
-                            <field name="color_back"/>
+                            <!-- <field name="color_font"/> #TOCHECK: why need it ?
+                            <field name="color_back"/> -->
                             <field name="badness_limit"/>
                             <field name="goodness_limit"/>
                             <field colspan="4" name="expression"/>

From 301349a23b39b38ba5ecd6d962bc0228b140ff4b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 6 Sep 2010 19:06:02 +0530
Subject: [PATCH 73/73] [FIX] hr_recuirement: section_id should not used

bzr revid: hmo@tinyerp.com-20100906133602-oxiy4uct742bxm95
---
 .../report/hr_recruitment_report.py           | 31 ++-----------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 7bce80d538d..524a2265e23 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -46,30 +46,7 @@ class hr_recruitment_report(osv.osv):
         res = {}
         state_perc = 0.0
         avg_ans = 0.0
-
-        for case in self.browse(cr, uid, ids, context):
-            if field_name != 'avg_answers':
-                state = field_name[5:]
-                cr.execute("select count(*) from crm_lead where \
-                    section_id =%s and state='%s'"%(case.section_id.id, state))
-                state_cases = cr.fetchone()[0]
-                perc_state = (state_cases / float(case.nbr)) * 100
-
-                res[case.id] = perc_state
-            else:
-                model_name = self._name.split('report.')
-                if len(model_name) < 2:
-                    res[case.id] = 0.0
-                else:
-                    model_name = model_name[1]
-
-                    cr.execute("select count(*) from crm_case_log l, ir_model m \
-                         where l.model_id=m.id and m.model = '%s'" , model_name)
-                    logs = cr.fetchone()[0]
-
-                    avg_ans = logs / case.nbr
-                    res[case.id] = avg_ans
-
+        #TODO: Calculate avg_answer, perc_done, perc_cancel
         return res
 
     _columns = {
@@ -88,15 +65,11 @@ class hr_recruitment_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, 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),
-        'day': fields.char('Day', size=128, readonly=True),
         'date': fields.date('Date', readonly=True),
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed"),