X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=1c3d95b43f68c6d901f8943f48ef35d4ab300289;hb=70840a5223cf5c9f31d360946225bbad6a2a1943;hp=a31f4399574bacaf153e579a6848dc8c17ec6276;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index a31f4399..1c3d95b4 100644
--- 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)
@@ -39,9 +39,9 @@ if (isset($_SESSION['View']))
unset ($_SESSION['View']);
}
-$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
+$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no']);
-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 "
";
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
"colspan=3");
start_row();
@@ -93,7 +93,7 @@ label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
"class='tableheader2'", "colspan=3");
label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3");
label_row(_("Telephone"), $_SESSION['View']->phone, "class='tableheader2'", "colspan=3");
-;label_row(_("E-mail"), "email . "'>" . $_SESSION['View']->email . "",
+label_row(_("E-mail"), "email . "'>" . $_SESSION['View']->email . "",
"class='tableheader2'", "colspan=3");
label_row(_("Comments"), nl2br($_SESSION['View']->Comments), "class='tableheader2'", "colspan=3");
end_table();
@@ -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']);
-?>
|