X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext.inc;h=bf45b1ce355fbd67ce487cf61f366d5d72217bba;hb=0b1257cb14406901c17a5d537d606d973ca3115c;hp=bd8a29bcae4f76857994eedb365a67d5c4513adb;hpb=91a637fe74ce0d78b9b4ce099b42449da87c6e71;p=fa-stable.git

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index bd8a29bc..bf45b1ce 100644
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -30,7 +30,7 @@
 		_("Unit"), _("Price"), _("Discount %"), _("Total"));
 
 	// for links use 'text' => 'url'
-	$Footer[0] = _("All amounts stated in") . @$this->formData['curr_code'];
+	$Footer[0] = _("All amounts stated in") . " - " . @$this->formData['curr_code'];
 
 	switch ($this->formData['doctype'])
 	{
@@ -38,12 +38,13 @@
 			$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'] = $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;
@@ -52,14 +53,15 @@
 			$this->title = ($print_as_quote==1 ? _("QUOTE") : _("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'] = $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;
@@ -77,7 +79,7 @@
 					$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,
@@ -88,10 +90,10 @@
 		case ST_CUSTCREDIT:
 			$this->title = _("CREDIT NOTE");
 			$this->formData['document_name'] =_("Credit No.");
-			$Footer[0] = _("Please quote Credit no. when paying. All amounts stated in") . $this->formData['curr_code'];
+			$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_'],
@@ -103,7 +105,7 @@
 			$this->title = _("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'];
+			$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)
@@ -113,7 +115,7 @@
 				}
 			}
 			$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),
@@ -134,10 +136,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,16 +153,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'] = $this->formData['order_no'];
+			$this->formData['document_number'] = $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,7 +177,7 @@
 			$this->formData['document_name'] =_("Receipt No.");
 			$Addr1['title'] = _("With thanks from");
 			$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_'],
@@ -212,7 +215,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") => '',
@@ -268,4 +271,5 @@
 			$Footer[] = $line;
 	}
 
+	$this->formData['recipient_name'] = $Addr1['name'];
 ?>