Report GL Transactions now prints line memos

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 37c85bebdfcb9ee2483b5c0fdacae739f4e0bbde..94934e4df3a49f51207a90759797ff216f61f5cf 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -26,6 +26,8 @@ $ config.default.php
 ! copy line memo to next line in journal entries and bank payments/deposits
 $ /gl/includes/ui/gl_bank_ui.inc
   /gl/includes/ui/gl_journal_ui.inc
+! Report GL Transactions now prints line memos
+$ /reporting/rep704.php
 
 29-May-2010 Janusz Dobrowolski
 # Smaller fixes initial COAs

diff --git a/reporting/rep704.php b/reporting/rep704.php
index b6b12c38cf9204a65d29038435abb3eb5315375a..3926defa4522ddced2d8d585033b79ac5dcec8b6 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -157,7 +157,16 @@ function print_GL_transactions()
                                        $rep->TextCol(4, 5,     get_dimension_string($myrow['dimension_id']));
                                if ($dim > 1)
                                        $rep->TextCol(5, 6,     get_dimension_string($myrow['dimension2_id']));
-                               $rep->TextCol(6, 7,     payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                               $txt = payment_person_name($myrow["person_type_id"],$myrow["person_id"], false);
+                               $memo = $myrow['memo_'];
+                               if ($txt != "")
+                               {
+                                       if ($memo != "")
+                                               $txt = $txt."/".$memo;
+                               }
+                               else
+                                       $txt = $memo;
+                               $rep->TextCol(6, 7,     $txt, -2);
                                if ($myrow['amount'] > 0.0)
                                        $rep->AmountCol(7, 8, abs($myrow['amount']), $dec);
                                else