Final rewriting of sales module

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

diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index 1e98a8e56f11e81a88e2c4dd3ebd2fc1c9fce689..e1e7326cbfd52352655830c60b30ed280f1c4e36 100644 (file)
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -27,7 +27,7 @@ $myrow = get_customer_trans($trans_id, 11);
 
 $branch = get_branch($myrow["branch_code"]);
 
-display_heading("<font color=red>" . _("CREDIT NOTE") . " #$trans_id</font>");
+display_heading("<font color=red>" . sprintf(_("CREDIT NOTE #%d"), $trans_id). "</font>");
 echo "<br>";
 
 start_table("$table_style2 width=95%");
@@ -90,8 +90,8 @@ if (db_num_rows($result) > 0)
 
                alt_table_row_color($k);
 
-               $net = ((1 - $myrow2["discount_percent"]) * $myrow2["FullUnitPrice"] * $myrow2["quantity"]);
-               $sub_total += $net;
+               $value = ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]);
+               $sub_total += $value;
 
                if ($myrow2["discount_percent"] == 0)
                {
@@ -106,9 +106,9 @@ if (db_num_rows($result) > 0)
                label_cell($myrow2["StockDescription"]);
                qty_cell($myrow2["quantity"]);
                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
 } 
@@ -116,10 +116,9 @@ 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_freight = number_format2($myrow["ov_freight"],user_price_dec());
 
-$display_tax = number_format2(-$myrow["ov_gst"],user_price_dec());
-$credit_total = -$myrow["ov_freight"]-$myrow["ov_gst"]-$myrow["ov_amount"];
+$credit_total = $myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"];
 $display_total = number_format2($credit_total,user_price_dec());
 
 /*Print out the invoice text entered */