X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep704.php;h=08391fbd07b51c491c9d0b1495c0340cf50f5c77;hb=55c51a9db64c9fe402d615e204824f8e4cd6a310;hp=b6b12c38cf9204a65d29038435abb3eb5315375a;hpb=5f06887dedd4d14701864fb72994d7e20352086d;p=fa-stable.git diff --git a/reporting/rep704.php b/reporting/rep704.php index b6b12c38..08391fbd 100644 --- 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();