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

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1439 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 4 insertions, 4 deletions

diff --git a/LedgerSMB/GL.pm b/LedgerSMB/GL.pm
index 463ca556..0c747763 100644
--- a/LedgerSMB/GL.pm
+++ b/LedgerSMB/GL.pm
@@ -415,7 +415,7 @@ sub all_transactions {
 						  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 @@ sub all_transactions {
 						  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 @@ sub all_transactions {
 						  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)
diff --git a/bin/gl.pl b/bin/gl.pl
index 284d9bfd..dc6ea83f 100644
--- a/bin/gl.pl
+++ b/bin/gl.pl
@@ -739,7 +739,7 @@ sub generate_report {
         $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>"