0001606: Statement are not sent to general contact

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

diff --git a/reporting/rep111.php b/reporting/rep111.php
index d11e487a74b74381ebfc3817f0502d794f74154a..2662fca59d1221403d0a4cdff2785a063b24c8ac 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -31,7 +31,7 @@ print_sales_quotations();
 
 function print_sales_quotations()
 {
-       global $path_to_root, $print_as_quote, $print_invoice_no;
+       global $path_to_root, $print_as_quote, $print_invoice_no, $no_zero_lines_amount;
 
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -84,7 +84,7 @@ function print_sales_quotations()
                        $rep->Info($params, $cols, null, $aligns);
                }
                $rep->title = _("SALES QUOTATION");
-               $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
+               $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], false);
                $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
                //$rep->headerFunc = 'Header2';
                $rep->NewPage();
@@ -111,11 +111,14 @@ function print_sales_quotations()
                        $rep->TextColLines(1, 2, $myrow2['description'], -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))
@@ -200,7 +203,7 @@ function print_sales_quotations()
                {
                        if ($print_invoice_no == 1)
                                $myrow['reference'] = $i;
-                       $rep->End($email, '', $myrow);
+                       $rep->End($email);
                }
        }
        if ($email == 0)