X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=6f70b4173e6fa9fa9130c0335b14bb2b0222615f;hb=55c51a9db64c9fe402d615e204824f8e4cd6a310;hp=920b1fc7d4cd65e4f3e7c229a569e28c99aafd0c;hpb=a7df4f0b55feab93085f80b53420f46bf07ffceb;p=fa-stable.git
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 920b1fc7..6f70b417 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -23,14 +23,14 @@ $js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 600);
-if ($_GET['trans_type'] == 32)
+if ($_GET['trans_type'] == ST_SALESQUOTE)
{
- page(_("View Sales Quotation"), true, false, "", $js);
+ page(_($help_context = "View Sales Quotation"), true, false, "", $js);
display_heading(sprintf(_("Sales Quotation #%d"),$_GET['trans_no']));
}
else
{
- page(_("View Sales Order"), true, false, "", $js);
+ page(_($help_context = "View Sales Order"), true, false, "", $js);
display_heading(sprintf(_("Sales Order #%d"),$_GET['trans_no']));
}
@@ -41,10 +41,10 @@ if (isset($_SESSION['View']))
$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
-start_table("$table_style2 width=95%", 5);
+start_table(TABLESTYLE2, "width=95%", 5);
echo "
";
-start_table("$table_style width=95%");
+start_table(TABLESTYLE, "width=95%");
label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
"colspan=3");
start_row();
@@ -64,7 +64,7 @@ label_cells(_("Deliver To Branch"), $_SESSION['View']->deliver_to, "class='table
end_row();
start_row();
label_cells(_("Ordered On"), $_SESSION['View']->document_date, "class='tableheader2'");
-if ($_GET['trans_type'] == 32)
+if ($_GET['trans_type'] == ST_SALESQUOTE)
label_cells(_("Valid until"), $_SESSION['View']->due_date, "class='tableheader2'");
else
label_cells(_("Requested Delivery"), $_SESSION['View']->due_date, "class='tableheader2'");
@@ -83,27 +83,28 @@ label_row(_("E-mail"), "email . "'>" . $_
label_row(_("Comments"), $_SESSION['View']->Comments, "class='tableheader2'", "colspan=3");
end_table();
-if ($_GET['trans_type'] != 32)
+if ($_GET['trans_type'] != ST_SALESQUOTE)
{
echo " | ";
- start_table($table_style);
+ start_table(TABLESTYLE);
display_heading2(_("Delivery Notes"));
+
$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
table_header($th);
- $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=13 AND order_=" . $_GET['trans_no'];
- $result = db_query($sql,"The related delivery notes could not be retreived");
+ $result = get_related_documents(ST_CUSTDELIVERY, $_GET['trans_no']);
$delivery_total = 0;
$k = 0;
-
+ $dn_numbers = array();
+
while ($del_row = db_fetch($result))
{
alt_table_row_color($k);
-
+ $dn_numbers[] = $del_row["trans_link"];
$this_total = $del_row["ov_freight"]+ $del_row["ov_amount"] + $del_row["ov_freight_tax"] + $del_row["ov_gst"] ;
$delivery_total += $this_total;
@@ -115,22 +116,25 @@ if ($_GET['trans_type'] != 32)
}
- label_row(null, price_format($delivery_total), "", "colspan=4 align=right");
+ label_row(null, price_format($delivery_total), " ", "colspan=4 align=right");
end_table();
echo " | ";
- start_table($table_style);
+ start_table(TABLESTYLE);
display_heading2(_("Sales Invoices"));
$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
table_header($th);
+
+ $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE
+ ." AND trans_no IN(". implode(',', array_values($dn_numbers)).")";
- $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=10 AND order_=" . $_GET['trans_no'];
- $result = db_query($sql,"The related invoices could not be retreived");
+ $result = get_related_documents(ST_SALESINVOICE, $_GET['trans_no']);
$invoices_total = 0;
$k = 0;
+ $inv_numbers = array();
while ($inv_row = db_fetch($result))
{
@@ -140,6 +144,7 @@ if ($_GET['trans_type'] != 32)
$this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"] + $inv_row["ov_gst"] + $inv_row["ov_amount"];
$invoices_total += $this_total;
+ $inv_numbers[] = $inv_row["trans_no"];
label_cell(get_customer_trans_view_str($inv_row["type"], $inv_row["trans_no"]));
label_cell($inv_row["reference"]);
label_cell(sql2date($inv_row["tran_date"]));
@@ -148,18 +153,17 @@ if ($_GET['trans_type'] != 32)
}
- label_row(null, price_format($invoices_total), "", "colspan=4 align=right");
+ label_row(null, price_format($invoices_total), " ", "colspan=4 align=right");
end_table();
display_heading2(_("Credit Notes"));
- start_table($table_style);
+ start_table(TABLESTYLE);
$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
table_header($th);
- $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=11 AND order_=" . $_GET['trans_no'];
- $result = db_query($sql,"The related credit notes could not be retreived");
+ $result = get_related_credits($inv_numbers);
$credits_total = 0;
$k = 0;
@@ -181,7 +185,7 @@ if ($_GET['trans_type'] != 32)
}
label_row(null, "" . price_format(-$credits_total) . "",
- "", "colspan=4 align=right");
+ " ", "colspan=4 align=right");
end_table();
@@ -195,7 +199,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("colspan=9 width=95% $table_style");
+start_table(TABLESTYLE, "colspan=9 width=95%");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
_("Price"), _("Discount"), _("Total"), _("Quantity Delivered"));
table_header($th);
@@ -227,12 +231,12 @@ $items_total = $_SESSION['View']->get_items_total();
$display_total = price_format($items_total + $_SESSION['View']->freight_cost);
label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
- "align=right colspan=6", "nowrap align=right");
+ "align=right colspan=6", "nowrap align=right", 1);
label_row(_("Total Order Value"), $display_total, "align=right colspan=6",
- "nowrap align=right");
+ "nowrap align=right", 1);
end_table(2);
-end_page(true);
+end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']);
?>
|