[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index d36df28296a499e8c0dc38610185f9211fd968ff..a6f709801c4bb5e34d517a612367a540775769b9 100644 (file)
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -19,9 +19,9 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-page(_("View Credit Note"), true, false, "", $js);
+page(_($help_context = "View Credit Note"), true, false, "", $js);
 
 if (isset($_GET["trans_no"]))
 {
@@ -32,18 +32,18 @@ elseif (isset($_POST["trans_no"]))
        $trans_id = $_POST["trans_no"];
 }
 
-$myrow = get_customer_trans($trans_id, 11);
+$myrow = get_customer_trans($trans_id, ST_CUSTCREDIT);
 
 $branch = get_branch($myrow["branch_code"]);
 
 display_heading("<font color=red>" . sprintf(_("CREDIT NOTE #%d"), $trans_id). "</font>");
 echo "<br>";
 
-start_table("$table_style2 width=95%");
+start_table(TABLESTYLE2, "width='95%'");
 echo "<tr valign=top><td>"; // outer table
 
 /*Now the customer charged to details in a sub table*/
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Customer"));
 table_header($th);
 
@@ -54,7 +54,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Branch"));
 table_header($th);
 
@@ -63,7 +63,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width='100%'");
 start_row();
 label_cells(_("Ref"), $myrow["reference"], "class='tableheader2'");
 label_cells(_("Date"), sql2date($myrow["tran_date"]), "class='tableheader2'");
@@ -73,7 +73,7 @@ start_row();
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
 label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'");
 end_row();
-comments_display_row(11, $trans_id);
+comments_display_row(ST_CUSTCREDIT, $trans_id);
 end_table();
 
 echo "</td></tr>";
@@ -81,9 +81,9 @@ end_table(1); // outer table
 
 $sub_total = 0;
 
-$result = get_customer_trans_details(11, $trans_id);
+$result = get_customer_trans_details(ST_CUSTCREDIT, $trans_id);
 
-start_table("$table_style width=95%");
+start_table(TABLESTYLE, "width='95%'");
 
 if (db_num_rows($result) > 0)
 {
@@ -126,7 +126,6 @@ else
        display_note(_("There are no line items on this credit note."), 1, 2);
 
 $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 = price_format($credit_total);
@@ -134,24 +133,27 @@ $display_total = price_format($credit_total);
 /*Print out the invoice text entered */
 if ($sub_total != 0)
        label_row(_("Sub Total"), $display_sub_tot, "colspan=6 align=right",
-               "nowrap align=right width=15%");
-label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
+               "nowrap align=right width='15%'");
+if ($myrow["ov_freight"] != 0.0)
+{
+       $display_freight = price_format($myrow["ov_freight"]);
+       label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
+}
 
-$tax_items = get_trans_tax_details(11, $trans_id);
+$tax_items = get_trans_tax_details(ST_CUSTCREDIT, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);
 
 label_row("<font color=red>" . _("TOTAL CREDIT") . "</font",
        "<font color=red>$display_total</font>", "colspan=6 align=right", "nowrap align=right");
 end_table(1);
 
-$voided = is_voided_display(11, $trans_id, _("This credit note has been voided."));
+$voided = is_voided_display(ST_CUSTCREDIT, $trans_id, _("This credit note has been voided."));
 
 if (!$voided)
-       display_allocations_from(payment_person_types::customer(),
-               $myrow['debtor_no'], 11, $trans_id, $credit_total);
+       display_allocations_from(PT_CUSTOMER,
+               $myrow['debtor_no'], ST_CUSTCREDIT, $trans_id, $credit_total);
 
 /* end of check to see that there was an invoice record to print */
 
-end_page(true);
+end_page(true, false, false, ST_CUSTCREDIT, $trans_id);
 
-?>
\ No newline at end of file