Merged changes from main trunk 2.2.1-2.2.2

[fa-stable.git] / reporting / rep109.php

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->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)