projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[fa-stable.git]
/
reporting
/
includes
/
doctext2.inc
diff --git
a/reporting/includes/doctext2.inc
b/reporting/includes/doctext2.inc
index b76aa9c8a4321263764eb2c284f23c8b741b5fdd..f022b504e2f6b173af5ae31d28605cf65d4b5a87 100644
(file)
--- a/
reporting/includes/doctext2.inc
+++ b/
reporting/includes/doctext2.inc
@@
-13,8
+13,16
@@
if (isset($header2type))
{
$doc_Cust_no = "Cust no";
$doc_Date = "Date";
{
$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 == 9)
$doc_Due_Date = "Delivery Date";
$doc_Shipping_Company = "Shipping Company";
if ($doctype == 9)
$doc_Due_Date = "Delivery Date";
@@
-32,7
+40,8
@@
if (isset($header2type))
$doc_Bank_Account = '';
$doc_Please_Quote = "All amounts stated in";
} else {
$doc_Bank_Account = '';
$doc_Please_Quote = "All amounts stated in";
} else {
- $doc_Please_Quote = "Please quote Invoice no. when paying. All amounts stated in";
+ $doc_Please_Quote = "Please quote ".($doctype==10 ? "Invoice" : "Credit")
+ ." no. when paying. All amounts stated in";
$doc_Bank_Account = "Bank Account";
}
$doc_Address = "Address";
$doc_Bank_Account = "Bank Account";
}
$doc_Address = "Address";
@@
-68,14
+77,15
@@
if (isset($header2type))
}
if (isset($emailtype))
{
}
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_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." : "Invoice No."));
+ $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." :
+ ($doctype==10 ? "Invoice No." : "Credit No.")));
$doc_Delivery_no = "Delivery Note No.";
$doc_Order_no = "Order no.";
}
$doc_Delivery_no = "Delivery Note No.";
$doc_Order_no = "Order no.";
}
@@
-87,7
+97,7
@@
if (isset($linetype))
$doc_Shipping = "Shipping";
$doc_Included = "Included";
$doc_Amount = "amount";
$doc_Shipping = "Shipping";
$doc_Included = "Included";
$doc_Amount = "amount";
- $doc_TOTAL_INVOICE =
"TOTAL INVOICE
";
+ $doc_TOTAL_INVOICE =
$doctype==10 ? "TOTAL INVOICE" : "TOTAL CREDIT
";
$doc_TOTAL_ORDER = "TOTAL ORDER EX VAT";
$doc_TOTAL_PO = "TOTAL PO EX VAT";
$doc_TOTAL_DELIVERY = "TOTAL DELIVERY INCL. VAT";
$doc_TOTAL_ORDER = "TOTAL ORDER EX VAT";
$doc_TOTAL_PO = "TOTAL PO EX VAT";
$doc_TOTAL_DELIVERY = "TOTAL DELIVERY INCL. VAT";