X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep201.php;h=ba247392fe476ea699031984e7c0630c909f8f43;hb=f50187b9c3095886d7fd847f635cd8763109a75e;hp=775f04af560e0d122a6f6f6ae528007fa804fa84;hpb=122e0764c9706034e901f31a4d02a9e56251c813;p=fa-stable.git

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 775f04af..ba247392 100644
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -53,12 +53,21 @@ function print_supplier_balances()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
     $currency = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
+	$destination = $_POST['PARAM_4'];
+	if ($destination)
+	{
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+		$filename = "SupplierBalances.xml";
+	}	
+	else
+	{
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+		$filename = "SupplierBalances.pdf";
+	}
 
 	if ($fromsupp == reserved_words::get_all_numeric())
 		$from = _('All');
@@ -86,7 +95,7 @@ function print_supplier_balances()
     				    2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
     				    3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
 
-    $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances.pdf", user_pagesize());
+    $rep = new FrontReport(_('Supplier Balances'), $filename, user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -121,28 +130,26 @@ function print_supplier_balances()
 			$rep->NewLine(1, 2);
 			$rep->TextCol(0, 1,	$trans['type_name']);
 			$rep->TextCol(1, 2,	$trans['reference']);
-			$date = sql2date($trans['tran_date']);
-			$rep->TextCol(2, 3,	$date);
+			$rep->DateCol(2, 3,	$trans['tran_date'], true);
 			if ($trans['type'] == 20)
-				$rep->TextCol(3, 4,	sql2date($trans['due_date']));
+				$rep->DateCol(3, 4,	$trans['due_date'], true);
 			$item[0] = $item[1] = 0.0;
 			if ($convert)
-				//$rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $date);
 				$rate = $trans['rate'];
 			else
 				$rate = 1.0;
 			if ($trans['TotalAmount'] > 0.0)
 			{
 				$item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);
-				$rep->TextCol(4, 5,	number_format2($item[0], $dec));
+				$rep->AmountCol(4, 5, $item[0], $dec);
 			}
 			else
 			{
 				$item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec);
-				$rep->TextCol(5, 6,	number_format2($item[1], $dec));
+				$rep->AmountCol(5, 6, $item[1], $dec);
 			}
 			$item[2] = round2($trans['Allocated'] * $rate, $dec);
-			$rep->TextCol(6, 7,	number_format2($item[2], $dec));
+			$rep->AmountCol(6, 7, $item[2], $dec);
 			/*
 			if ($trans['type'] == 20)
 				$item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;
@@ -153,7 +160,7 @@ function print_supplier_balances()
 				$item[3] = $item[0] + $item[1] - $item[2];
 			else	
 				$item[3] = $item[0] - $item[1] + $item[2];
-			$rep->TextCol(7, 8,	number_format2($item[3], $dec));
+			$rep->AmountCol(7, 8, $item[3], $dec);
 			for ($i = 0; $i < 4; $i++)
 			{
 				$total[$i] += $item[$i];
@@ -165,7 +172,7 @@ function print_supplier_balances()
 		$rep->TextCol(0, 3,	_('Total'));
 		for ($i = 0; $i < 4; $i++)
 		{
-			$rep->TextCol($i + 4, $i + 5, number_format2($total[$i], $dec));
+			$rep->AmountCol($i + 4, $i + 5, $total[$i], $dec);
 			$total[$i] = 0.0;
 		}
     	$rep->Line($rep->row  - 4);
@@ -175,8 +182,9 @@ function print_supplier_balances()
 	$rep->TextCol(0, 3,	_('Grand Total'));
 	$rep->fontSize -= 2;
 	for ($i = 0; $i < 4; $i++)
-		$rep->TextCol($i + 4, $i + 5,number_format2($grandtotal[$i], $dec));
+		$rep->AmountCol($i + 4, $i + 5,$grandtotal[$i], $dec);
 	$rep->Line($rep->row  - 4);
+	$rep->NewLine();
     $rep->End();
 }