From 32e1d070e264431099eb91a009c5d65263f57ac7 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 16 Sep 2010 19:14:07 +0530
Subject: [PATCH] [ADD][IMP] account: added account code and name colomn and
 improved the table in partner ledger report.

bzr revid: vra@tinyerp.com-20100916134407-vcsv1vkzplrjjr33
---
 .../account/report/account_partner_ledger.py  |  8 ++--
 .../account/report/account_partner_ledger.rml | 45 +++++++++++++------
 .../report/account_partner_ledger_other.rml   | 42 ++++++++++++-----
 3 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 742c0c6e158..2a0c7446b6b 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -135,12 +135,14 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         else:
             RECONCILE_TAG = "AND l.reconcile_id IS NULL"
         self.cr.execute(
-            "SELECT l.id,l.date,j.code, l.ref, m.name as move_name, l.name, l.debit, l.credit,l.amount_currency,c.code AS currency_code " \
+            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
             "FROM account_move_line l " \
             "LEFT JOIN account_journal j " \
                 "ON (l.journal_id = j.id) " \
-            "LEFT JOIN res_currency c on (l.currency_id=c.id)" \
-            "LEFT JOIN account_move m on (m.id=l.move_id)" \
+            "LEFT JOIN account_account acc " \
+                "ON (l.account_id = acc.id) " \
+            "LEFT JOIN res_currency c ON (l.currency_id=c.id)" \
+            "LEFT JOIN account_move m ON (m.id=l.move_id)" \
             "WHERE l.partner_id = %s " \
                 "AND l.account_id IN %s AND " + self.query +" " \
                 "AND m.state IN %s " \
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index fdccec10f77..88b61dd43f6 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -24,6 +24,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -36,7 +37,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2_header">
       <blockAlignment value="LEFT"/>
@@ -69,6 +70,9 @@
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -80,6 +84,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
  	<blockTableStyle id="Table3_header">
       <blockAlignment value="LEFT"/>
@@ -96,12 +101,13 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
 
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -123,6 +129,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -270,7 +277,7 @@
       <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -281,6 +288,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -301,7 +311,7 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="349.0,57.0,58.0,65.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -319,7 +329,7 @@
       </tr>
        <tr>
     	<td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-          <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+          <para style="P2">Initial Balance</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
@@ -337,7 +347,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -349,7 +359,10 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3"><b>b</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
@@ -366,10 +379,10 @@
         <font color="white"> </font>
       </para>
     </section>
-     <blockTable colWidths="57.0,25.0,40.0,154.0,66.0,68.0,68.0,60.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Datefff</para>
+          <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">JNRL</para>
@@ -377,6 +390,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -400,7 +416,7 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="308.0,56.0,58.0,63.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -423,7 +439,7 @@
       </tr>
       <tr>
         <td>[[display_initial_balance(data) or  removeParentNode('tr') ]]
-          <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+          <para style="P2">Initial Balance</para>
         </td>
          <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
@@ -444,7 +460,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -456,7 +472,10 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3"><b>a</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index edbf74e3bae..1e8429546db 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -181,7 +181,9 @@
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
@@ -207,6 +209,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -219,7 +222,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -231,6 +234,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -243,6 +247,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -256,7 +261,7 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -269,6 +274,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -425,7 +431,7 @@
                    <para style="P5">
             <font color="white"> </font>
           </para>
-    <blockTable colWidths="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -436,6 +442,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -452,7 +461,7 @@
     </blockTable>
 	<section>
 	<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="349.0,60.0,60.0,60.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -470,7 +479,7 @@
       </tr>
       <tr>
     <td>[[ display_initial_balance(data)  or  removeParentNode('tr') ]]
-          <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+          <para style="P2">Initial Balance</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
@@ -485,7 +494,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -497,7 +506,10 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ (line['ref'] or '')+ ' ' + line['name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
@@ -512,7 +524,7 @@
       </blockTable>
     </section>
     </section>
-    <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -523,6 +535,9 @@
         <td>
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c No.- Name</para>
+        </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
@@ -543,7 +558,7 @@
     <para style="P4"/>
     <section>
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="320.0,53.0,53.0,60.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -566,7 +581,7 @@
       </tr>
         <tr>
         <td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-         <para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
+         <para style="P2">Initial Balance</para>
         </td>
          <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
@@ -584,7 +599,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="57.0,25.0,60.0,134.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
@@ -595,6 +610,9 @@
           <td>
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
+          <td>
+            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+          </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>