Rewritten sales shipping cost taxation, improved shipping cost handling in sales...

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

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 0e83fc0103da5d532dc00cbe2cfe9f0532976c2e..ae76e245633c0c4a9d38c58686fda6a48acb2fd4 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -156,7 +156,7 @@ function print_po()
                if ($myrow['comments'] != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $myrow['comments'], -2);
+                       $rep->TextColLines(1, 4, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
 
@@ -167,8 +167,7 @@ function print_po()
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                $rep->NewLine();
 
-               $tax_items = get_tax_for_items($items, $prices, 0,
-                 $myrow['tax_group_id'], $myrow['tax_included'],  null, TCA_LINES);
+               $tax_items = get_tax_for_items(ST_PURCHORDER, $items, $prices, $myrow['tax_group_id'], $myrow['tax_included'], TCA_LINES);
                $first = true;
                foreach($tax_items as $tax_item)
                {
@@ -188,7 +187,7 @@ function print_po()
                                        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);