Fixed write test for main directory during install.

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

diff --git a/reporting/rep110.php b/reporting/rep110.php
index cadfc522faaa708d481783878d95e297ff1d7d3f..7b9318d0e845ac9ecd2920aa87580bb3d5456b78 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -34,7 +34,7 @@ print_deliveries();
 
 function print_deliveries()
 {
-       global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates;
+       global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount;
 
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -101,7 +101,7 @@ function print_deliveries()
                        }
                        else
                                $rep->title = _('DELIVERY NOTE');
-                       $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no']);
+                       $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], false);
                        $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
                        $rep->NewPage();
 
@@ -127,13 +127,16 @@ function print_deliveries()
                                $rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
                                $newrow = $rep->row;
                                $rep->row = $oldrow;
-                               $rep->TextCol(2, 3,     $DisplayQty, -2);
-                               $rep->TextCol(3, 4,     $myrow2['units'], -2);
-                               if ($packing_slip == 0)
-                               {
-                                       $rep->TextCol(4, 5,     $DisplayPrice, -2);
-                                       $rep->TextCol(5, 6,     $DisplayDiscount, -2);
-                                       $rep->TextCol(6, 7,     $DisplayNet, -2);
+                               if ($Net != 0.0  || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
+                               {                       
+                                       $rep->TextCol(2, 3,     $DisplayQty, -2);
+                                       $rep->TextCol(3, 4,     $myrow2['units'], -2);
+                                       if ($packing_slip == 0)
+                                       {
+                                               $rep->TextCol(4, 5,     $DisplayPrice, -2);
+                                               $rep->TextCol(5, 6,     $DisplayDiscount, -2);
+                                               $rep->TextCol(6, 7,     $DisplayNet, -2);
+                                       }
                                }       
                                $rep->row = $newrow;
                                //$rep->NewLine(1);
@@ -141,12 +144,11 @@ function print_deliveries()
                                        $rep->NewPage();
                        }
 
-                       $comments = get_comments(ST_CUSTDELIVERY, $i);
-                       if ($comments && db_num_rows($comments))
+                       $memo = get_comments_string(ST_CUSTDELIVERY, $i);
+                       if ($memo != "")
                        {
                                $rep->NewLine();
-                       while ($comment=db_fetch($comments))
-                               $rep->TextColLines(0, 6, $comment['memo_'], -2);
+                               $rep->TextColLines(1, 5, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);