X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext2.inc;h=d4a725b76ab43c1189dd74efa4a48c74917b4392;hb=a66e1cff19e293615119a5cd352c0fe16b84e7c4;hp=92f27507146a60b36ca82ba2c53d600d5f591f3a;hpb=9b852b19c91b5af6400cf94a9ff65d37d1a730b4;p=fa-stable.git

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 92f27507..d4a725b7 100644
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -24,6 +24,8 @@ if (isset($header2type))
 		$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
@@ -48,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 {
@@ -61,16 +63,18 @@ 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");
 		elseif ($doctype == 10)
 			$this->title = "INVOICE";
 		elseif ($doctype == 13)
-			$this->title = "DELIVERY NOTE";
+			$this->title = ($packing_slip==1 ? "PACKING SLIP" : "DELIVERY NOTE");
 		elseif ($doctype == 26)
 			$this->title = "WORK ORDER";
 		else
@@ -101,14 +105,14 @@ if (isset($emailtype))
 }
 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";
@@ -116,6 +120,7 @@ if (isset($linetype))
 		$doc_Amount = "amount";
 		$doc_TOTAL_INVOICE = $doctype==10 ? "TOTAL INVOICE" : "TOTAL CREDIT";
 		$doc_TOTAL_ORDER = "TOTAL ORDER EX VAT";
+		$doc_TOTAL_ORDER2 = "TOTAL ORDER VAT INCL.";
 		$doc_TOTAL_PO = "TOTAL PO EX VAT";
 		$doc_TOTAL_DELIVERY = "TOTAL DELIVERY INCL. VAT";
 	}