X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep102.php;h=a2f938c0a8413e80b91b3c99f648f084ed9896f4;hb=b37623cf1de2cfce6825744557d76475f002321f;hp=620d50117f63dff9d6ac7516aad90d7aa427700a;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep102.php b/reporting/rep102.php
index 620d5011..a2f938c0 100644
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -1,15 +1,15 @@
 <?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;
+$page_security = 'SA_CUSTPAYMREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -25,10 +25,9 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_aged_customer_analysis();
 
-function get_invoices($costomer_id, $to)
+function get_invoices($customer_id, $to)
 {
 	$todate = date2sql($to);
 	$PastDueDays1 = get_company_pref('past_due_days');
@@ -38,8 +37,8 @@ function get_invoices($costomer_id, $to)
     $value = "(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
 		.TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + "
 		.TB_PREF."debtor_trans.ov_discount)";
-	$due = "IF (".TB_PREF."debtor_trans.type=10,".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)";
-	$sql = "SELECT ".TB_PREF."sys_types.type_name, ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference,
+	$due = "IF (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE.",".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)";
+	$sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference,
 		".TB_PREF."debtor_trans.tran_date,
 		$value as Balance,
 		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due,
@@ -48,14 +47,12 @@ function get_invoices($costomer_id, $to)
 
 		FROM ".TB_PREF."debtors_master,
 			".TB_PREF."payment_terms,
-			".TB_PREF."debtor_trans,
-			".TB_PREF."sys_types
+			".TB_PREF."debtor_trans
 
-		WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."debtor_trans.type
-		    AND ".TB_PREF."debtor_trans.type <> 13
-			AND ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator
+		WHERE ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
+			AND ".TB_PREF."debtor_trans.payment_terms = ".TB_PREF."payment_terms.terms_indicator
 			AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
-			AND ".TB_PREF."debtor_trans.debtor_no = $costomer_id
+			AND ".TB_PREF."debtor_trans.debtor_no = $customer_id 
 			AND ".TB_PREF."debtor_trans.tran_date <= '$todate'
 			AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) > 0.004
 			ORDER BY ".TB_PREF."debtor_trans.tran_date";
