From dfb8a6621380fbb54392979d917d7e6daa0fbe35 Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Thu, 16 Sep 2010 15:20:24 +0530
Subject: [PATCH] [IMP] Account: improvements in general ledger and partner
 balance report

bzr revid: pap@tinyerp.co.in-20100916095024-yqmfo6lfn0apkudr
---
 .../account/report/account_general_ledger_landscape.rml   | 8 ++++----
 addons/account/report/account_partner_balance.py          | 4 ++--
 addons/account/report/account_partner_balance.rml         | 8 --------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index b8c8509abcf..11065d3fc49 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -240,7 +240,7 @@
       <font color="white"> </font>
     </para>
 
-   	<blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,300.0,80.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+   	<blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
        <tr>
           <td><para style="date">Date</para></td>
           <td><para style="P2">JNRL</para></td>
@@ -259,10 +259,10 @@
 
       <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
 
-      <blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,300.0,80.0,69.0,72.0,64.0,62.0" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,230.0,150.0,73.0,73.0,73.0,85.00" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
       	<tr>
         	<td>
-          		<blockTable colWidths="404.0,372.0,69.0,72.0,64.0,59.00" style="Table5">
+          		<blockTable colWidths="404.0,335.0,75.0,75.0,75.0,79.00" style="Table5">
 	        		<tr>
 		    			<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
@@ -291,7 +291,7 @@
 			<td><para style="P2_content">[[ line['lref'] ]]</para></td>
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
-			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
+			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index 96be4e9b7d5..4ce8eeb986c 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -221,8 +221,8 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
 
         for rec in full_account:
             if not rec.get('name', False):
-                rec.update({'name': 'No Partner Defined'})
-
+                rec.update({'name': 'Unknown Partner'})
+                
         ## We will now compute Total
         subtotal_row = self._add_subtotal(full_account)
 #        if not self.initial_balance:
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index 7632c88e65f..c5ea2946507 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -244,14 +244,6 @@
         <td><para style="P8"><u>[[ formatLang((solde_debit()-solde_credit())) ]] [[ company.currency_id.symbol ]]</u></para></td>
         <td><para style="P8"><u>[[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]</u></para></td>
       </tr>
-      <tr>
-        <td><para style="P7">Balance<font size="8.0">([[ company.currency_id.code]]) :</font></para></td>
-        <td><para style="P8"></para></td>
-        <td><para style="P8">[[ formatLang(solde_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8">[[ formatLang(solde_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8"></para></td>
-        <td><para style="P8"></para></td>
-      </tr>
       <tr>
         <td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
         <td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>