X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=370ad954133b43c613c571c960e2154b452ee6e0;hb=da0f29ef8eb73e7a3cf6484af8fd04726e0e5ef1;hp=82c48c5af8b5f8774721e63da9eaeec0d04ad543;hpb=ba60807d6ca1ead4f5ce582e22b164c6ab945eac;p=fa-stable.git

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 82c48c5a..370ad954 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -29,23 +29,38 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 // trial_inquiry_controls();
 print_customer_balances();
 
-function get_open_balance($debtorno, $to)
+function get_open_balance($debtorno, $to, $convert)
 {
 	$to = date2sql($to);
 
     $sql = "SELECT SUM(IF(".TB_PREF."debtor_trans.type = 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) * rate, 0)) AS charges,
+    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)";
+    if ($convert)
+    	$sql .= " * rate";
+    $sql .= ", 0)) AS charges,
     	SUM(IF(".TB_PREF."debtor_trans.type <> 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) * rate * -1, 0)) AS credits,
-		SUM(".TB_PREF."debtor_trans.alloc * rate) AS Allocated,
+    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)";
+    if ($convert)
+    	$sql .= " * rate";
+    $sql .= " * -1, 0)) AS credits,
+		SUM(".TB_PREF."debtor_trans.alloc";
+	if ($convert)
+		$sql .= " * rate";
+	$sql .= ") AS Allocated,
 		SUM(IF(".TB_PREF."debtor_trans.type = 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc) * rate, 
+    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc)";
+    if ($convert)
+    	$sql .= " * rate";
+    $sql .= ", 
     	((".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-    	".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc) * rate)) AS OutStanding
+    	".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc)";
+    if ($convert)
+    	$sql .= " * rate";
+    $sql .= ")) AS OutStanding
 		FROM ".TB_PREF."debtor_trans
     	WHERE ".TB_PREF."debtor_trans.tran_date < '$to'
 		AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
-		AND ".TB_PREF."debtor_trans.type <> 13 GROUP BY '$debtorno'";
+		AND ".TB_PREF."debtor_trans.type <> 13 GROUP BY debtor_no";
 
     $result = db_query($sql,"No transactions were returned");
     return db_fetch($result);
@@ -138,7 +153,7 @@ function print_customer_balances()
 		if ($convert)
 			$rep->TextCol(2, 3,	$myrow['curr_code']);
 		$rep->fontSize -= 2;
-		$bal = get_open_balance($myrow['debtor_no'], $from);
+		$bal = get_open_balance($myrow['debtor_no'], $from, $convert);
 		$init[0] = $init[1] = 0.0;
 		$rep->TextCol(3, 4,	_("Open Balance"));
 		$init[0] = round2(abs($bal['charges']), $dec);