X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep704.php;h=e8063a82a1d7174284d1355ee1ff08c713e64235;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=b6b12c38cf9204a65d29038435abb3eb5315375a;hpb=a64af461ae71473ef0624b32ae3d7e20017f2128;p=fa-stable.git

diff --git a/reporting/rep704.php b/reporting/rep704.php
index b6b12c38..e8063a82 100644
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -19,6 +19,7 @@ $page_security = 'SA_GLREP';
 $path_to_root="..";
 
 include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
@@ -111,7 +112,7 @@ function print_GL_transactions()
 
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
-	$rep->Header();
+	$rep->NewPage();
 
 	$accounts = get_gl_accounts($fromacc, $toacc);
 
@@ -121,7 +122,7 @@ function print_GL_transactions()
 			$begin = "";
 		else
 		{
-			$begin = begin_fiscalyear();
+			$begin = get_fiscalyear_begin_for_date($from);
 			if (date1_greater_date2($begin, $from))
 				$begin = $from;
 			$begin = add_days($begin, -1);
@@ -157,7 +158,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 +177,7 @@ function print_GL_transactions()
 				if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
 				{
 					$rep->Line($rep->row - 2);
-					$rep->Header();
+					$rep->NewPage();
 				}
 			}
 			$rep->NewLine();