Cannot insert a supplier transaction record in Direct Supplier Invoice (certain MySql...

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 620117f775f595b0dfe62d7acd9f1b6b4f3923ff..5e044f2898df54935a36d3daf75de299c4b10cde 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -32,7 +32,7 @@ print_invoices();
 
 function print_invoices()
 {
-       global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates;
+       global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount;
        
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -92,7 +92,7 @@ function print_invoices()
                        }
                        else
                                $rep->title = _('INVOICE');
-                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
                        $baccount['payment_service'] = $pay_service;
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
                        $rep->NewPage();
@@ -118,23 +118,25 @@ function print_invoices()
                                $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);
-                               $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);
+                                       $rep->TextCol(4, 5,     $DisplayPrice, -2);
+                                       $rep->TextCol(5, 6,     $DisplayDiscount, -2);
+                                       $rep->TextCol(6, 7,     $DisplayNet, -2);
+                               }       
                                $rep->row = $newrow;
                                //$rep->NewLine(1);
                                if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
                                        $rep->NewPage();
                        }
 
-                       $comments = get_comments(ST_SALESINVOICE, $i);
-                       if ($comments && db_num_rows($comments))
+                       $memo = get_comments_string(ST_SALESINVOICE, $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);