X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=d8ad7d6482609716822809baf196877370b5aefd;hb=8273b6b981c008c7968a7f7c8eaea640d453c3f2;hp=f8e04caa6873816f1ef9afb1d14f02aed68a05e9;hpb=a4db318fa0c84e099e0970ca82e36215782d661e;p=fa-stable.git

diff --git a/reporting/rep101.php b/reporting/rep101.php
index f8e04caa..d8ad7d64 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 
@@ -54,12 +54,15 @@ function print_customer_balances()
 {
     global $path_to_root;
 
-	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $to = $_POST['PARAM_0'];
     $fromcust = $_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");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	if ($fromcust == reserved_words::get_all_numeric())
 		$from = _('All');
@@ -87,7 +90,7 @@ function print_customer_balances()
     				    2 => array('text' => _('Customer'), 'from' => $from,   	'to' => ''),
     				    3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''));
 
-    $rep = new FrontReport(_('Customer Balances'), "CustomerBalances.pdf", user_pagesize());
+    $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -121,10 +124,9 @@ function print_customer_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'] == 10)
-				$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 = $trans['rate'];
@@ -135,15 +137,15 @@ function print_customer_balances()
 			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'] == 10)
 				$item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;
@@ -154,7 +156,7 @@ function print_customer_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 +167,7 @@ function print_customer_balances()
 		$rep->NewLine(2);
 		$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);
     	$rep->Line($rep->row  - 4);
     	$rep->NewLine(2);
 	}
@@ -173,8 +175,9 @@ function print_customer_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();
 }