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");
}
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();
{
if ($myrow2["quantity"] == 0)
continue;
-
+
$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
user_price_dec());
$SubTotal += $Net;
$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)
+ if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
{
- $rep->TextCol(4, 5, $DisplayPrice, -2);
- $rep->TextCol(5, 6, $DisplayDiscount, -2);
- $rep->TextCol(6, 7, $DisplayNet, -2);
- }
+ $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);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$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);