From 31a8106c5c716ccf24a16c6704497fd819daf762 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 21 Oct 2010 10:07:00 +0000 Subject: [PATCH] Code cleanup --- sales/view/view_dispatch.php | 7 +++---- sales/view/view_invoice.php | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php index 14a7e7e2..7ed8c304 100644 --- a/sales/view/view_dispatch.php +++ b/sales/view/view_dispatch.php @@ -142,17 +142,16 @@ if (db_num_rows($result) > 0) amount_cell($value); end_row(); } //end while there are line items to print out + $display_sub_tot = price_format($sub_total); + label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right", + "nowrap align=right width=15%"); } else display_note(_("There are no line items on this dispatch."), 1, 2); -$display_sub_tot = price_format($sub_total); $display_freight = price_format($myrow["ov_freight"]); -/*Print out the delivery note text entered */ -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"); $tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $trans_id); diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php index 35e1eba9..61fc0b56 100644 --- a/sales/view/view_invoice.php +++ b/sales/view/view_invoice.php @@ -144,16 +144,16 @@ if (db_num_rows($result) > 0) end_row(); } //end while there are line items to print out + $display_sub_tot = price_format($sub_total); + label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right", + "nowrap align=right width=15%"); } else display_note(_("There are no line items on this invoice."), 1, 2); -$display_sub_tot = price_format($sub_total); $display_freight = price_format($myrow["ov_freight"]); /*Print out the invoice text entered */ -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"); $tax_items = get_trans_tax_details(ST_SALESINVOICE, $trans_id); -- 2.30.2