From 3ce4d27c04ba905a694145aea9d27b77608625de Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 15 Sep 2010 11:35:44 +0200
Subject: [PATCH] modifs

bzr revid: fp@tinyerp.com-20100915093544-9xungnep0ocab9re
---
 addons/account/report/account_partner_ledger.py  |  5 +++--
 addons/account/report/account_partner_ledger.rml |  8 ++++----
 .../report/account_partner_ledger_other.rml      | 16 ++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index db69e51ecf5..4211a516aa7 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -123,11 +123,12 @@ 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, l.name, l.debit, l.credit,l.amount_currency,c.code AS currency_code " \
+            "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 " \
             "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)" \
             "WHERE l.partner_id = %s " \
                 "AND l.account_id IN %s AND " + self.query +" " \
                 " " + RECONCILE_TAG + " "\
@@ -313,4 +314,4 @@ report_sxw.report_sxw('report.account.third_party_ledger_other', 'res.partner',
         'addons/account/report/account_partner_ledger_other.rml',parser=third_party_ledger,
         header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 57ebc6f44e3..4136fdcc727 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -362,10 +362,10 @@
             <para style="P3">[[ line['code'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['ref'] ]]</para>
+            <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['name'] ]]</para>
+            <para style="P3"><b>b</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
@@ -487,10 +487,10 @@
             <para style="P3">[[ line['code'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['ref'] ]]</para>
+            <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['name'] ]]</para>
+            <para style="P3"><b>a</b>[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 1869144cfc9..d34ffdbb7c7 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -431,7 +431,7 @@
                    <para style="P5">
             <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="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') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -508,7 +508,7 @@
     </blockTable>
     <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="65.0,28.0,65.0,155.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -517,10 +517,10 @@
             <para style="P3">[[ line['code'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['ref'] ]]</para>
+            <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['name'] ]]</para>
+            <para style="P3">[[ (line['ref'] or '')+ ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
@@ -628,7 +628,7 @@
     </blockTable>
     <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="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') ]]
         <tr>
           <td>
             <para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
@@ -637,10 +637,10 @@
             <para style="P3">[[ line['code'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['ref'] ]]</para>
+            <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['name'] ]]</para>
+            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
@@ -662,4 +662,4 @@
       </para>
     </section>
   </story>
-</document>
\ No newline at end of file
+</document>