From: Naresh Choksy <nch@tinyerp.com>
Date: Tue, 12 May 2009 12:04:06 +0000 (+0530)
Subject: Bugfix:account_balance and layout report
X-Git-Tag: 5.0.7rc2-server~98^2~35
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=1200bc1ecc6b3c322512d08b2fb866cd7e6ad38b;p=odoo%2Fodoo.git

Bugfix:account_balance and layout report

bzr revid: nch@tinyerp.com-20090512120406-oiwt78lze4fyime4
---

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 73c879e..6f9dd74 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -57,9 +57,12 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
       <blockValign value="TOP"/>
-      <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
+      <blockAlignment value="RIGHT"/>
+      <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="#000000" start="0,2" stop="-1,-1"/>
+
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -85,17 +88,18 @@
     <initialize>
       <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.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="P1" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
    <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
     <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="8" leftIndent="-5.0" alignment="LEFT"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12b" fontName="Helvetica" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
 
 
     <blockTableStyle id="TrLevel">
@@ -122,7 +126,6 @@
 		fontSize="8.0" />
     <paraStyle
 		name="Level2"
-	
 		fontName="Helvetica-Bold"
 		fontSize="8.0" />
     <paraStyle name="Level1"
@@ -158,7 +161,7 @@
           <para style="P12a">Code</para>
         </td>
         <td>
-          <para style="P12">Account</para>
+          <para style="P12b">Account</para>
         </td>
         <td>
           <para style="P10">Debit</para>
@@ -173,11 +176,11 @@
       <tr>
 		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
         <td>
-
 	       <para style="P14">
+	       	<font color="white">[[ ...*(a['level']) ]]</font> [[ a['name'] ]]
 	       	<font>[[ (a['level']&lt;3 and setTag('tr','tr',{'style':'TrLevel'+str(a['level']), 'paraStyle':('Level'+str(a['level']))})) or removeParentNode('font') ]]</font>
 	       	<font>[[ (a['level']&gt;2 and setTag('tr','tr',{'style':'TrLevel', 'paraStyle':('Level')})) or removeParentNode('font') ]] </font>
-          	<font color="white">[[ '...'*(a['level']) ]]</font> [[ a['name'] ]]</para>
+          	</para>
         </td>
         <td>
 		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font>
@@ -194,4 +197,4 @@
       </tr>
     </blockTable>
   </story>
-</document>
+</document>
\ No newline at end of file
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 c771e7d..1c020b6 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -169,7 +169,7 @@
 	<blockTable colWidths="0.0,216.0,62,38,29,67,53,53" style="Tableau7">
 		<tr>
 			<td>
-			<para style="P8">[[ a['type']=='text' and removeParentNode('tr')]]</para>
+			<para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
 			</td>
 			<td>
 			<para style="Table Contents">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['name'] ]]</para>
@@ -178,10 +178,10 @@
 			<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['tax_types'] ]]</para>
 			</td>
 			<td>
-			<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['quantity'] ]]</para>
+			<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['quantity'] ]][[ a['uos'] ]]</para>
 			</td>
 			<td>
-			<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['uos'] ]]</para>
+			<para><font color="white"></font></para>
 			</td>
 			<td>
 			<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_unit'] ]]</para>
@@ -218,7 +218,7 @@
 	<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
 		<tr>
 			<td>
-				<para style="P3">Description [[ a['type']!='break' and removeParentNode('tr')]]</para>
+				<para style="P3">Description [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
 			</td>
 			<td>
 				<para style="P4">Taxes</para>