projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8fede7c
)
Changed so Printed Sales Order (Quotation) shows TOTAL VAT INCL. if it is.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 23 Dec 2009 17:07:58 +0000
(17:07 +0000)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 23 Dec 2009 17:07:58 +0000
(17:07 +0000)
CHANGELOG.txt
patch
|
blob
|
history
reporting/includes/doctext.inc
patch
|
blob
|
history
reporting/includes/doctext2.inc
patch
|
blob
|
history
reporting/rep109.php
patch
|
blob
|
history
reporting/rep111.php
patch
|
blob
|
history
diff --git
a/CHANGELOG.txt
b/CHANGELOG.txt
index 49ec66afd1b2f4fdab17fc87e17975db32241463..96bd8fa932b97260bb210ff655327c362ddf7a73 100644
(file)
--- a/
CHANGELOG.txt
+++ b/
CHANGELOG.txt
@@
-24,6
+24,11
@@
$ -> Affected files
! Release 2.2.2
$ /config.default.php
/update.html
! Release 2.2.2
$ /config.default.php
/update.html
+! Changed so Printed Sales Order (Quotation) shows TOTAL VAT INCL. if it is.
+$ /reporting/rep109.php
+ /reporting/rep111.php
+ /reporting/includes/doctext.inc
+ /reporting/includes/doctext2.inc
! Replaced all deprecated functions so FA runs in php >= 5.3.0 as well.
$ /admin/db/maintenance_db.inc
/gl/gl_bank.php
! Replaced all deprecated functions so FA runs in php >= 5.3.0 as well.
$ /admin/db/maintenance_db.inc
/gl/gl_bank.php
diff --git
a/reporting/includes/doctext.inc
b/reporting/includes/doctext.inc
index 0edc595fde9c28d9493396cb331ce6540443f054..d94ffe0cde8490ff2559b57ce364dd75e1713e98 100644
(file)
--- a/
reporting/includes/doctext.inc
+++ b/
reporting/includes/doctext.inc
@@
-121,6
+121,7
@@
if (isset($linetype))
$doc_Amount = _("Amount");
$doc_TOTAL_INVOICE = $doctype ==10 ? _("TOTAL INVOICE") : _("TOTAL CREDIT");
$doc_TOTAL_ORDER = _("TOTAL ORDER EX VAT");
$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");
}
$doc_TOTAL_PO = _("TOTAL PO EX VAT");
$doc_TOTAL_DELIVERY = _("TOTAL DELIVERY INCL. VAT");
}
diff --git
a/reporting/includes/doctext2.inc
b/reporting/includes/doctext2.inc
index 40853642eedfa1f935b779dae7531c969284b7cc..d4a725b76ab43c1189dd74efa4a48c74917b4392 100644
(file)
--- a/
reporting/includes/doctext2.inc
+++ b/
reporting/includes/doctext2.inc
@@
-120,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_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";
}
$doc_TOTAL_PO = "TOTAL PO EX VAT";
$doc_TOTAL_DELIVERY = "TOTAL DELIVERY INCL. VAT";
}
diff --git
a/reporting/rep109.php
b/reporting/rep109.php
index 07767415b169910e4c1e53a4314ed2a3efd38805..11349184d626e43203791e1eb8a2ca92d2269964 100644
(file)
--- a/
reporting/rep109.php
+++ b/
reporting/rep109.php
@@
-153,7
+153,10
@@
function print_sales_orders()
$rep->NewLine();
$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
$rep->Font('bold');
$rep->NewLine();
$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
$rep->Font('bold');
- $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+ if ($myrow['tax_included'] == 0)
+ $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+ else
+ $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->Font();
if ($email == 1)
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->Font();
if ($email == 1)
diff --git
a/reporting/rep111.php
b/reporting/rep111.php
index a16a1d7fc0efd7fc7e23657804b90aa9542453f1..826089bca9f5577b56032b6e56e20d2cbfa717d5 100644
(file)
--- a/
reporting/rep111.php
+++ b/
reporting/rep111.php
@@
-137,7
+137,10
@@
function print_sales_quotations()
$rep->NewLine();
$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
$rep->Font('bold');
$rep->NewLine();
$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
$rep->Font('bold');
- $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+ if ($myrow['tax_included'] == 0)
+ $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+ else
+ $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->Font();
if ($email == 1)
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->Font();
if ($email == 1)