[0004904] Customer Credit Note: fixed invalid inventory GL postings for service items.

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

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 7044153d33f20877235aabcb9be0ca10020430d0..cc0f1c10b18b0ff01cdd43661820fd93e9f81cf6 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -16,7 +16,6 @@ $page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
 // Creator:    Janusz Dobrwolski
 // date_:      2008-01-14
 // Title:      Print Delivery Notes
-// draft version!
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -59,7 +58,7 @@ function print_deliveries()
        // $headers in doctext.inc
        $aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right');
 
-       $params = array('comments' => $comments);
+       $params = array('comments' => $comments, 'packing_slip' => $packing_slip);
 
        $cur = get_company_Pref('curr_default');
 
@@ -145,11 +144,10 @@ function print_deliveries()
                        if ($memo != "")
                        {
                                $rep->NewLine();
-                               $rep->TextColLines(1, 5, $memo, -2);
+                               $rep->TextColLines(1, 3, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);
-                       $DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                        $doctype=ST_CUSTDELIVERY;
@@ -158,9 +156,13 @@ function print_deliveries()
                                $rep->TextCol(3, 6, _("Sub-total"), -2);
                                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                                $rep->NewLine();
-                               $rep->TextCol(3, 6, _("Shipping"), -2);
-                               $rep->TextCol(6, 7,     $DisplayFreight, -2);
-                               $rep->NewLine();
+                               if ($myrow['ov_freight'] != 0.0)
+                               {
+                                       $DisplayFreight = number_format2($myrow["ov_freight"],$dec);
+                                       $rep->TextCol(3, 6, _("Shipping"), -2);
+                                       $rep->TextCol(6, 7,     $DisplayFreight, -2);
+                                       $rep->NewLine();
+                               }       
                                $tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i);
                                $first = true;
                        while ($tax_item = db_fetch($tax_items))