X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fview%2Fview_credit.php;h=7c2442e5f3c024a57d22cdad4289f33e4f9dbcb2;hb=3048a598d7dbb82b4db231a6005425020ede7c15;hp=f7e8c2995f5362eecc6c1c2ff3f691aabe2109c1;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git
diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index f7e8c299..7c2442e5 100644
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -39,11 +39,11 @@ $branch = get_branch($myrow["branch_code"]);
display_heading("" . sprintf(_("CREDIT NOTE #%d"), $trans_id). "");
echo "
";
-start_table(TABLESTYLE2, "width=95%");
+start_table(TABLESTYLE2, "width='95%'");
echo "
"; // 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 " | "; // 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 " | "; // 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'");
@@ -71,7 +71,7 @@ label_cells(_("Currency"), $myrow["curr_code"], "class='tableheader2'");
end_row();
start_row();
label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
-label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'");
+label_cells(_("Shipping"), $myrow["shipping"], "class='tableheader2'");
end_row();
comments_display_row(ST_CUSTCREDIT, $trans_id);
end_table();
@@ -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);
|