From 63c7f7b54dbd80d7c564986ca95226eac0724f45 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 15 Sep 2010 15:55:26 +0530
Subject: [PATCH] Accounting/Billing / Send Followups /Print Followups  * Put
 currency symbol and code  * alignment is not ok

bzr revid: apa@tinyerp.com-20100915102526-nitg8trzga9r9cy3
---
 .../report/report_followp_print.rml           | 130 ++++++------------
 1 file changed, 45 insertions(+), 85 deletions(-)

diff --git a/addons/account_followup/report/report_followp_print.rml b/addons/account_followup/report/report_followp_print.rml
index f24416278dd..e632569ea79 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="Follow Up" author="OpenERP S.A. (sales@openerp.com)" 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>
@@ -43,30 +43,30 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,1" stop="5,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,1" stop="6,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,1" stop="7,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,1" stop="8,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,1" stop="9,1"/>
     </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="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-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="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="Heading" fontName="Helvetica" fontSize="15.0" leading="19" 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="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"/>
@@ -87,8 +87,8 @@
     <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_9_followup_id" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] </para>
     <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
@@ -99,10 +99,10 @@
         </td>
         <td>
           <para style="terp_default_9">[[ o.name ]]</para>
-          <para style="terp_default_9">[[ a['name'] ]]</para>
           <para style="terp_default_9">[[ a['street'] ]]</para>
-          <para style="terp_default_9">[[ a['zip'] ]] </para>
-          <para style="terp_default_9">[[ a['city'] ]]</para>
+          <para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ a['zip'] ]] [[ a['city'] ]]</para>
+          <para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
@@ -116,7 +116,7 @@
     </para>
     <para style="terp_default_9">Document : Customer account statement</para>
     <para style="terp_default_9">Date : [[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
-    <para style="terp_default_9">Customer Ref : [[ o.id ]]</para>
+    <para style="terp_default_9">Customer Ref : [[ o.ref or '' ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -124,10 +124,10 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="49.0,81.0,50.0,50.0,55.0,69.0,62.0,67.0,27.0" style="Table1">
+    <blockTable colWidths="68.0,78.0,45.0,70.0,51.0,58.0,62.0,61.0,27.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Invoice Date</para>
+          <para style="terp_tblheader_Details_Centre">Invoice Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -136,19 +136,19 @@
           <para style="terp_tblheader_Details_Centre">Ref</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Due Date</para>
+          <para style="terp_tblheader_Details_Centre">Maturity Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount In Currency</para>
+          <para style="terp_tblheader_Details_Right">Currency</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Due</para>
+          <para style="terp_tblheader_Details_Right">Due<font face="Helvetica" size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Paid</para>
+          <para style="terp_tblheader_Details_Right">Paid<font face="Helvetica" size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Maturity</para>
+          <para style="terp_tblheader_Details_Right">Maturity<font face="Helvetica" size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Li.</para>
@@ -157,7 +157,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
-      <blockTable colWidths="50.0,80.0,50.0,50.0,55.0,68.0,62.0,67.0,27.0" style="Table5">
+      <blockTable colWidths="68.0,79.0,44.0,69.0,49.0,62.0,61.0,60.0,26.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line['date'],date = True) ]]</para>
@@ -172,16 +172,16 @@
             <para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'], date=True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] )]] [[ line['currency_id'] and line['currency_id'][1] or '' ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] )]] [[ line['amount_currency'] and line['currency_id'][1] or '' ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit']) ]] [[ company.currency_id.name]] </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']) ]] [[ company.currency_id.name]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ (line['date_maturity'] &lt; time.strftime('%Y-%m-%d')) and formatLang(line['debit'] -line['credit']) ]] [[ company.currency_id.name]]</para>
+            <para style="terp_default_Right_9">[[ (line['date_maturity'] &lt; time.strftime('%Y-%m-%d')) and formatLang(line['debit'] -line['credit']) or formatLang(0.0) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@@ -189,7 +189,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="50.0,76.0,27.0,27.0,50.0,55.0,68.0,62.0,67.0,27.0" style="Table2">
+    <blockTable colWidths="191.0,108.0,73.0,61.0,60.0,26.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -197,36 +197,16 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_tblheader_Details">Sub-Total<font face="Helvetica" size="8.0">([[ company.currency_id.code ]])</font>: </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]] [[ company.currency_id.symbol ]] </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]] [[ company.currency_id.symbol ]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Sub-Total: </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]] [[ company.currency_id.name]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]] [[ company.currency_id.name]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]] [[ company.currency_id.name]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
           <para style="terp_default_Right_9">
@@ -241,19 +221,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_tblheader_Details">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.code ]])</font>: </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.symbol]] </para>
         </td>
         <td>
           <para style="terp_default_Right_9">
@@ -261,23 +232,12 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Balance: </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.name]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
+          <para style="Standard">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_8">
+          <para style="Standard">
             <font color="white"> </font>
           </para>
         </td>
@@ -287,4 +247,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file