From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 3 Nov 2009 16:29:15 +0000 (+0000)
Subject: Changed so reference no in QUOTE/SO/INV/CRE/PO is printed instead of trans_no
X-Git-Tag: v2.4.2~19^2~1053
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ca45fa23d2d83705e11007acafd52528718ae5aa;p=fa-stable.git

Changed so reference no in QUOTE/SO/INV/CRE/PO is printed instead of trans_no
if global variable in config.php, $print_invoice_no = 0 (default).
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 53b751a0..6d794a35 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -34,7 +34,11 @@ $ /includes/db/connect_db.inc
 $ update.html
 # Wrong presentation on reference and order in Customer Allocation Inquiry
 $ /sales/inquiry/customer_allocation_inquiry.php
-
+! Changed so reference no in QUOTE/SO/INV/CRE/PO is printed instead of trans_no 
+  if global variable in config.php, $print_invoice_no = 0 (default).
+$ /reporting/includes/header2.inc
+  /reporting/includes/reports_classes.inc
+  
 02-Nov-2009 Janusz Dobrowolski
 # Bad default value retrieved for service COGS account.
 $ /inventory/manage/items.php
diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 7fae9f64..b77b0610 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -130,7 +130,12 @@
 		$this->NewLine();
 		$this->Text($mcol + 100, $doc_Invoice_no);
 		if ($doctype == 7 || $doctype == 8 || $doctype == 9) // QUOTE, PO or SO
-			$this->Text($mcol + 180, $myrow['order_no']);
+		{
+			if ($print_invoice_no == 1)
+				$this->Text($mcol + 180, $myrow['order_no']);
+			else	
+				$this->Text($mcol + 180, $myrow['reference']);
+		}		
 		elseif ($doctype == 26)	
 			$this->Text($mcol + 180, $myrow['id']);
 		else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index f08a13b3..51f19fbe 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -267,14 +267,10 @@ class Report
 				case 'INVOICE':
 					$IV = _("IV");
 					$CN = _("CN");
-					if ($print_invoice_no == 1)
-						$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-							".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=".ST_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
-							FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." 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";
-					else		
-						$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-							".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.reference, if (type=".ST_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
-							FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." 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";
+					$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_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
+						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." 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";
 					$st .= combo_input("PARAM_$index", '', $sql, 'TNO', 'IName',array('order'=>false));
 					break;
 				case 'DELIVERY':
@@ -288,21 +284,24 @@ class Report
 					$st .= combo_input("PARAM_$index", '', $sql, 'TNO', 'IName',array('order'=>false));
 					break;
 				case 'ORDERS':
-					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-',
+					$ref = ($print_invoice_no == 1 ? "order_no" : "reference");
+					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.$ref, '-',
 						".TB_PREF."debtors_master.name) as IName
 						FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no 
 						AND ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." ORDER BY ".TB_PREF."sales_orders.order_no DESC";
 					$st .= combo_input("PARAM_$index", '', $sql, 'order_no', 'IName',array('order'=>false));
 					break;
 				case 'QUOTATIONS':
-					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-',
+					$ref = ($print_invoice_no == 1 ? "order_no" : "reference");
+					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.$ref, '-',
 						".TB_PREF."debtors_master.name) as IName
 						FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no 
 						AND ".TB_PREF."sales_orders.trans_type=".ST_SALESQUOTE." ORDER BY ".TB_PREF."sales_orders.order_no DESC";
 					$st .= combo_input("PARAM_$index", '', $sql, 'order_no', 'IName',array('order'=>false));
 					break;
 				case 'PO':
-					$sql = "SELECT ".TB_PREF."purch_orders.order_no, concat(".TB_PREF."purch_orders.order_no, '-',
+					$ref = ($print_invoice_no == 1 ? "order_no" : "reference");
+					$sql = "SELECT ".TB_PREF."purch_orders.order_no, concat(".TB_PREF."purch_orders.$ref, '-',
 						".TB_PREF."suppliers.supp_name) as IName
 						FROM ".TB_PREF."suppliers, ".TB_PREF."purch_orders WHERE ".TB_PREF."suppliers.supplier_id=".TB_PREF."purch_orders.supplier_id ORDER BY ".TB_PREF."purch_orders.order_no DESC";
 					$st .= combo_input("PARAM_$index", '', $sql, 'order_no', 'IName',array('order'=>false));