X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext.inc;h=c9011b45bd5f23ee983573486f33e30765e76295;hb=f5a86be183c6023b189199c69ac409df1b7116df;hp=de3082a9e1eadd6dfe906313b37786ac1219ccad;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index de3082a9..c9011b45 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';
@@ -62,7 +61,7 @@
 			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'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
@@ -79,7 +78,7 @@
 			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 = '';
@@ -184,7 +183,7 @@
 				_("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'],
+				_("Supplier's Reference") => @$this->formData['requisition_no'],
 				_("Order Date") => sql2date($this->formData['document_date']),
 			);