Additional access control related ui helpers added: check_edit_access, access_post...

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

diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index 14a7e7e249ed4cf5cfa045d121fc1caf475351a1..d8a7cc95e54b21f6163d699bdd7115fffd30811b 100644 (file)
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_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, 600);
 page(_($help_context = "View Sales Dispatch"), true, false, "", $js);
 
@@ -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);
@@ -168,4 +167,3 @@ is_voided_display(ST_CUSTDELIVERY, $trans_id, _("This dispatch has been voided."
 
 end_page(true, false, false, ST_CUSTDELIVERY, $trans_id);
 
-?>
\ No newline at end of file