X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=895c3a5c5ea4361256d5f997165a6eebccc3de09;hb=6725b79409892d6f03be0d6e8888a42b9c730d0c;hp=532da5fceeb789a3685bd248157feb96188ccf34;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 532da5fc..895c3a5c 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -70,7 +70,7 @@ function getTransactions($supplier_id, $from, $to)
 					AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue
     			FROM ".TB_PREF."supp_trans
     			WHERE ".TB_PREF."supp_trans.tran_date >= '$from' AND ".TB_PREF."supp_trans.tran_date <= '$to' 
-    			AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id'
+    			AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' AND ".TB_PREF."supp_trans.ov_amount!=0
     				ORDER BY ".TB_PREF."supp_trans.tran_date";
 
     $TransResult = db_query($sql,"No transactions were returned");
@@ -82,24 +82,27 @@ function getTransactions($supplier_id, $from, $to)
 
 function print_supplier_balances()
 {
-    global $path_to_root, $systypes_array;
-
-    $from = $_POST['PARAM_0'];
-    $to = $_POST['PARAM_1'];
-    $fromsupp = $_POST['PARAM_2'];
-    $currency = $_POST['PARAM_3'];
-    $comments = $_POST['PARAM_4'];
-	$destination = $_POST['PARAM_5'];
+    	global $path_to_root, $systypes_array;
+
+    	$from = $_POST['PARAM_0'];
+    	$to = $_POST['PARAM_1'];
+    	$fromsupp = $_POST['PARAM_2'];
+    	$currency = $_POST['PARAM_3'];
+    	$no_zeros = $_POST['PARAM_4'];
+    	$comments = $_POST['PARAM_5'];
+	$orientation = $_POST['PARAM_6'];
+	$destination = $_POST['PARAM_7'];
 	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)
 		$supp = _('All');
 	else
 		$supp = get_supplier_name($fromsupp);
-    $dec = user_price_dec();
+    	$dec = user_price_dec();
 
 	if ($currency == ALL_TEXT)
 	{
@@ -109,6 +112,9 @@ function print_supplier_balances()
 	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'), _('#'), _('Date'), _('Due Date'), _('Charges'),
@@ -117,21 +123,24 @@ function print_supplier_balances()
 	$aligns = array('left',	'left',	'left',	'left',	'right', 'right', 'right', 'right');
 
     $params =   array( 	0 => $comments,
-    				    1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
-    				    2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''),
-    				    3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
+    			1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
+    			2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''),
+    			3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''),
+			4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
-    $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize());
+    $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", 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,0,0);
 
 	$sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers";
-	if ($fromsupp != ALL_NUMERIC)
+	if ($fromsupp != ALL_TEXT)
 		$sql .= " WHERE supplier_id=".db_escape($fromsupp);
 	$sql .= " ORDER BY supp_name";
 	$result = db_query($sql, "The customers could not be retrieved");
@@ -140,35 +149,37 @@ function print_supplier_balances()
 	{
 		if (!$convert && $currency != $myrow['curr_code'])
 			continue;
-		$rep->fontSize += 2;
-		$rep->TextCol(0, 2, $myrow['name']);
-		if ($convert)
-			$rep->TextCol(2, 3,	$myrow['curr_code']);
-		$rep->fontSize -= 2;
 		$bal = get_open_balance($myrow['supplier_id'], $from, $convert);
 		$init[0] = $init[1] = 0.0;
-		$rep->TextCol(3, 4,	_("Open Balance"));
 		$init[0] = round2(abs($bal['charges']), $dec);
-		$rep->AmountCol(4, 5, $init[0], $dec);
 		$init[1] = round2(Abs($bal['credits']), $dec);
-		$rep->AmountCol(5, 6, $init[1], $dec);
 		$init[2] = round2($bal['Allocated'], $dec);
-		$rep->AmountCol(6, 7, $init[2], $dec);
 		$init[3] = round2($bal['OutStanding'], $dec);;
-		$rep->AmountCol(7, 8, $init[3], $dec);
 		$total = array(0,0,0,0);
 		for ($i = 0; $i < 4; $i++)
 		{
 			$total[$i] += $init[$i];
 			$grandtotal[$i] += $init[$i];
 		}
-		$rep->NewLine(1, 2);
 		$res = getTransactions($myrow['supplier_id'], $from, $to);
-		if (db_num_rows($res)==0)
-			continue;
+		if ($no_zeros && db_num_rows($res) == 0) continue;
+
+		$rep->fontSize += 2;
+		$rep->TextCol(0, 2, $myrow['name']);
+		if ($convert) $rep->TextCol(2, 3,	$myrow['curr_code']);
+		$rep->fontSize -= 2;
+		$rep->TextCol(3, 4,	_("Open Balance"));
+		$rep->AmountCol(4, 5, $init[0], $dec);
+		$rep->AmountCol(5, 6, $init[1], $dec);
+		$rep->AmountCol(6, 7, $init[2], $dec);
+		$rep->AmountCol(7, 8, $init[3], $dec);
+		$rep->NewLine(1, 2);
+		if (db_num_rows($res)==0) continue;
+
 		$rep->Line($rep->row + 4);
 		while ($trans=db_fetch($res))
 		{
+			if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;
 			$rep->NewLine(1, 2);
 			$rep->TextCol(0, 1, $systypes_array[$trans['type']]);
 			$rep->TextCol(1, 2,	$trans['reference']);
@@ -230,4 +241,4 @@ function print_supplier_balances()
     $rep->End();
 }
 
-?>
\ No newline at end of file
+?>