X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=7b9318d0e845ac9ecd2920aa87580bb3d5456b78;hb=758eda4e8cef6af76516199636f64415150b6da3;hp=4b4fec83e614ede4775a1124481c70d91dbac82d;hpb=7729c70dcdc39b2d776f27cd12bd4631c93251b7;p=fa-stable.git diff --git a/reporting/rep110.php b/reporting/rep110.php index 4b4fec83..7b9318d0 100644 --- 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"); @@ -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);