X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=88db421d46639433a7f4747c08b6d6026ed9e461;hb=0ce53780d575e7bf4eefaa1b7edc0603131cc2b3;hp=829cc0dad07097060b3014c916b678a727f8d8a1;hpb=68bf09b0ddf5bbe3a0155d288f4d0334104a9538;p=fa-stable.git

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 829cc0da..88db421d 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -1,6 +1,6 @@
 <?php
 /**********************************************************************
-    Copyright (C) FrontAccounting, LLC.
+    Copyright (C) FrontAccounting Team.
 	Released under the terms of the GNU General Public License, GPL, 
 	as published by the Free Software Foundation, either version 3 
 	of the License, or (at your option) any later version.
@@ -13,8 +13,8 @@ $page_security = 'SA_SUPPLIERANALYTIC';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
-// date_:	2005-05-19
-// Title:	Supplier Balances
+// date_:	2018-12-21
+// Title:	Supplier Trial Balances
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -29,17 +29,25 @@ print_supplier_balances();
 
 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 .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")), t.alloc * -1, t.alloc)) 
+        AS Allocated,";
 
-    $sql = "SELECT
-    	SUM(IF(type IN(".ST_SUPPINVOICE.",".ST_BANKDEPOSIT."), (ov_amount + ov_gst + ov_discount), 0)) AS charges,
-    	SUM(IF(type NOT IN(".ST_SUPPINVOICE.",".ST_BANKDEPOSIT."), (ov_amount + ov_gst + ov_discount), 0)) AS credits,
-		SUM(alloc) AS Allocated,
-		SUM(IF(type IN(".ST_SUPPINVOICE.",".ST_BANKDEPOSIT."), (ov_amount + ov_gst + ov_discount - alloc),
-				(ov_amount + ov_gst + ov_discount + alloc))) AS OutStanding
-		FROM ".TB_PREF."supp_trans
-    	WHERE tran_date < '$to'
-		AND supplier_id = '$supplier_id' GROUP BY supplier_id";
+    $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);
@@ -141,7 +149,11 @@ function print_supplier_balances()
 		$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 = array();
+		$bal['charges'] = isset($bal['charges']) ? $bal['charges'] : 0;
+		$bal['credits'] = isset($bal['credits']) ? $bal['credits'] : 0;
+		$bal['Allocated'] = isset($bal['Allocated']) ? $bal['Allocated'] : 0;
+		$bal['OutStanding'] = isset($bal['OutStanding']) ? $bal['OutStanding'] : 0;
 		$init[0] = round2(abs($bal['charges']*$rate), $dec);
 		$init[1] = round2(Abs($bal['credits']*$rate), $dec);
 		$init[2] = round2($bal['Allocated']*$rate, $dec);
@@ -191,19 +203,20 @@ function print_supplier_balances()
 				$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['TotalAmount'] > 0.0)
 				$item[3] = $item[0] - $item[2];
 			else	
-				$item[3] = ($item[1] - $item[2]) * -1;
+				$item[3] = -$item[1] - $item[2];
 			if ($show_balance)	
 				$rep->AmountCol(7, 8, $accumulate, $dec);
 			else