X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext.inc;h=16db8df5c0ab6f9d999043f371d4007ab6b59b3b;hb=a2bd6e80fbe669ca10c3936bb5373994fe8e4918;hp=a889e0b86fb77ec36a8d466e75beedb310973410;hpb=8e7403ce14f472a895ae1304945d7a9a74b49503;p=fa-stable.git

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index a889e0b8..16db8df5 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'],
@@ -32,52 +34,63 @@
 	// for links use 'text' => 'url'
 	$Footer[0] = _("All amounts stated in") . " - " . @$this->formData['curr_code'];
 
+	if (!in_array($this->formData['doctype'], array(ST_STATEMENT, ST_WORKORDER)))
+	{
+		$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';
+	}
+
+
 	switch ($this->formData['doctype'])
 	{
 		case ST_SALESQUOTE:
 			$this->title = _("SALES QUOTATION");
 			$this->formData['document_name'] =_("Quotation No.");
 			$this->formData['document_date'] = $this->formData['ord_date'];
-			$this->formData['document_number'] = $this->formData['order_no'];
+			$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.") => '',
-				_("Our Order No") => '',
+				_("Your VAT no.") => $this->formData['tax_id'],
+				_("Our Quotation No") => $this->formData['order_no'],
 				_("Valid until") => sql2date($this->formData['delivery_date']),
 			);
 			break;
 
 		case ST_SALESORDER:
-			$this->title = ($print_as_quote==1 ? _("QUOTE") : _("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'] = $this->formData['order_no'];
+			$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.") => '',
-				_("Our Order No") => '',
+				_("Your VAT no.") => $this->formData['tax_id'],
+				_("Our Order No") => $this->formData['order_no'],
 				_("Delivery Date") => sql2date($this->formData['delivery_date']),
 			);
 			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,
@@ -91,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_'],
@@ -100,25 +113,35 @@
 			break;
 
 		case ST_SALESINVOICE:
-			$this->title = _("INVOICE");
+			$this->title = $this->formData['prepaid']=='partial' ? _("PREPAYMENT INVOICE")
+				: ($this->formData['prepaid']=='final' ? _("FINAL INVOICE")  : _("INVOICE"));
 			$this->formData['document_name'] =_("Invoice No.");
 			$this->formData['domicile'] = $this->company['domicile'];
 			$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'],
-				_("Delivery Note No.") => implode(',', $deliveries),
-				_("Due Date") => sql2date($this->formData['due_date']),
 			);
+			if ($this->formData['prepaid']=='partial')
+			{
+				$aux_info[_("Date of Payment")] = sql2date(get_oldest_payment_date($this->formData['trans_no']));
+				$aux_info[_("Our Order No")]  = $this->formData['order_'];
+			} else {
+				if ($this->formData['prepaid'] =='final')
+					$aux_info[_("Invoice Date")] = sql2date($this->formData['tran_date']);
+				else
+					$aux_info[_("Date of Sale")] = sql2date(get_oldest_delivery_date($this->formData['trans_no']));
+				$aux_info[_("Due Date")]  = sql2date($this->formData['due_date']);
+			}
 			break;
 
 		case ST_SUPPAYMENT:
@@ -134,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"));
@@ -151,17 +174,17 @@
 			$Addr1['address'] = $this->formData['address'];
 			$Addr2['title'] = _("Deliver To");
 			$Addr2['name'] = $this->company['coy_name'];
-			$Addr2['address'] = $this->company['postal_address'];
+			//$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"),
@@ -174,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_'],
@@ -213,13 +238,13 @@
 			$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") => '',
 				_("Delivery Date") => '',
 			);
-			$this->headers = array(_("Trans Type"), _("#"), _("Date"), _("DueDate"), _("Charges"),
+			$this->headers = array(_("Trans Type"), _("#"), _("Date"), _("DueDate"), _("Debits"),
 				_("Credits"), _("Allocated"), _("Outstanding"));
 	}
 
@@ -228,18 +253,9 @@
 		$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'];
 
-	if (!isset($Payment_Terms))
-	{
-		$id = $this->formData['payment_terms'];
-		$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator=".db_escape($id);
-		$result = db_query($sql,"could not get paymentterms");
-		$row = db_fetch($result);
-		$Payment_Terms = _("Payment Terms") . ': ' . $row["terms"];
-	}
-
 	// footer generic content
 	if (@$this->formData['bank_name'])
 		$Footer[] = _("Bank"). ": ".$this->formData['bank_name']. ", " . _("Bank Account") . ": " . $this->formData['bank_account_number'];
@@ -269,4 +285,4 @@
 			$Footer[] = $line;
 	}
 
-?>
+	$this->formData['recipient_name'] = $Addr1['name'];