Accounting/Reporting/Generic Reporting/Partner Accounts/ Print Aged Partner Balance

 * The currency code and symbol is missing on the value (from the company)
 * remove one Not to due. because of it's twice.
 * table header is not with right table style like other report.

bzr revid: apa@tinyerp.com-20100915085712-kqzg18jzpup3x31q

diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 119c1ed..2b60de5 100644 (file)
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -176,7 +176,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     after = [ future_past[partner['id']] ]
 
                 self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
-                values['direction'] = after and after[0] or ""
+                values['direction'] = after and after[0] or 0.0
 
             for i in range(5):
                 during = False
@@ -184,8 +184,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     during = [ history[i][partner['id']] ]
                 # Ajout du compteur
                 self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
-                values[str(i)] = during and during[0] or ""
-
+                values[str(i)] = during and during[0] or 0.0
             total = False
             if totals.has_key( partner['id'] ):
                 total = [ totals[partner['id']] ]
@@ -271,7 +270,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
             for i in t:
                 d['No Partner Defined'] = i[0]
             history.append(d)
-        
+
         values = {}
         if self.direction_selection == 'future':
             before = False
@@ -281,11 +280,11 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
             values['direction'] = before and before[0] or 0.0
         elif self.direction_selection == 'past':
             after = False
-            if future_past.has_key('No Partner Defined'): 
+            if future_past.has_key('No Partner Defined'):
                 after = [ future_past['No Partner Defined'] ]
             self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
             values['direction'] = after and after[0] or ""
-        
+
         for i in range(5):
             during = False
             if history[i].has_key('No Partner Defined'):
@@ -315,15 +314,15 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
     def _get_total(self,pos):
         period = self.total_account[int(pos)]
-        return period
+        return period or 0.0
 
     def _get_direction(self,pos):
         period = self.total_account[int(pos)]
-        return period
+        return period or 0.0
 
     def _get_for_period(self,pos):
         period = self.total_account[int(pos)]
-        return period
+        return period or 0.0
 
     def _get_partners(self,data):
         if data['form']['result_selection'] == 'customer':

diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 2c5387f..122e902 100644 (file)
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -82,9 +82,22 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="8.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
     <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_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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_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_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="15" 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_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_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" 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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+       <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+
   </stylesheet>
   <story>
     <para style="P9">
@@ -146,36 +159,34 @@
         </td>
       </tr>
       </blockTable>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>  <para style="P9">
+       <para style="P9">
       <font color="white"> </font>
     </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>
-          <para style="P2">Partners</para>
+          <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['4']['name'] ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['3']['name'] ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['2']['name'] ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['1']['name'] ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="P8">[[ data['form']['0']['name'] ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
         <td>
-          <para style="P8">Total</para>
+          <para style="terp_tblheader_Details_Right">Total<font size="8.0">([[ company.currency_id.code ]])</font></para>
         </td>
       </tr>
 
@@ -184,36 +195,28 @@
         <td>
           <para style="P3"> <font color="white">[[ (get_lines(data['form']), 'partner') == False or removeParentNode('para')  ]]</font></para>
           <para style="P3"> <font color="white">[[ (get_lines_with_out_partner(data['form']), 'not_partner') == False or removeParentNode('para')  ]]</font></para>
-          <para style="P9"><font color="white"> </font></para>
           <para style="Total">Account Total</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_direction('6') or 0.00) ]] </para>
+          <para style="Total_right">[[ formatLang(get_direction('6')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_for_period('4') or 0.00) ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('4')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_for_period('3') or 0.00) ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('3')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_for_period('2') or 0.00) ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('2')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_for_period('1') or 0.00) ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('1')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_for_period('0') or 0.00) ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('0')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-        <para style="P9"><font color="white"> </font></para>
-          <para style="Total_right">[[ formatLang(get_total('5') or 0.00) ]]</para>
+          <para style="Total_right">[[ formatLang(get_total('5')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
 
@@ -223,25 +226,25 @@
           <para style="P2_content">[[ partner['name'] ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['direction'] or 0.00) ]] </para>
+          <para style="content">[[ formatLang(partner['direction']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['4'] or 0.00)]]</para>
+          <para style="content">[[ formatLang(partner['4'])]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['3'] or 0.00)]]</para>
+          <para style="content">[[ formatLang(partner['3'])]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['2'] or 0.00) ]]</para>
+          <para style="content">[[ formatLang(partner['2']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['1'] or 0.00)  ]]</para>
+          <para style="content">[[ formatLang(partner['1'])  ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['0'] or 0.00) ]]</para>
+          <para style="content">[[ formatLang(partner['0']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['total'] or 0.00 ) ]]</para>
+          <para style="content">[[ formatLang(partner['total']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -250,25 +253,25 @@
           <para style="P2_content">[[ not_partner['name'] ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['direction'] or 0.00) ]] </para>
+          <para style="content">[[ formatLang(not_partner['direction']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['4'] or 0.00)]]</para>
+          <para style="content">[[ formatLang(not_partner['4'])]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['3'] or 0.00)]]</para>
+          <para style="content">[[ formatLang(not_partner['3'])]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['2'] or 0.00) ]]</para>
+          <para style="content">[[ formatLang(not_partner['2']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['1'] or 0.00)  ]]</para>
+          <para style="content">[[ formatLang(not_partner['1'])  ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['0'] or 0.00) ]]</para>
+          <para style="content">[[ formatLang(not_partner['0']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['total'] or 0.00 ) ]]</para>
+          <para style="content">[[ formatLang(not_partner['total']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>