X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep113.php;h=8fb6fd02ec63875f5f20aaaff6a3435fcc17edb7;hb=26229b5446802a5fbc9582ede69c5a2ca5348a81;hp=3c140ea05f3bcaac752263e29eb6d6236383c3ce;hpb=7ff72280e015c920df41faad255d19173bf4f141;p=fa-stable.git diff --git a/reporting/rep113.php b/reporting/rep113.php index 3c140ea0..8fb6fd02 100644 --- a/reporting/rep113.php +++ b/reporting/rep113.php @@ -143,20 +143,20 @@ function print_credits() $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec); $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); - $linetype = true; $doctype = ST_CUSTCREDIT; - include($path_to_root . "/reporting/includes/doctext.inc"); - $rep->TextCol(3, 6, $doc_Sub_total, -2); + $rep->TextCol(3, 6, _("Sub-total"), -2); $rep->TextCol(6, 7, $DisplaySubTot, -2); $rep->NewLine(); - $rep->TextCol(3, 6, $doc_Shipping, -2); + $rep->TextCol(3, 6, _("Shipping"), -2); $rep->TextCol(6, 7, $DisplayFreight, -2); $rep->NewLine(); $tax_items = get_trans_tax_details(ST_CUSTCREDIT, $i); $first = true; while ($tax_item = db_fetch($tax_items)) { + if ($tax_item['amount'] == 0) + continue; $DisplayTax = number_format2($sign*$tax_item['amount'], $dec); if (isset($suppress_tax_rates) && $suppress_tax_rates == 1) @@ -179,7 +179,7 @@ function print_credits() $first = false; } else - $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2); + $rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2); } else { @@ -192,7 +192,7 @@ function print_credits() $DisplayTotal = number_format2($sign*($myrow["ov_freight"] + $myrow["ov_gst"] + $myrow["ov_amount"]+$myrow["ov_freight_tax"]),$dec); $rep->Font('bold'); - $rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2); + $rep->TextCol(3, 6, _("TOTAL CREDIT"), - 2); $rep->TextCol(6, 7, $DisplayTotal, -2); $words = price_in_words($myrow['Total'], ST_CUSTCREDIT); if ($words != "") @@ -204,7 +204,7 @@ function print_credits() if ($email == 1) { $myrow['dimension_id'] = $paylink; // helper for pmt link - $rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow, ST_CUSTCREDIT); + $rep->End($email); } } if ($email == 0)