X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep203.php;h=d69bf519dcb8024f66ae1bf9d4b8017ab03d864c;hb=032543e8bebfaf5ed19f8a8bad793893af497862;hp=3434996764ce483660aa9084321e6d870323304a;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 34349967..d69bf519 100644
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -22,20 +22,22 @@ print_payment_report();
 function getTransactions($supplier, $date)
 {
 	$date = date2sql($date);
-	
+
 	$sql = "SELECT ".TB_PREF."sys_types.type_name,
 			".TB_PREF."supp_trans.supp_reference,
+			".TB_PREF."supp_trans.tran_date,
 			".TB_PREF."supp_trans.due_date,
 			".TB_PREF."supp_trans.trans_no,
 			".TB_PREF."supp_trans.type,
-			(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst - ".TB_PREF."supp_trans.alloc) AS Balance,
-			(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst ) AS TranTotal
+			".TB_PREF."supp_trans.rate,
+			(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance,
+			(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal
 		FROM ".TB_PREF."supp_trans,
 			".TB_PREF."sys_types
 		WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type
 		AND ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
-		AND ".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst - ".TB_PREF."supp_trans.alloc != 0
-		AND ".TB_PREF."supp_trans.due_date <='" . $date . "'
+		AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0
+		AND ".TB_PREF."supp_trans.tran_date <='" . $date . "'
 		ORDER BY ".TB_PREF."supp_trans.type,
 			".TB_PREF."supp_trans.trans_no";
 
@@ -59,7 +61,7 @@ function print_payment_report()
 		$from = _('All');
 	else
 		$from = get_supplier_name($fromsupp);
-	    
+
     $dec = user_price_dec();
 
 	if ($currency == reserved_words::get_all())
@@ -89,43 +91,50 @@ function print_payment_report()
     $rep->Header();
 
 	$total = array();
-	$grandtotal = array();
+	$grandtotal = array(0,0);
 
 	$sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms
 		WHERE ";
 	if ($fromsupp != reserved_words::get_all_numeric())
 		$sql .= "supplier_id=$fromsupp AND ";
-	$sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator 
+	$sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
 		ORDER BY supp_name";
 	$result = db_query($sql, "The customers could not be retrieved");
-	
-	while ($myrow=db_fetch($result)) 
+
+	while ($myrow=db_fetch($result))
 	{
 		if (!$convert && $currency != $myrow['curr_code'])
 			continue;
 		$rep->fontSize += 2;
 		$rep->TextCol(0, 6, $myrow['name'] . " - " . $myrow['terms']);
 		if ($convert)
-		{
-			$rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to);
 			$rep->TextCol(6, 7,	$myrow['curr_code']);
-		}
-		else
-			$rate = 1.0;
 		$rep->fontSize -= 2;
 		$rep->NewLine(1, 2);
 		$res = getTransactions($myrow['supplier_id'], $to);
 		if (db_num_rows($res)==0)
 			continue;
 		$rep->Line($rep->row + 4);
-		$total[0] = $total[1] = $total[2] = $total[3] = 0.0; 
+		$total[0] = $total[1] = 0.0;
 		while ($trans=db_fetch($res))
 		{
+			if ($convert)
+				$rate = $trans['rate'];
+			else
+				$rate = 1.0;
 			$rep->NewLine(1, 2);
 			$rep->TextCol(0, 1,	$trans['type_name']);
 			$rep->TextCol(1, 2,	$trans['supp_reference']);
-			$rep->TextCol(2, 3,	sql2date($trans['due_date']));
-			$item[0] = Abs($trans['TranTotal']) * $rate; 		
+			if ($trans['type'] == 20)
+				$rep->TextCol(2, 3,	sql2date($trans['due_date']));
+			else	
+				$rep->TextCol(2, 3,	sql2date($trans['tran_date']));
+			if ($trans['type'] != 20)
+			{
+				$trans['TranTotal'] = -$trans['TranTotal'];
+				$trans['Balance'] = -$trans['Balance'];
+			}
+			$item[0] = $trans['TranTotal'] * $rate;
 			$rep->TextCol(6, 7,	number_format2($item[0], $dec));
 			$item[1] = $trans['Balance'] * $rate;
 			$rep->TextCol(7, 8,	number_format2($item[1], $dec));
@@ -133,7 +142,7 @@ function print_payment_report()
 			{
 				$total[$i] += $item[$i];
 				$grandtotal[$i] += $item[$i];
-			}	
+			}
 		}
 		$rep->Line($rep->row - 8);
 		$rep->NewLine(2);
@@ -142,7 +151,7 @@ function print_payment_report()
 		{
 			$rep->TextCol($i + 6, $i + 7, number_format2($total[$i], $dec));
 			$total[$i] = 0.0;
-		}	
+		}
     	$rep->Line($rep->row  - 4);
     	$rep->NewLine(2);
 	}