$sign = 1;
$myrow = get_customer_trans($row['trans_no'], ST_SALESINVOICE);
- if($customer && $myrow['debtor_no'] != $customer) {
+ if ($customer && $myrow['debtor_no'] != $customer) {
+ continue;
+ }
+ if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
continue;
}
$baccount = get_default_bank_account($myrow['curr_code']);
if ($memo != "")
{
$rep->NewLine();
- $rep->TextColLines(1, 5, $memo, -2);
+ $rep->TextColLines(1, 3, $memo, -2);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
- $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
// set to start of summary line:
$rep->row = $summary_start_row;
if (isset($prepayments))
{
// Partial invoices table
- //$rep->NewLine();
$rep->TextCol(0, 3,_("Prepayments invoiced to this order up to day:"));
$rep->TextCol(0, 3, str_pad('', 150, '_'));
$rep->cols[2] -= 20;
$rep->TextCol(3, 6, _("Sub-total"), -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
$rep->NewLine();
- $rep->TextCol(3, 6, _("Shipping"), -2);
- $rep->TextCol(6, 7, $DisplayFreight, -2);
- $rep->NewLine();
+ if ($myrow['ov_freight'] != 0.0)
+ {
+ $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
+ $rep->TextCol(3, 6, _("Shipping"), -2);
+ $rep->TextCol(6, 7, $DisplayFreight, -2);
+ $rep->NewLine();
+ }
$tax_items = get_trans_tax_details(ST_SALESINVOICE, $row['trans_no']);
$first = true;
while ($tax_item = db_fetch($tax_items))
$first = false;
}
else
- $rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
+ $rep->TextCol(3, 6, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
}
else
{