X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=2d5eba8dcf0ce2efdf53ef2b556ef33caa6f9d31;hb=d25e06f889d2c81871fcb6edb42e53e2ea316601;hp=79cd401f1dbeab815384eb73017412762447e841;hpb=9b1b5c83a37376d2076334952db1d1f739a26d1c;p=fa-stable.git

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 79cd401f..2d5eba8d 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -27,32 +27,27 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 print_supplier_balances();
 
-function get_open_balance($supplier_id, $to, $convert)
+function get_open_balance($supplier_id, $to)
 {
-	$to = date2sql($to);
+    if ($to)
+        $to = date2sql($to);
+
+    $sql = "SELECT SUM(IF(t.type = ".ST_SUPPINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0),
+        -abs(t.ov_amount + t.ov_gst + t.ov_discount), 0)) AS charges,";
+
+    $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0),
+        abs(t.ov_amount + t.ov_gst + t.ov_discount) * -1, 0)) AS credits,";
 
-    $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.", (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
-    	".TB_PREF."supp_trans.ov_discount)";
-    if ($convert)
-    	$sql .= " * rate";
-    $sql .= ", 0)) AS charges,
-    	SUM(IF(".TB_PREF."supp_trans.type <> ".ST_SUPPINVOICE.", (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
-    	".TB_PREF."supp_trans.ov_discount)";
-    if ($convert)
-    	$sql .= "* rate";
-    $sql .= ", 0)) AS credits,
-		SUM(".TB_PREF."supp_trans.alloc";
-	if ($convert)
-		$sql .= " * rate";
-	$sql .= ") AS Allocated,
-		SUM((".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
-    	".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc)";
-    if ($convert)
-    	$sql .= " * rate";
-    $sql .= ") AS OutStanding
-		FROM ".TB_PREF."supp_trans
-    	WHERE ".TB_PREF."supp_trans.tran_date < '$to'
-		AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' GROUP BY supplier_id";
+    $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")), t.alloc * -1, t.alloc)) 
+        AS Allocated,";
+
+    $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE.", 1, -1) *
+        (abs(t.ov_amount + t.ov_gst + t.ov_discount) - abs(t.alloc))) AS OutStanding
+        FROM ".TB_PREF."supp_trans t
+        WHERE t.supplier_id = ".db_escape($supplier_id);
+    if ($to)
+        $sql .= " AND t.tran_date < '$to'";
+    $sql .= " GROUP BY supplier_id";
 
     $result = db_query($sql,"No transactions were returned");
     return db_fetch($result);
@@ -63,15 +58,14 @@ function getTransactions($supplier_id, $from, $to)
 	$from = date2sql($from);
 	$to = date2sql($to);
 
-    $sql = "SELECT ".TB_PREF."supp_trans.*,
-				(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)
-				AS TotalAmount, ".TB_PREF."supp_trans.alloc AS Allocated,
-				((".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.")
-					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'
-    				ORDER BY ".TB_PREF."supp_trans.tran_date";
+    $sql = "SELECT *,
+				(ov_amount + ov_gst + ov_discount) AS TotalAmount,
+				alloc AS Allocated,
+				((type = ".ST_SUPPINVOICE.") AND due_date < '$to') AS OverDue
+   			FROM ".TB_PREF."supp_trans
+   			WHERE tran_date >= '$from' AND tran_date <= '$to' 
+    			AND supplier_id = '$supplier_id' AND ov_amount!=0
+    				ORDER BY tran_date";
 
     $TransResult = db_query($sql,"No transactions were returned");
 
@@ -82,20 +76,23 @@ 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'];
-    	$no_zeros = $_POST['PARAM_4'];
-    	$comments = $_POST['PARAM_5'];
-	$destination = $_POST['PARAM_6'];
+	global $path_to_root, $systypes_array;
+
+	$from = $_POST['PARAM_0'];
+	$to = $_POST['PARAM_1'];
+	$fromsupp = $_POST['PARAM_2'];
+	$show_balance = $_POST['PARAM_3'];
+	$currency = $_POST['PARAM_4'];
+	$no_zeros = $_POST['PARAM_5'];
+	$comments = $_POST['PARAM_6'];
+	$orientation = $_POST['PARAM_7'];
+	$destination = $_POST['PARAM_8'];
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+	$orientation = ($orientation ? 'L' : 'P');
 	if ($fromsupp == ALL_TEXT)
 		$supp = _('All');
 	else
@@ -113,20 +110,24 @@ function print_supplier_balances()
 	if ($no_zeros) $nozeros = _('Yes');
 	else $nozeros = _('No');
 
-	$cols = array(0, 100, 130, 190,	250, 320, 385, 450,	515);
+	$cols = array(0, 95, 140, 200,	250, 320, 385, 450,	515);
 
 	$headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Charges'),
 		_('Credits'), _('Allocated'), _('Outstanding'));
 
+	if ($show_balance)
+		$headers[7] = _('Balance');
 	$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' => ''),
-			4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, '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);
@@ -145,18 +146,20 @@ function print_supplier_balances()
 	{
 		if (!$convert && $currency != $myrow['curr_code'])
 			continue;
-		$bal = get_open_balance($myrow['supplier_id'], $from, $convert);
+		$accumulate = 0;
+		$rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
+		$bal = get_open_balance($myrow['supplier_id'], $from);
 		$init[0] = $init[1] = 0.0;
-		$init[0] = round2(abs($bal['charges']), $dec);
-		$init[1] = round2(Abs($bal['credits']), $dec);
-		$init[2] = round2($bal['Allocated'], $dec);
-		$init[3] = round2($bal['OutStanding'], $dec);;
-		$total = array(0,0,0,0);
-		for ($i = 0; $i < 4; $i++)
+		$init[0] = round2(abs($bal['charges']*$rate), $dec);
+		$init[1] = round2(Abs($bal['credits']*$rate), $dec);
+		$init[2] = round2($bal['Allocated']*$rate, $dec);
+		if ($show_balance)
 		{
-			$total[$i] += $init[$i];
-			$grandtotal[$i] += $init[$i];
-		}
+			$init[3] = $init[0] - $init[1];
+			$accumulate += $init[3];
+		}	
+		else	
+			$init[3] = round2($bal['OutStanding']*$rate, $dec);
 		$res = getTransactions($myrow['supplier_id'], $from, $to);
 		if ($no_zeros && db_num_rows($res) == 0) continue;
 
@@ -169,13 +172,21 @@ function print_supplier_balances()
 		$rep->AmountCol(5, 6, $init[1], $dec);
 		$rep->AmountCol(6, 7, $init[2], $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);
-		if (db_num_rows($res)==0) continue;
-
 		$rep->Line($rep->row + 4);
+		if (db_num_rows($res)==0) {
+			$rep->NewLine(1, 2);
+			continue;
+		}	
 		while ($trans=db_fetch($res))
 		{
-			if ($no_zeros && $trans['TotalAmount'] == 0 && $trans['Allocated'] == 0) continue;
+			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']);
@@ -183,38 +194,36 @@ function print_supplier_balances()
 			if ($trans['type'] == ST_SUPPINVOICE)
 				$rep->DateCol(3, 4,	$trans['due_date'], true);
 			$item[0] = $item[1] = 0.0;
-			if ($convert)
-				$rate = $trans['rate'];
-			else
-				$rate = 1.0;
 			if ($trans['TotalAmount'] > 0.0)
 			{
 				$item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);
 				$rep->AmountCol(4, 5, $item[0], $dec);
+				$accumulate += $item[0];
+				$item[2] = round2($trans['Allocated'] * $rate, $dec);
 			}
 			else
 			{
 				$item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec);
 				$rep->AmountCol(5, 6, $item[1], $dec);
+				$accumulate -= $item[1];
+				$item[2] = round2($trans['Allocated'] * $rate, $dec) * -1;
 			}
-			$item[2] = round2($trans['Allocated'] * $rate, $dec);
 			$rep->AmountCol(6, 7, $item[2], $dec);
-			/*
-			if ($trans['type'] == 20)
-				$item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;
-			else
-				$item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;
-			*/	
-			if ($trans['type'] == ST_SUPPINVOICE || $trans['type'] == ST_BANKDEPOSIT)
-				$item[3] = $item[0] + $item[1] - $item[2];
+			if ($trans['TotalAmount'] > 0.0)
+				$item[3] = $item[0] - $item[2];
+			else	
+				$item[3] = -$item[1] - $item[2];
+			if ($show_balance)	
+				$rep->AmountCol(7, 8, $accumulate, $dec);
 			else	
-				$item[3] = $item[0] - $item[1] + $item[2];
-			$rep->AmountCol(7, 8, $item[3], $dec);
+				$rep->AmountCol(7, 8, $item[3], $dec);
 			for ($i = 0; $i < 4; $i++)
 			{
 				$total[$i] += $item[$i];
 				$grandtotal[$i] += $item[$i];
 			}
+			if ($show_balance)
+				$total[3] = $total[0] - $total[1];
 		}
 		$rep->Line($rep->row - 8);
 		$rep->NewLine(2);
@@ -230,6 +239,8 @@ function print_supplier_balances()
 	$rep->fontSize += 2;
 	$rep->TextCol(0, 3,	_('Grand Total'));
 	$rep->fontSize -= 2;
+	if ($show_balance)
+		$grandtotal[3] = $grandtotal[0] - $grandtotal[1];
 	for ($i = 0; $i < 4; $i++)
 		$rep->AmountCol($i + 4, $i + 5,$grandtotal[$i], $dec);
 	$rep->Line($rep->row  - 4);
@@ -237,4 +248,3 @@ function print_supplier_balances()
     $rep->End();
 }
 
-?>