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

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 829cc0da..0af00348 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -34,7 +34,7 @@ function get_open_balance($supplier_id, $to)
     $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 NOT IN(".ST_SUPPINVOICE.",".ST_BANKDEPOSIT."),alloc * -1, 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
@@ -191,19 +191,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