Rerun. Reports checked for warnings.

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

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 07767415b169910e4c1e53a4314ed2a3efd38805..2c3bb116e54e4c3ad0c8fc9c1d0b694e17dc1608 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -94,7 +94,7 @@ function print_sales_orders()
                }
                else
                        $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
-               $rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+               $rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
 
                $result = get_sales_order_details($i, ST_SALESORDER);
                $SubTotal = 0;
@@ -123,7 +123,7 @@ function print_sales_orders()
                        $rep->row = $newrow;
                        //$rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                               $rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+                               $rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
                }
                if ($myrow['comments'] != "")
                {
@@ -135,7 +135,7 @@ function print_sales_orders()
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $linetype = true;
-               $doctype = 9;
+               $doctype = ST_SALESORDER;
                if ($rep->currency != $myrow['curr_code'])
                {
                        include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -153,8 +153,17 @@ 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);
+               $words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
+               if ($words != "")
+               {
+                       $rep->NewLine(1);
+                       $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+               }       
                $rep->Font();
                if ($email == 1)
                {