From: apa-tiny <apa@tinyerp.com>
Date: Mon, 13 Sep 2010 07:27:42 +0000 (+0530)
Subject: Accounting/Reporting/Generic Reporting/Taxes/ Print  Taxes  Report
X-Git-Tag: 6.0.0-rc1-addons~78^2~163
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=58a2aec5d2553e2ac2cd096651961f60aef9d04e;p=odoo%2Fodoo.git

Accounting/Reporting/Generic Reporting/Taxes/ Print  Taxes  Report
  * table header format is not ok. put in one line.
  * The currency code and symbol is missing on the value (from the company)
  * missing report title

bzr revid: apa@tinyerp.com-20100913072742-21091s38bg02bssi
---

diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index bbe7fd9..b1a9b30 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -61,7 +61,6 @@
 
 
       <blockValign value="TOP"/>
-      <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau1">
       <blockAlignment value="LEFT"/>
@@ -75,7 +74,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
      <paraStyle name="P1" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica-bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -88,8 +87,8 @@
     <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -103,32 +102,21 @@
     <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"
-		/>
-
   </stylesheet>
   <story>
-	<para style="P2"><font color="white"> </font></para>
-	<blockTable colWidths="347.0,64.0,59.0,71.0" style="Table2" repeatRows="1">
+	<para style="P2">Taxes</para>
+	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</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>
+	    <td><para style="P12a">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+	    <td><para style="P12a">Credit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+	    <td><para style="P12a">Tax Amount<font size="7.0">([[ company.currency_id.code]])</font></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>
-           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
-           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
-           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font></para></td>
+	       <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>
+           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] [[ company.currency_id.symbol ]]</font></para></td>
+           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]] [[ company.currency_id.symbol ]]</font></para></td>
+           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
 	  </tr>
 	  </blockTable>
   </story>