X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep203.php;h=e6f00ce8c5b46ec372be7e9ac2797e75a21593d0;hb=8638cffdf5eb106d2c9a6f8ee68b9f91427ace2f;hp=27eef02b5dd538a10c2975d8f47bdf98dbe7b6e0;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 27eef02b..e6f00ce8 100644
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -30,6 +30,7 @@ print_payment_report();
 function getTransactions($supplier, $date)
 {
 	$date = date2sql($date);
+	$dec = user_price_dec();
 
 	$sql = "SELECT ".TB_PREF."supp_trans.supp_reference,
 			".TB_PREF."supp_trans.tran_date,
@@ -41,7 +42,8 @@ function getTransactions($supplier, $date)
 			(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal
 		FROM ".TB_PREF."supp_trans
 		WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
-		AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0
+		AND ROUND(ABS(".TB_PREF."supp_trans.ov_amount),$dec) + ROUND(ABS(".TB_PREF."supp_trans.ov_gst),$dec) - 
+		ROUND(".TB_PREF."supp_trans.alloc,$dec) != 0
 		AND ".TB_PREF."supp_trans.tran_date <='" . $date . "'
 		ORDER BY ".TB_PREF."supp_trans.type,
 			".TB_PREF."supp_trans.trans_no";
@@ -53,13 +55,14 @@ 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'];
+	$destination = $_POST['PARAM_5'];
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
@@ -70,7 +73,7 @@ function print_payment_report()
 	else
 		$from = get_supplier_name($fromsupp);
 
-    $dec = user_price_dec();
+    	$dec = user_price_dec();
 
 	if ($currency == ALL_TEXT)
 	{
@@ -80,6 +83,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'), '', '',
@@ -88,15 +94,16 @@ 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->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$total = array();
 	$grandtotal = array(0,0);
@@ -111,25 +118,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']);
@@ -173,4 +183,4 @@ function print_payment_report()
     $rep->End();
 }
 
-?>
\ No newline at end of file
+?>