X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext.inc;h=4b87fa6df229df98b78d41ccfc5c18e7b8276c29;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=f39254afee2f4a8fd830c47fd5188f43231b6296;hpb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;p=fa-stable.git

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index f39254af..4b87fa6d 100644
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -14,6 +14,8 @@
 *	Set document type dependent elements of common page layout.
 *
 */
+	global $SysPrefs;
+
 	$Addr1 = array(
 			'title' => _("Charge To"),
 			'name' => @$this->formData['br_name'] ? $this->formData['br_name'] : @$this->formData['DebtorName'],
@@ -34,10 +36,7 @@
 
 	if (!in_array($this->formData['doctype'], array(ST_STATEMENT, ST_WORKORDER)))
 	{
-		$id = $this->formData['payment_terms'];
-		$sql = "SELECT terms, days_before_due FROM ".TB_PREF."payment_terms WHERE terms_indicator=".db_escape($id);
-		$result = db_query($sql,"could not get paymentterms");
-		$row = db_fetch($result);
+		$row = get_payment_terms($this->formData['payment_terms']);
 		$Payment_Terms = _("Payment Terms") . ': ' . $row["terms"];
 		if ($this->formData['doctype'] == ST_SALESINVOICE && $this->formData['prepaid'])
 			$this->formData['prepaid'] = ($row['days_before_due'] >= 0) ? 'final' : 'partial';
@@ -50,10 +49,10 @@
 			$this->title = _("SALES QUOTATION");
 			$this->formData['document_name'] =_("Quotation No.");
 			$this->formData['document_date'] = $this->formData['ord_date'];
-			$this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+			$this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
 				? $this->formData['reference'] : $this->formData['order_no'];
 			$aux_info = array(
-				_("Customers Reference") => $this->formData["customer_ref"],
+				_("Customer's Reference") => $this->formData["customer_ref"],
 				_("Sales Person") => get_salesman_name($this->formData['salesman']),
 				_("Your VAT no.") => $this->formData['tax_id'],
 				_("Our Quotation No") => $this->formData['order_no'],
@@ -62,15 +61,15 @@
 			break;
 
 		case ST_SALESORDER:
-			$this->title = ($print_as_quote==1 ? _("QUOTE") : ($this->formData['prepaid'] ? _("PREPAYMENT ORDER") : _("SALES ORDER")));
+			$this->title = ($this->params['print_quote'] ? _("QUOTE") : ($this->formData['prepaid'] ? _("PREPAYMENT ORDER") : _("SALES ORDER")));
 			$this->formData['document_name'] =_("Order No.");
 			$this->formData['document_date'] = $this->formData['ord_date'];
-			$this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+			$this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
 				? $this->formData['reference'] : $this->formData['order_no'];
 			$this->formData['document_amount'] = $this->formData['order_no'];
 
 			$aux_info = array(
-				_("Customers Reference") => $this->formData["customer_ref"],
+				_("Customer's Reference") => $this->formData["customer_ref"],
 				_("Sales Person") => get_salesman_name($this->formData['salesman']),
 				_("Your VAT no.") => $this->formData['tax_id'],
 				_("Our Order No") => $this->formData['order_no'],
@@ -79,19 +78,19 @@
 			break;
 
 		case ST_CUSTDELIVERY:
-			$this->title = ($packing_slip==1 ? _("PACKING SLIP") : _("DELIVERY NOTE"));
+			$this->title = ($this->params['packing_slip'] ? _("PACKING SLIP") : _("DELIVERY NOTE"));
 			$this->formData['document_name'] = _("Delivery Note No.");
 			if (@$packing_slip)
 				$Payment_Terms = '';
 			$ref = $this->formData['order_'];
-			if ($print_invoice_no == 0)
+			if ($SysPrefs->print_invoice_no() == 0)
 			{
 				$ref = get_reference(ST_SALESORDER, $this->formData['order_']);
 				if (!$ref)
 					$ref = $this->formData['order_'];
 			}
 			$aux_info = array(
-				_("Customers Reference") => $this->formData["customer_ref"],
+				_("Customer's Reference") => $this->formData["customer_ref"],
 				_("Sales Person") => get_salesman_name($this->formData['salesman']),
 				_("Your VAT no.") => $this->formData['tax_id'],
 				_("Our Order No") => $ref,
@@ -105,7 +104,7 @@
 			$Footer[0] = _("Please quote Credit no. when paying. All amounts stated in") . " - " . $this->formData['curr_code'];
 
 			$aux_info = array(
-				_("Customers Reference") => @$this->formData["customer_ref"],
+				_("Customer's Reference") => @$this->formData["customer_ref"],
 				_("Sales Person") => get_salesman_name($this->formData['salesman']),
 				_("Your VAT no.") => $this->formData['tax_id'],
 				_("Our Order No") => $this->formData['order_'],
@@ -121,14 +120,14 @@
 			$Footer[0] = _("Please quote Invoice no. when paying. All amounts stated in"). " - " . $this->formData['curr_code'];
 
 			$deliveries = get_sales_parent_numbers(ST_SALESINVOICE, $this->formData['trans_no']);
-			if ($print_invoice_no == 0)
+			if ($SysPrefs->print_invoice_no() == 0)
 			{
 				foreach($deliveries as $n => $delivery) {
 					$deliveries[$n] = get_reference(ST_CUSTDELIVERY, $delivery);
 				}
 			}
 			$aux_info = array(
-				_("Customers Reference") => $this->formData["customer_ref"],
+				_("Customer's Reference") => $this->formData["customer_ref"],
 				_("Sales Person") => get_salesman_name($this->formData['salesman']),
 				_("Your VAT no.") => $this->formData['tax_id'],
 			);
@@ -158,10 +157,10 @@
 			$Addr2['address'] = '';
 
 			$aux_info = array(
-				_("Customers Reference") => $this->formData['supp_account_no'],
+				_("Customer's Reference") => $this->formData['supp_account_no'],
 				_("Type") =>$systypes_array[$this->formData["type"]],
 				_("Your VAT no.") => $this->formData['tax_id'],
-				_("Our Order No") => '',
+				_("Supplier's Reference") => '',
 				_("Due Date") => sql2date($this->formData['tran_date']),
 			);
 			$this->headers = array(_("Trans Type"), _("#"), _("Date"), _("Due Date"), _("Total Amount"), _("Left to Allocate"), _("This Allocation"));
@@ -177,15 +176,15 @@
 			$Addr2['name'] = $this->company['coy_name'];
 			//$Addr2['address'] = $this->company['postal_address']; No, don't destroy delivery address!
 			$this->formData['document_date'] = $this->formData['ord_date'];
-			$this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+			$this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
 				? $this->formData['reference'] : $this->formData['order_no'];
 
 			$aux_info = array(
-				_("Customers Reference") => $this->formData['supp_account_no'],
-				_("Sales Person") => '',
-				_("Your VAT no.") => '',
-				_("Our Order No") => '',
-				_("Due Date") => '',
+				_("Customer's Reference") => $this->formData['supp_account_no'],
+				_("Sales Person") => $this->formData['contact'],
+				_("Your VAT no.") => $this->formData['tax_id'],
+				_("Supplier's Reference") => @$this->formData['requisition_no'],
+				_("Order Date") => sql2date($this->formData['document_date']),
 			);
 
 			$this->headers = array(_("Item Code"), _("Item Description"),
@@ -198,8 +197,10 @@
 			$this->title = _("RECEIPT");
 			$this->formData['document_name'] =_("Receipt No.");
 			$Addr1['title'] = _("With thanks from");
+			if ($this->formData['order_'] == "0")
+				$this->formData['order_'] = "";
 			$aux_info = array(
-				_("Customers Reference") => $this->formData["debtor_ref"],
+				_("Customer's Reference") => $this->formData["debtor_ref"],
 				_("Type") =>$systypes_array[$this->formData["type"]],
 				_("Your VAT no.") => $this->formData['tax_id'],
 				_("Our Order No") => $this->formData['order_'],
@@ -237,7 +238,7 @@
 			$Payment_Terms = '';
 			$this->title = _("STATEMENT");
 			$aux_info = array(
-				_("Customers Reference") => '',
+				_("Customer's Reference") => '',
 				_("Sales Person") => '',
 				_("Your VAT no.") => $this->formData['tax_id'],
 				_("Our Order No") => '',
@@ -252,7 +253,7 @@
 		$this->formData['document_date'] = $this->formData['tran_date'];
 
 	if (!isset($this->formData['document_number']))
-		$this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+		$this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
 			? $this->formData['reference'] : @$this->formData['trans_no'];
 
 	// footer generic content
@@ -283,3 +284,5 @@
 		foreach(explode("\n", $this->company['legal_text']) as $line)
 			$Footer[] = $line;
 	}
+
+	$this->formData['recipient_name'] = $Addr1['name'];