[Frontaccounting-cvs_updates] /hgrepo/f/fr/frontaccounting/frontaccounting: Customer Credit No...

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

details:   http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgrepo/f/fr/frontaccounting/frontaccounting/rev/fa839fe5e965
changeset: 2759:fa839fe5e965
user:      Joe Hunt <joe...@gm...>
date:      Thu Apr 28 10:59:48 2011 +0200
description:
Customer Credit Notes should not be included in Print Receipts.

diffstat:

 reporting/includes/reports_classes.inc |  3 +--
 reporting/rep112.php                   |  2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r a2fc731b34f5 -r fa839fe5e965 reporting/includes/reports_classes.inc
--- a/reporting/includes/reports_classes.inc	Thu Apr 28 01:00:53 2011 +0200
+++ b/reporting/includes/reports_classes.inc	Thu Apr 28 10:59:48 2011 +0200
@@ -361,10 +361,9 @@
 				case 'RECEIPT':
 					$BD = $type_shortcuts[ST_BANKDEPOSIT];
 					$CP = $type_shortcuts[ST_CUSTPAYMENT];
-					$CN = $type_shortcuts[ST_CUSTCREDIT];
 					$ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
 					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', if (type=".ST_CUSTPAYMENT.", ' $CP ', ' $CN ')), ".TB_PREF."debtors_master.name) as IName
+						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), ".TB_PREF."debtors_master.name) as IName
 						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_BANKDEPOSIT." OR type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
diff -r a2fc731b34f5 -r fa839fe5e965 reporting/rep112.php
--- a/reporting/rep112.php	Thu Apr 28 01:00:53 2011 +0200
+++ b/reporting/rep112.php	Thu Apr 28 10:59:48 2011 +0200
@@ -100,7 +100,7 @@
 		if ($fno[0] == $tno[0])
 			$types = array($fno[1]);
 		else
-			$types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT, ST_CUSTCREDIT);
+			$types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT);
 		foreach ($types as $j)
 		{
 			$myrow = get_receipt($j, $i);