From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 23 Dec 2009 17:07:58 +0000 (+0000)
Subject: Changed so Printed Sales Order (Quotation) shows TOTAL VAT INCL. if it is.
X-Git-Tag: 2.3-final~1074
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d09ac1d8c60cce3aa02730838bb06e1caf384417;p=fa-stable.git

Changed so Printed Sales Order (Quotation) shows TOTAL VAT INCL. if it is.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 49ec66af..96bd8fa9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -24,6 +24,11 @@ $ -> Affected files
 ! 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
diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index 0edc595f..d94ffe0c 100644
--- 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_TOTAL_ORDER2 = _("TOTAL ORDER VAT INCL.");
 		$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 40853642..d4a725b7 100644
--- 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_TOTAL_ORDER2 = "TOTAL ORDER VAT INCL.";
 		$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 07767415..11349184 100644
--- 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->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)
diff --git a/reporting/rep111.php b/reporting/rep111.php
index a16a1d7f..826089bc 100644
--- 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->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)