X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep203.php;h=c1784e51cf6af19d0a05ab0aa3773b3670b45614;hb=6a4d8e6c1e92ff1b8fc5abb3fae76fb1c1968550;hp=7c9072746b1392e46cba2b8dd9aecd22504561f5;hpb=8438a027a31b2625f21db52a3cbff254b739a221;p=fa-stable.git

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 7c907274..c1784e51 100644
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -55,24 +55,27 @@ function getTransactions($supplier, $date)
 
 function print_payment_report()
 {
-    global $path_to_root, $systypes_array;
-
-    $to = $_POST['PARAM_0'];
-    $fromsupp = $_POST['PARAM_1'];
-    $currency = $_POST['PARAM_2'];
-    $comments = $_POST['PARAM_3'];
-	$destination = $_POST['PARAM_4'];
+    	global $path_to_root, $systypes_array;
+
+    	$to = $_POST['PARAM_0'];
+    	$fromsupp = $_POST['PARAM_1'];
+    	$currency = $_POST['PARAM_2'];
+    	$no_zeros = $_POST['PARAM_3'];
+    	$comments = $_POST['PARAM_4'];
+	$orientation = $_POST['PARAM_5'];
+	$destination = $_POST['PARAM_6'];
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-	if ($fromsupp == ALL_NUMERIC)
+	$orientation = ($orientation ? 'L' : 'P');
+	if ($fromsupp == ALL_TEXT)
 		$from = _('All');
 	else
 		$from = get_supplier_name($fromsupp);
 
-    $dec = user_price_dec();
+    	$dec = user_price_dec();
 
 	if ($currency == ALL_TEXT)
 	{
@@ -82,6 +85,9 @@ function print_payment_report()
 	else
 		$convert = false;
 
+	if ($no_zeros) $nozeros = _('Yes');
+	else $nozeros = _('No');
+
 	$cols = array(0, 100, 130, 190,	250, 320, 385, 450,	515);
 
 	$headers = array(_('Trans Type'), _('#'), _('Due Date'), '', '',
@@ -90,22 +96,25 @@ function print_payment_report()
 	$aligns = array('left',	'left',	'left',	'left',	'right', 'right', 'right', 'right');
 
     $params =   array( 	0 => $comments,
-    				    1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
-    				    2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
-    				    3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
+    			1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
+    			2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
+    			3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''),
+			4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
-    $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize());
+    $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$total = array();
 	$grandtotal = array(0,0);
 
 	$sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms
 		WHERE ";
-	if ($fromsupp != ALL_NUMERIC)
+	if ($fromsupp != ALL_TEXT)
 		$sql .= "supplier_id=".db_escape($fromsupp)." AND ";
 	$sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
 		ORDER BY supp_name";
@@ -113,25 +122,28 @@ function print_payment_report()
 
 	while ($myrow=db_fetch($result))
 	{
-		if (!$convert && $currency != $myrow['curr_code'])
-			continue;
+		if (!$convert && $currency != $myrow['curr_code']) continue;
+
+		$res = getTransactions($myrow['supplier_id'], $to);
+		if ($no_zeros && db_num_rows($res)==0) continue;
+
 		$rep->fontSize += 2;
 		$rep->TextCol(0, 6, $myrow['name'] . " - " . $myrow['terms']);
 		if ($convert)
 			$rep->TextCol(6, 7,	$myrow['curr_code']);
 		$rep->fontSize -= 2;
 		$rep->NewLine(1, 2);
-		$res = getTransactions($myrow['supplier_id'], $to);
 		if (db_num_rows($res)==0)
 			continue;
 		$rep->Line($rep->row + 4);
 		$total[0] = $total[1] = 0.0;
 		while ($trans=db_fetch($res))
 		{
-			if ($convert)
-				$rate = $trans['rate'];
-			else
-				$rate = 1.0;
+			if ($no_zeros && $trans['TranTotal'] == 0 && $trans['Balance'] == 0) continue;
+
+			if ($convert) $rate = $trans['rate'];
+			else $rate = 1.0;
+
 			$rep->NewLine(1, 2);
 			$rep->TextCol(0, 1, $systypes_array[$trans['type']]);
 			$rep->TextCol(1, 2,	$trans['supp_reference']);
@@ -175,4 +187,4 @@ function print_payment_report()
     $rep->End();
 }
 
-?>
\ No newline at end of file
+?>