[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 f7e8c2995f5362eecc6c1c2ff3f691aabe2109c1..a6f709801c4bb5e34d517a612367a540775769b9 100644 (file)
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -39,11 +39,11 @@ $branch = get_branch($myrow["branch_code"]);
 display_heading("<font color=red>" . sprintf(_("CREDIT NOTE #%d"), $trans_id). "</font>");
 echo "<br>";
 
-start_table(TABLESTYLE2, "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(TABLESTYLE, "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(TABLESTYLE, "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(TABLESTYLE, "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'");
@@ -83,7 +83,7 @@ $sub_total = 0;
 
 $result = get_customer_trans_details(ST_CUSTCREDIT, $trans_id);
 
-start_table(TABLESTYLE, "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,8 +133,12 @@ $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(ST_CUSTCREDIT, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);