X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext2.inc;h=9f94b1b4c26fa33ed895d052be912659b03e78d6;hb=7202616e85a0fb8907ced404e418d8a16a5ed53a;hp=16460053bebe45fb9b014c1024c163072de0b89a;hpb=39ef29ec4c57a03feabd4ecfa599e71f35b3dddb;p=fa-stable.git

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 16460053..9f94b1b4 100644
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -13,9 +13,19 @@ if (isset($header2type))
 {
 	$doc_Cust_no = "Cust no";
 	$doc_Date = "Date";
-	$doc_Charge_To = "Charge To";
-	$doc_Delivered_To = "Delivered To";
+	if ($doctype == 8) // Purchase Order
+	{
+		$doc_Charge_To = "Order To";
+		$doc_Delivered_To = "Charge To";
+	}
+	else
+	{
+		$doc_Charge_To = "Charge To";
+		$doc_Delivered_To = "Delivered To";
+	}	
 	$doc_Shipping_Company = "Shipping Company";
+	if ($doctype == 7)
+		$doc_Due_Date = "Valid until";
 	if ($doctype == 9)
 		$doc_Due_Date = "Delivery Date";
 	else
@@ -40,7 +50,7 @@ if (isset($header2type))
 	}
 	$doc_Our_VAT_no = "Our VAT No.";
 	$doc_Domicile = "Domicile";
-	if($doctype == 13 || $doctype == 8 || $doctype == 9) {
+	if($doctype == 13 || $doctype == 7 || $doctype == 8 || $doctype == 9) {
 	 $doc_Bank_Account = '';
 	 $doc_Please_Quote = "All amounts stated in";
   } else {
@@ -53,9 +63,11 @@ if (isset($header2type))
 	$doc_Bank = "Bank";
 	$doc_Bank_Account = "Bank Account";
 	$doc_Payment_Link = "You can pay through";
-	if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13 || $doctype == 26)
+	if ($doctype == 7 || $doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13 || $doctype == 26)
 	{
-		if ($doctype == 8)
+		if ($doctype == 7)
+			$this->title = "SALES QUOTATION";
+		elseif ($doctype == 8)
 			$this->title = "PURCHASE ORDER";
 		elseif ($doctype == 9)
 			$this->title = ($print_as_quote==1 ? "QUOTE" : "SALES ORDER");
@@ -86,21 +98,21 @@ if (isset($header2type))
 }
 if (isset($emailtype))
 {
-	$doc_Dear_Sirs = "Dear Sirs";
+	$doc_Dear_Sirs = "Dear";
 	$doc_AttachedFile = "Attached you will find ";
 	$doc_Kindest_regards = "Kindest regards";
 	$doc_Payment_Link = "You can pay through";
 }
 if (isset($header2type) || isset($linetype))
 {
-	$doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." : 
+	$doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype == 7 || $doctype==8 || $doctype==9) ? "Order no." : 
 	($doctype==10 ? "Invoice No." : ($doctype == 26 ? "Work Order No" : "Credit No."))));
 	$doc_Delivery_no = "Delivery Note No.";
 	$doc_Order_no = "Order no.";
 }
 if (isset($linetype))
 {
-	if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13)
+	if ($doctype == 7 || $doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13)
 	{
 		$doc_Sub_total = "Sub-total";
 		$doc_Shipping = "Shipping";