Merged changes from main CVS (up to 2.2.10)

[fa-stable.git] / reporting / rep704.php

diff --git a/reporting/rep704.php b/reporting/rep704.php
index b6b12c38cf9204a65d29038435abb3eb5315375a..08391fbd07b51c491c9d0b1495c0340cf50f5c77 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -111,7 +111,7 @@ function print_GL_transactions()
 
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
-       $rep->Header();
+       $rep->NewPage();
 
        $accounts = get_gl_accounts($fromacc, $toacc);
 
@@ -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
@@ -167,7 +176,7 @@ function print_GL_transactions()
                                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                                {
                                        $rep->Line($rep->row - 2);
-                                       $rep->Header();
+                                       $rep->NewPage();
                                }
                        }
                        $rep->NewLine();