Removed finally unimplemented freight cost field in Purchasing.

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

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 8660e09a554a79765f290d47e771e92142f6dbb8..06aecf085289e1d0294af0d06d379eb4ff9d91d1 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -144,7 +144,7 @@ function print_sales_orders()
                if ($myrow['comments'] != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $myrow['comments'], -2);
+                       $rep->TextColLines(1, 3, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
 
@@ -168,8 +168,8 @@ function print_sales_orders()
                        $rep->NewLine();
                }
 
-               $tax_items = get_tax_for_items($items, $prices, $myrow["freight_cost"],
-                 $myrow['tax_group_id'], $myrow['tax_included'],  null);
+               $tax_items = get_tax_for_items(ST_SALESINVOICE, $items, $prices, $myrow["freight_cost"],
+                 $myrow['tax_group_id'], $myrow['tax_included']);
                $first = true;
                foreach($tax_items as $tax_item)
                {
@@ -186,7 +186,7 @@ function print_sales_orders()
                                        if ($first)
                                        {
                                                $rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
-                                               $rep->TextCol(6, 7,     number_format2($sign*$tax_item['net_amount'], $dec), -2);
+                                               $rep->TextCol(6, 7,     number_format2($tax_item['net_amount'], $dec), -2);
                                                $rep->NewLine();
                                        }
                                        $rep->TextCol(3, 6, $tax_type_name, -2);