The Customer Branch Sales Account now overrides the Item Sales Accounts if a Sales...

[fa-stable.git] / sales / view / view_credit.php

diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index e1e7326cbfd52352655830c60b30ed280f1c4e36..ec14f0313f250e6d5356781cfdb42901ddd9e939 100644 (file)
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -90,7 +90,8 @@ if (db_num_rows($result) > 0)
 
                alt_table_row_color($k);
 
-               $value = ((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)
@@ -99,7 +100,7 @@ if (db_num_rows($result) > 0)
                } 
                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"]);
@@ -115,11 +116,11 @@ if (db_num_rows($result) > 0)
 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"]);
 
 $credit_total = $myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"];
-$display_total = number_format2($credit_total,user_price_dec());
+$display_total = price_format($credit_total);
 
 /*Print out the invoice text entered */
 if ($sub_total != 0)