From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 11 May 2017 11:35:19 +0000 (+0200)
Subject: Customer/Supplier Balances Report | Allocated column not showing correctly. Fixed.
X-Git-Tag: 2.3-final~6
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=534dffa74be8e7580cb8f090771d31520a60916b

Customer/Supplier Balances Report | Allocated column not showing correctly. Fixed.
---

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 3584a025..4c6c0f49 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -39,7 +39,7 @@ function get_open_balance($debtorno, $to)
     	(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,
     	SUM(IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",
 	    	(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,
-		SUM(t.alloc) AS Allocated,
+		SUM(IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",t.alloc * -1, t.alloc)) AS Allocated,
 		SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
 			(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc),
 	    	((t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1 + t.alloc))) AS OutStanding
@@ -59,18 +59,16 @@ function get_transactions($debtorno, $from, $to)
 	$from = date2sql($from);
 	$to = date2sql($to);
 
-    $sql = "SELECT ".TB_PREF."debtor_trans.*,
-		(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-		".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
-		AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
-		((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
-		AND ".TB_PREF."debtor_trans.due_date < '$to') AS OverDue
-    	FROM ".TB_PREF."debtor_trans
-    	WHERE ".TB_PREF."debtor_trans.tran_date >= '$from'
-		AND ".TB_PREF."debtor_trans.tran_date <= '$to'
-		AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
-		AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
-    	ORDER BY ".TB_PREF."debtor_trans.tran_date";
+    $sql = "SELECT *,
+		(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) AS TotalAmount, 
+		IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",t.alloc * -1, t.alloc) AS Allocated,
+		((t.type = ".ST_SALESINVOICE.")	AND t.due_date < '$to') AS OverDue
+    	FROM ".TB_PREF."debtor_trans t
+    	WHERE t.tran_date >= '$from'
+		AND t.tran_date <= '$to'
+		AND t.debtor_no = ".db_escape($debtorno)."
+		AND t.type <> ".ST_CUSTDELIVERY."
+    	ORDER BY t.tran_date";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -214,9 +212,9 @@ function print_customer_balances()
 			$item[2] = round2($trans['Allocated'] * $rate, $dec);
 			$rep->AmountCol(6, 7, $item[2], $dec);
 			if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT)
-				$item[3] = $item[0] + $item[1] - $item[2];
+				$item[3] = $item[0] - $item[2];
 			else	
-				$item[3] = $item[0] - $item[1] + $item[2];
+				$item[3] = -$item[1] - $item[2];
 			if ($show_balance)	
 				$rep->AmountCol(7, 8, $accumulate, $dec);
 			else	
diff --git a/reporting/rep201.php b/reporting/rep201.php
index 3a1288ac..0e7f15b4 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -31,17 +31,17 @@ function get_open_balance($supplier_id, $to)
 {
 	$to = date2sql($to);
 
-    $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type = ".ST_BANKDEPOSIT.", 
-    	(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount), 0)) AS charges,
-    	SUM(IF(".TB_PREF."supp_trans.type <> ".ST_SUPPINVOICE." AND ".TB_PREF."supp_trans.type <> ".ST_BANKDEPOSIT.", 
-    	(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount), 0)) AS credits,
-		SUM(".TB_PREF."supp_trans.alloc) AS Allocated,
-		SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type = ".ST_BANKDEPOSIT.",
-		(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc),
-		(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount + ".TB_PREF."supp_trans.alloc))) 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 = "SELECT SUM(IF(t.type = ".ST_SUPPINVOICE." OR t.type = ".ST_BANKDEPOSIT.", 
+    	(t.ov_amount + t.ov_gst + t.ov_discount), 0)) AS charges,
+    	SUM(IF(t.type <> ".ST_SUPPINVOICE." AND t.type <> ".ST_BANKDEPOSIT.", 
+    	(t.ov_amount + t.ov_gst + t.ov_discount), 0)) AS credits,
+		SUM(IF(t.type <> ".ST_SUPPINVOICE." AND t.type <> ".ST_BANKDEPOSIT.", t.alloc * -1, t.alloc)) AS Allocated,
+		SUM(IF(t.type = ".ST_SUPPINVOICE." OR t.type = ".ST_BANKDEPOSIT.",
+		(t.ov_amount + t.ov_gst + t.ov_discount - t.alloc),
+		(t.ov_amount + t.ov_gst + t.ov_discount + t.alloc))) AS OutStanding
+		FROM ".TB_PREF."supp_trans t
+    	WHERE t.tran_date < '$to'
+		AND t.supplier_id = '$supplier_id' GROUP BY supplier_id";
 
     $result = db_query($sql,"No transactions were returned");
     return db_fetch($result);
@@ -52,15 +52,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' AND ".TB_PREF."supp_trans.ov_amount!=0
-    				ORDER BY ".TB_PREF."supp_trans.tran_date";
+    $sql = "SELECT *,
+				(t.ov_amount + t.ov_gst + t.ov_discount)
+				AS TotalAmount, IF(t.type <> ".ST_SUPPINVOICE." AND t.type <> ".ST_BANKDEPOSIT.", t.alloc * -1, t.alloc) AS Allocated,
+				((t.type = ".ST_SUPPINVOICE.") AND t.due_date < '$to') AS OverDue
+    			FROM ".TB_PREF."supp_trans t
+    			WHERE t.tran_date >= '$from' AND t.tran_date <= '$to' 
+    			AND t.supplier_id = '$supplier_id' AND t.ov_amount <> 0
+    				ORDER BY t.tran_date";
 
     $TransResult = db_query($sql,"No transactions were returned");
 
@@ -206,7 +205,8 @@ function print_supplier_balances()
 			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]) * -1;
+				$item[3] = -$item[1] - $item[2];
 			if ($show_balance)	
 				$rep->AmountCol(7, 8, $accumulate, $dec);
 			else