X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_credit.php;h=f800c3a730ecaad9475ba87cbf4cabf411c5faf1;hb=30c04f9f87e74bd4201f56ce25f02d4c5d01f99b;hp=1e98a8e56f11e81a88e2c4dd3ebd2fc1c9fce689;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index 1e98a8e5..f800c3a7 100644
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 1;
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
@@ -17,7 +26,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"];
@@ -27,7 +36,7 @@ $myrow = get_customer_trans($trans_id, 11);
$branch = get_branch($myrow["branch_code"]);
-display_heading("" . _("CREDIT NOTE") . " #$trans_id");
+display_heading("" . sprintf(_("CREDIT NOTE #%d"), $trans_id). "");
echo "
";
start_table("$table_style2 width=95%");
@@ -80,47 +89,47 @@ 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;
while ($myrow2 = db_fetch($result))
{
-
+ if ($myrow2["quantity"] == 0) continue;
alt_table_row_color($k);
- $net = ((1 - $myrow2["discount_percent"]) * $myrow2["FullUnitPrice"] * $myrow2["quantity"]);
- $sub_total += $net;
+ $value = round2(((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 = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
+ $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["FullUnitPrice"]);
+ amount_cell($myrow2["unit_price"]);
label_cell($display_discount, "align=right");
- amount_cell($net);
+ 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);
-$display_sub_tot = number_format2($sub_total,user_price_dec());
-$display_freight = number_format2(-$myrow["ov_freight"],user_price_dec());
+$display_sub_tot = price_format($sub_total);
+$display_freight = price_format($myrow["ov_freight"]);
-$display_tax = number_format2(-$myrow["ov_gst"],user_price_dec());
-$credit_total = -$myrow["ov_freight"]-$myrow["ov_gst"]-$myrow["ov_amount"];
-$display_total = number_format2($credit_total,user_price_dec());
+$credit_total = $myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"];
+$display_total = price_format($credit_total);
/*Print out the invoice text entered */
if ($sub_total != 0)
@@ -128,7 +137,7 @@ if ($sub_total != 0)
"nowrap align=right width=15%");
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
-$tax_items = get_customer_trans_tax_details(11, $trans_id);
+$tax_items = get_trans_tax_details(11, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
label_row("" . _("TOTAL CREDIT") . "