X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=9d7eb795f3a76b557fd45af329fe56734ec42b60;hb=c061e1b478cb41d22c23627ddff39a4ea7d849ed;hp=6014aeaf50b9a27eef7918a97731256b4b97f14f;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 6014aeaf..9d7eb795 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -39,7 +39,7 @@ 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);
@@ -67,6 +67,8 @@ start_row();
label_cells(_("Ordered On"), $_SESSION['View']->document_date, "class='tableheader2'");
if ($_GET['trans_type'] == ST_SALESQUOTE)
label_cells(_("Valid until"), $_SESSION['View']->due_date, "class='tableheader2'");
+elseif ($_SESSION['View']->reference == "auto")
+ label_cells(_("Due Date"), $_SESSION['View']->due_date, "class='tableheader2'");
else
label_cells(_("Requested Delivery"), $_SESSION['View']->due_date, "class='tableheader2'");
end_row();
@@ -93,9 +95,9 @@ 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");
+label_row(_("Comments"), !empty($_SESSION['View']->Comments) ? nl2br($_SESSION['View']->Comments) : "", "class='tableheader2'", "colspan=3");
end_table();
if ($_GET['trans_type'] != ST_SALESQUOTE)
@@ -181,7 +183,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
$credits_total = 0;
- if (get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
+ if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
$k = 0;
while ($credits_row = db_fetch($result))
@@ -242,8 +244,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;