X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=756e83c64ab696fdd9d9bcc9c610c3bb75bc6313;hb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;hp=9ff6a0c67cb9df122e10a23ab7018020cd7ffffc;hpb=ba60807d6ca1ead4f5ce582e22b164c6ab945eac;p=fa-stable.git

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 9ff6a0c6..756e83c6 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -27,17 +27,29 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 print_supplier_balances();
 
-function get_open_balance($supplier_id, $to)
+function get_open_balance($supplier_id, $to, $convert)
 {
 	$to = date2sql($to);
 
     $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = 20, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
-    	".TB_PREF."supp_trans.ov_discount) * rate, 0)) AS charges,
+    	".TB_PREF."supp_trans.ov_discount)";
+    if ($convert)
+    	$sql .= " * rate";
+    $sql .= ", 0)) AS charges,
     	SUM(IF(".TB_PREF."supp_trans.type <> 20, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + 
-    	".TB_PREF."supp_trans.ov_discount) * rate, 0)) AS credits,
-		SUM(".TB_PREF."supp_trans.alloc * rate) AS Allocated,
+    	".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) * rate) AS OutStanding
+    	".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";
@@ -51,15 +63,14 @@ function getTransactions($supplier_id, $from, $to)
 	$from = date2sql($from);
 	$to = date2sql($to);
 
-    $sql = "SELECT ".TB_PREF."supp_trans.*, ".TB_PREF."sys_types.type_name,
+    $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 = 20)
 					AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue
-    			FROM ".TB_PREF."supp_trans, ".TB_PREF."sys_types
+    			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.type = ".TB_PREF."sys_types.type_id
     				ORDER BY ".TB_PREF."supp_trans.tran_date";
 
     $TransResult = db_query($sql,"No transactions were returned");
@@ -134,7 +145,7 @@ function print_supplier_balances()
 		if ($convert)
 			$rep->TextCol(2, 3,	$myrow['curr_code']);
 		$rep->fontSize -= 2;
-		$bal = get_open_balance($myrow['supplier_id'], $from);
+		$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);
@@ -159,7 +170,7 @@ function print_supplier_balances()
 		while ($trans=db_fetch($res))
 		{
 			$rep->NewLine(1, 2);
-			$rep->TextCol(0, 1,	$trans['type_name']);
+			$rep->TextCol(0, 1,	systypes::name($trans['type']));
 			$rep->TextCol(1, 2,	$trans['reference']);
 			$rep->DateCol(2, 3,	$trans['tran_date'], true);
 			if ($trans['type'] == 20)
@@ -187,7 +198,7 @@ function print_supplier_balances()
 			else
 				$item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;
 			*/	
-			if ($trans['type'] == 20)
+			if ($trans['type'] == 20 || $trans['type'] == 2)
 				$item[3] = $item[0] + $item[1] - $item[2];
 			else	
 				$item[3] = $item[0] - $item[1] + $item[2];