[Frontaccounting-cvs_updates] /hgrepo/f/fr/frontaccounting/frontaccounting: Changed Print Stat...

[FrontAccounting <fro...@us...>]

details:   http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgrepo/f/fr/frontaccounting/frontaccounting/rev/e4959bccc1e6
changeset: 2792:e4959bccc1e6
user:      Joe Hunt <joe...@gm...>
date:      Wed May 18 09:15:38 2011 +0200
description:
Changed Print Statements to follow aged customer/supplier list in presentation

diffstat:

 reporting/rep108.php       |  10 +++++-----
 reporting/reports_main.php |   2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r da8408a9d5c2 -r e4959bccc1e6 reporting/rep108.php
--- a/reporting/rep108.php	Tue May 17 23:22:45 2011 +0200
+++ b/reporting/rep108.php	Wed May 18 09:15:38 2011 +0200
@@ -30,7 +30,7 @@
 
 //----------------------------------------------------------------------------------------------------
 
-function getTransactions($debtorno, $date, $outstanding)
+function getTransactions($debtorno, $date, $show_also_allocated)
 {
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
 				(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
@@ -43,7 +43,7 @@
     				AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
     				AND (".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";
-	if ($outstanding)
+	if (!$show_also_allocated)
 		$sql .= " 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) - alloc <> 0";
 	$sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
@@ -61,7 +61,7 @@
 
 	$customer = $_POST['PARAM_0'];
 	$currency = $_POST['PARAM_1'];
-	$outstanding = $_POST['PARAM_2'];
+	$show_also_allocated = $_POST['PARAM_2'];
 	$email = $_POST['PARAM_3'];
 	$comments = $_POST['PARAM_4'];
 
@@ -101,7 +101,7 @@
 
 		$myrow['order_'] = "";
 
-		$TransResult = getTransactions($myrow['debtor_no'], $date, $outstanding);
+		$TransResult = getTransactions($myrow['debtor_no'], $date, $show_also_allocated);
 		$baccount = get_default_bank_account($myrow['curr_code']);
 		$params['bankaccount'] = $baccount['id'];
 		if (db_num_rows($TransResult) == 0)
@@ -152,7 +152,7 @@
 		$nowdue = "1-" . $PastDueDays1 . " " . $doc_Days;
 		$pastdue1 = $PastDueDays1 + 1 . "-" . $PastDueDays2 . " " . $doc_Days;
 		$pastdue2 = $doc_Over . " " . $PastDueDays2 . " " . $doc_Days;
-		$CustomerRecord = get_customer_details($myrow['debtor_no']);
+		$CustomerRecord = get_customer_details($myrow['debtor_no'], null, $show_also_allocated);
 		$str = array($doc_Current, $nowdue, $pastdue1, $pastdue2, $doc_Total_Balance);
 		$str2 = array(number_format2(($CustomerRecord["Balance"] - $CustomerRecord["Due"]),$dec),
 			number_format2(($CustomerRecord["Due"]-$CustomerRecord["Overdue1"]),$dec),
diff -r da8408a9d5c2 -r e4959bccc1e6 reporting/reports_main.php
--- a/reporting/reports_main.php	Tue May 17 23:22:45 2011 +0200
+++ b/reporting/reports_main.php	Wed May 18 09:15:38 2011 +0200
@@ -107,7 +107,7 @@
 $reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
 	array(	_('Customer') => 'CUSTOMERS_NO_FILTER',
 			_('Currency Filter') => 'CURRENCY',
-			_('Show Outstanding Only') => 'YES_NO',
+			_('Show Also Allocated') => 'YES_NO',
 			_('Email Customers') => 'YES_NO',
 			_('Comments') => 'TEXTBOX'));
 $reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),