projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed redundant form_types functions and the file /reporting/includes/form_types...
[fa-stable.git]
/
reporting
/
includes
/
doctext2.inc
diff --git
a/reporting/includes/doctext2.inc
b/reporting/includes/doctext2.inc
index 43394c38a490204e07d5dcdf0390b18ca786ae57..461877a8eeb717bb6d2d96c028aae71bc0629ddd 100644
(file)
--- a/
reporting/includes/doctext2.inc
+++ b/
reporting/includes/doctext2.inc
@@
-17,12
+17,19
@@
if (isset($header2type))
$doc_Payment_Terms = "Payment Terms";
$doc_Our_Order_No = "Our Order No";
$doc_Domicile = "Domicile";
$doc_Payment_Terms = "Payment Terms";
$doc_Our_Order_No = "Our Order No";
$doc_Domicile = "Domicile";
- $doc_Please_Quote = "Please quote Invoice no. when paying. All amounts stated in";
+ if($doctype == 13) {
+ $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_Bank_Account = "Bank Account";
+ }
$doc_Address = "Address";
$doc_Phone_Fax_Email = "Phone/Fax/Email";
$doc_Bank = "Bank";
$doc_Bank_Account = "Bank Account";
$doc_Address = "Address";
$doc_Phone_Fax_Email = "Phone/Fax/Email";
$doc_Bank = "Bank";
$doc_Bank_Account = "Bank Account";
- if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11)
+ $doc_Payment_Link = "You can pay through";
+ if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13)
{
if ($doctype == 8)
$this->title = "PURCHASE ORDER";
{
if ($doctype == 8)
$this->title = "PURCHASE ORDER";
@@
-30,6
+37,8
@@
if (isset($header2type))
$this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
else if ($doctype == 10)
$this->title = "INVOICE";
$this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
else if ($doctype == 10)
$this->title = "INVOICE";
+ else if ($doctype == 13)
+ $this->title = _("DELIVERY NOTE");
else
$this->title = "CREDIT NOTE";
if ($doctype == 8)
else
$this->title = "CREDIT NOTE";
if ($doctype == 8)
@@
-51,15
+60,16
@@
if (isset($emailtype))
$doc_Dear_Sirs = "Dear Sirs";
$doc_AttachedFile = "Attached you will find ";
$doc_Kindest_regards = "Kindest regards";
$doc_Dear_Sirs = "Dear Sirs";
$doc_AttachedFile = "Attached you will find ";
$doc_Kindest_regards = "Kindest regards";
+ $doc_Payment_Link = "You can pay through";
}
if (isset($header2type) || isset($linetype))
{
}
if (isset($header2type) || isset($linetype))
{
- $doc_
Invoice_no =
"Invoice No.";
+ $doc_
Document_no = $doctype==13 ? "Delivery Note No." :
"Invoice No.";
$doc_Order_no = "Order no.";
}
if (isset($linetype))
{
$doc_Order_no = "Order no.";
}
if (isset($linetype))
{
- if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11)
+ if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11
|| $doctype == 13
)
{
$doc_Sub_total = "Sub-total";
$doc_Shipping = "Shipping";
{
$doc_Sub_total = "Sub-total";
$doc_Shipping = "Shipping";
@@
-68,6
+78,7
@@
if (isset($linetype))
$doc_TOTAL_INVOICE = "TOTAL INVOICE";
$doc_TOTAL_ORDER = "TOTAL ORDER EX VAT";
$doc_TOTAL_PO = "TOTAL PO EX VAT";
$doc_TOTAL_INVOICE = "TOTAL INVOICE";
$doc_TOTAL_ORDER = "TOTAL ORDER EX VAT";
$doc_TOTAL_PO = "TOTAL PO EX VAT";
+ $doc_TOTAL_DELIVERY = "TOTAL DELIVERY INCL. VAT";
}
else if ($doctype == 12)
{
}
else if ($doctype == 12)
{