@@ -67,9 +64,7 @@ function get_invoices($costomer_id, $to)
 
 function print_aged_customer_analysis()
 {
-    global $comp_path, $path_to_root;
-
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+    global $comp_path, $path_to_root, $systypes_array;
 
     $to = $_POST['PARAM_0'];
     $fromcust = $_POST['PARAM_1'];
@@ -77,13 +72,18 @@ function print_aged_customer_analysis()
 	$summaryOnly = $_POST['PARAM_3'];
     $graphics = $_POST['PARAM_4'];
     $comments = $_POST['PARAM_5'];
+	$destination = $_POST['PARAM_6'];
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 	if ($graphics)
 	{
 		include_once($path_to_root . "/reporting/includes/class.graphic.inc");
 		$pg = new graph();
 	}
 
-	if ($fromcust == reserved_words::get_all_numeric())
+	if ($fromcust == ALL_NUMERIC)
 		$from = _('All');
 	else
 		$from = get_customer_name($fromcust);
@@ -93,7 +93,7 @@ function print_aged_customer_analysis()
 		$summary = _('Summary Only');
 	else
 		$summary = _('Detailed Report');
-	if ($currency == reserved_words::get_all())
+	if ($currency == ALL_TEXT)
 	{
 		$convert = true;
 		$currency = _('Balances in Home Currency');
@@ -121,18 +121,18 @@ function print_aged_customer_analysis()
 
 	if ($convert)
 		$headers[2] = _('Currency');
-    $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis.pdf", user_pagesize());
+    $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$total = array(0,0,0,0, 0);
 
-	$sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
-	if ($fromcust != reserved_words::get_all_numeric())
-		$sql .= "WHERE debtor_no=$fromcust ";
-	$sql .= "ORDER BY name";
+	$sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master";
+	if ($fromcust != ALL_NUMERIC)
+		$sql .= " WHERE debtor_no=".db_escape($fromcust);
+	$sql .= " ORDER BY name";
 	$result = db_query($sql, "The customers could not be retrieved");
 
 	while ($myrow=db_fetch($result))
@@ -140,11 +140,11 @@ function print_aged_customer_analysis()
 		if (!$convert && $currency != $myrow['curr_code'])
 			continue;
 		$rep->fontSize += 2;
-		$rep->TextCol(0, 3, $myrow['name']);
+		$rep->TextCol(0, 2, $myrow['name']);
 		if ($convert)
 		{
 			$rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to);
-			$rep->TextCol(2, 4,	$myrow['curr_code']);
+			$rep->TextCol(2, 3,	$myrow['curr_code']);
 		}
 		else
 			$rate = 1.0;
@@ -157,13 +157,13 @@ function print_aged_customer_analysis()
 		$total[2] += ($custrec["Overdue1"]-$custrec["Overdue2"]);
 		$total[3] += $custrec["Overdue2"];
 		$total[4] += $custrec["Balance"];
-		$str = array(number_format2(($custrec["Balance"] - $custrec["Due"]),$dec),
-			number_format2(($custrec["Due"]-$custrec["Overdue1"]),$dec),
-			number_format2(($custrec["Overdue1"]-$custrec["Overdue2"]) ,$dec),
-			number_format2($custrec["Overdue2"],$dec),
-			number_format2($custrec["Balance"],$dec));
+		$str = array($custrec["Balance"] - $custrec["Due"],
+			$custrec["Due"]-$custrec["Overdue1"],
+			$custrec["Overdue1"]-$custrec["Overdue2"],
+			$custrec["Overdue2"],
+			$custrec["Balance"]);
 		for ($i = 0; $i < count($str); $i++)
-			$rep->TextCol($i + 3, $i + 4, $str[$i]);
+			$rep->AmountCol($i + 3, $i + 4, $str[$i], $dec);
 		$rep->NewLine(1, 2);
 		if (!$summaryOnly)
 		{
@@ -174,10 +174,10 @@ function print_aged_customer_analysis()
 			while ($trans=db_fetch($res))
 			{
 				$rep->NewLine(1, 2);
-        		$rep->TextCol(0, 1,	$trans['type_name'], -2);
+        		$rep->TextCol(0, 1, $systypes_array[$trans['type']], -2);
 				$rep->TextCol(1, 2,	$trans['reference'], -2);
-				$rep->TextCol(2, 3, sql2date($trans['tran_date']), -2);
-				if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2)
+				$rep->DateCol(2, 3, $trans['tran_date'], true, -2);
+				if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT)
 				{
 					$trans['Balance'] *= -1;
 					$trans['Due'] *= -1;
@@ -186,13 +186,13 @@ function print_aged_customer_analysis()
 				}
 				foreach ($trans as $i => $value)
 					$trans[$i] *= $rate;
-				$str = array(number_format2(($trans["Balance"] - $trans["Due"]),$dec),
-					number_format2(($trans["Due"]-$trans["Overdue1"]),$dec),
-					number_format2(($trans["Overdue1"]-$trans["Overdue2"]) ,$dec),
-					number_format2($trans["Overdue2"],$dec),
-					number_format2($trans["Balance"],$dec));
+				$str = array($trans["Balance"] - $trans["Due"],
+					$trans["Due"]-$trans["Overdue1"],
+					$trans["Overdue1"]-$trans["Overdue2"],
+					$trans["Overdue2"],
+					$trans["Balance"]);
 				for ($i = 0; $i < count($str); $i++)
-					$rep->TextCol($i + 3, $i + 4, $str[$i]);
+					$rep->AmountCol($i + 3, $i + 4, $str[$i], $dec);
 			}
 			$rep->Line($rep->row - 8);
 			$rep->NewLine(2);
@@ -208,7 +208,7 @@ function print_aged_customer_analysis()
 	$rep->fontSize -= 2;
 	for ($i = 0; $i < count($total); $i++)
 	{
-		$rep->TextCol($i + 3, $i + 4, number_format2($total[$i], $dec));
+		$rep->AmountCol($i + 3, $i + 4, $total[$i], $dec);
 		if ($graphics && $i < count($total) - 1)
 		{
 			$pg->y[$i] = abs($total[$i]);
@@ -235,9 +235,10 @@ function print_aged_customer_analysis()
 		$x = ($rep->pageWidth - $w) / 2;
 		$rep->NewLine(2);
 		if ($rep->row - $h < $rep->bottomMargin)
-			$rep->Header();
+			$rep->NewPage();
 		$rep->AddImage($filename, $x, $rep->row - $h, $w, $h);
 	}
+	$rep->NewLine();
     $rep->End();
 }