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

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index bd8a29bc..f279283b 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"],
 				_("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"],
 				_("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;
@@ -88,7 +90,7 @@
 		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"],
@@ -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)
@@ -151,9 +153,10 @@
 			$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'],
@@ -267,5 +270,3 @@
 		foreach(explode("\n", $this->company['legal_text']) as $line)
 			$Footer[] = $line;
 	}
-
-?>