Moving bugfixes from 2.3 to 2.4 and updated install languages for Denmark and Sweden.

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

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index a31f4399574bacaf153e579a6848dc8c17ec6276..5aa606d91f06744b0ca9fb450478f9a3c5c4fddf 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -20,7 +20,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);
 
 if ($_GET['trans_type'] == ST_SALESQUOTE)
@@ -41,7 +41,7 @@ if (isset($_SESSION['View']))
 
 $_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
 
-start_table(TABLESTYLE2, "width=95%", 5);
+start_table(TABLESTYLE2, "width='95%'", 5);
 
 if ($_GET['trans_type'] != ST_SALESQUOTE)
 {
@@ -56,7 +56,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
 echo "<tr valign=top><td>";
 
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
 label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
        "colspan=3");
 start_row();
@@ -215,7 +215,7 @@ if ($_SESSION['View']->so_type == 1)
        display_note(_("This Sales Order is used as a Template."), 0, 0, "class='currentfg'");
 display_heading2(_("Line Details"));
 
-start_table(TABLESTYLE, "colspan=9 width=95%");
+start_table(TABLESTYLE, "width='95%'");
 $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
        _("Price"), _("Discount"), _("Total"), _("Quantity Delivered"));
 table_header($th);
@@ -242,8 +242,9 @@ foreach ($_SESSION['View']->line_items as $stock_item) {
        end_row();
 }
 
-label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
-       "align=right colspan=6", "nowrap align=right", 1);
+if ($_SESSION['View']->freight_cost != 0.0)
+       label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
+               "align=right colspan=6", "nowrap align=right", 1);
 
 $sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost;
 
@@ -268,4 +269,3 @@ display_allocations_to(PT_CUSTOMER, $_SESSION['View']->customer_id, $_GET['trans
 
 end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']);
 
-?>