[IMP]:Improved crossvered analytic account report.

bzr revid: apa@tinyerp.com-20100909124933-ug4366rmyg3hcvuq

diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 62e85dd..f95047d 100644 (file)
--- 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="Crossovered Analytic" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -99,8 +99,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <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"/>
@@ -183,11 +181,11 @@
     <para style="terp_header">
       <font color="white"> </font>
     </para>
-    <para style="P1">Analytic Account Reference:</para>
+    <para style="terp_header">Analytic Account Reference:</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="227.0,103.0,75.0,73.0,61.0" style="Table5">
+    <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" style="Table5">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Account Name</para>
@@ -199,7 +197,7 @@
           <para style="terp_tblheader_Details_Right">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
+          <para style="terp_tblheader_Details_Right">Amount([[ company.currency_id.code]]) </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Percentage</para>
@@ -208,7 +206,7 @@
     </blockTable>
     <section>
       <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">
+      <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ a['ref_name'] ]]</para>
@@ -220,7 +218,7 @@
             <para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">100.00%</para>
@@ -231,11 +229,11 @@
     <para style="terp_header">
       <font color="white"> </font>
     </para>
-    <para style="P2">Analytic Account :</para>
+    <para style="terp_header">Analytic Account :</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="226.0,103.0,77.0,72.0,61.0" repeatRows="1" style="Table3">
+    <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Account Name</para>
@@ -247,7 +245,7 @@
           <para style="terp_tblheader_Details_Right">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
+          <para style="terp_tblheader_Details_Right">Amount([[ company.currency_id.code]])</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Percentage</para>
@@ -256,7 +254,7 @@
     </blockTable>
     <section>
       <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">
+      <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[ a['acc_name'] ]]</para>
@@ -268,7 +266,7 @@
             <para style="terp_default_Right_9">[[formatLang(a['qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['amt']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['amt']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(a['perc']) ]]%</para>