SF.net SVN: ledger-smb: [1439] trunk

[..hidden..]

Revision: 1439
          http://svn.sourceforge.net/ledger-smb/?rev=1439&view=rev
Author:   tetragon
Date:     2007-07-24 21:26:20 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
Implement 1694183 (General Ledger Report: Show account number AND name)

Modified Paths:
--------------
    trunk/LedgerSMB/GL.pm
    trunk/bin/gl.pl

Modified: trunk/LedgerSMB/GL.pm
===================================================================
--- trunk/LedgerSMB/GL.pm	2007-07-24 20:39:17 UTC (rev 1438)
+++ trunk/LedgerSMB/GL.pm	2007-07-25 04:26:20 UTC (rev 1439)
@@ -415,7 +415,7 @@
 						  g.description, ac.transdate, ac.source,
 						  ac.amount, c.accno, c.gifi_accno, g.notes, c.link,
 						  '' AS till, ac.cleared, d.description AS department,
-						  ac.memo
+						  ac.memo, c.description AS accname
 					 FROM gl AS g
 					 JOIN acc_trans ac ON (g.id = ac.trans_id)
 					 JOIN chart c ON (ac.chart_id = c.id)
@@ -428,7 +428,7 @@
 						  ct.name, ac.transdate, ac.source,
 						  ac.amount, c.accno, c.gifi_accno, a.notes, c.link,
 						  a.till, ac.cleared, d.description AS department,
-						  ac.memo
+						  ac.memo, c.description AS accname
 					 FROM ar a
 					 JOIN acc_trans ac ON (a.id = ac.trans_id)
 					 JOIN chart c ON (ac.chart_id = c.id)
@@ -442,7 +442,7 @@
 						  ct.name, ac.transdate, ac.source,
 						  ac.amount, c.accno, c.gifi_accno, a.notes, c.link,
 						  a.till, ac.cleared, d.description AS department,
-						  ac.memo
+						  ac.memo, c.description AS accname
 					 FROM ap a
 					 JOIN acc_trans ac ON (a.id = ac.trans_id)
 					 JOIN chart c ON (ac.chart_id = c.id)

Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl	2007-07-24 20:39:17 UTC (rev 1438)
+++ trunk/bin/gl.pl	2007-07-25 04:26:20 UTC (rev 1439)
@@ -739,7 +739,7 @@
         $column_data{credit} = "<td align=right>$ref->{credit}</td>";
 
         $column_data{accno} =
-"<td><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{accno}</a></td>";
+"<td><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{accno}</a> $ref->{accname}</td>";
         $column_data{gifi_accno} =
 "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</td>";
         $column_data{balance} = "<td align=right>"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.