X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_credit.php;h=f220fca140512116bcd29f3f7af4c1d8fe935855;hb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;hp=ec14f0313f250e6d5356781cfdb42901ddd9e939;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php index ec14f031..f220fca1 100644 --- a/sales/view/view_credit.php +++ b/sales/view/view_credit.php @@ -17,7 +17,7 @@ page(_("View Credit Note"), true, false, "", $js); if (isset($_GET["trans_no"])) { $trans_id = $_GET["trans_no"]; -} +} elseif (isset($_POST["trans_no"])) { $trans_id = $_POST["trans_no"]; @@ -80,7 +80,7 @@ if (db_num_rows($result) > 0) { $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"), _("Discount %"), _("Total")); - table_header($th); + table_header($th); $k = 0; //row colour counter $sub_total = 0; @@ -90,29 +90,29 @@ if (db_num_rows($result) > 0) alt_table_row_color($k); - $value = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), + $value = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]), user_price_dec()); $sub_total += $value; if ($myrow2["discount_percent"] == 0) { $display_discount = ""; - } - else + } + else { $display_discount = percent_format($myrow2["discount_percent"]*100) . "%"; } label_cell($myrow2["stock_id"]); label_cell($myrow2["StockDescription"]); - qty_cell($myrow2["quantity"]); + qty_cell($myrow2["quantity"], false, get_qty_dec($myrow2["stock_id"])); label_cell($myrow2["units"], "align=right"); amount_cell($myrow2["unit_price"]); label_cell($display_discount, "align=right"); amount_cell($value); end_row(); } //end while there are line items to print out -} +} else display_note(_("There are no line items on this credit note."), 1, 2); @@ -138,7 +138,7 @@ end_table(1); $voided = is_voided_display(11, $trans_id, _("This credit note has been voided.")); if (!$voided) - display_allocations_from(payment_person_types::customer(), + display_allocations_from(payment_person_types::customer(), $myrow['debtor_no'], 11, $trans_id, $credit_total); /* end of check to see that there was an invoice record to print */