X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fview%2Fview_sales_order.php;h=a047b91c5093e16a11552970b0600b2e388d1ee3;hb=8bd22b7671d18cfdf01b8a0f3f66455d5de28014;hp=e717e4bed8033f551f636dc7c259850fab4bc8e2;hpb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;p=fa-stable.git
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index e717e4be..a047b91c 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_SALESTRANSVIEW';
+$path_to_root = "../..";
include_once($path_to_root . "/sales/includes/cart_class.inc");
include_once($path_to_root . "/includes/session.inc");
@@ -14,161 +23,174 @@ $js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 600);
-page(_("View Sales Order"), true, false, "", $js);
-
-display_heading(_("Sales Order") . " #" . $_GET['trans_no']);
-
-if (isset($_SESSION['Items']))
+if ($_GET['trans_type'] == ST_SALESQUOTE)
+{
+ page(_($help_context = "View Sales Quotation"), true, false, "", $js);
+ display_heading(sprintf(_("Sales Quotation #%d"),$_GET['trans_no']));
+}
+else
{
- unset ($_SESSION['Items']);
+ page(_($help_context = "View Sales Order"), true, false, "", $js);
+ display_heading(sprintf(_("Sales Order #%d"),$_GET['trans_no']));
}
-$_SESSION['Items'] = new cart;
+if (isset($_SESSION['View']))
+{
+ unset ($_SESSION['View']);
+}
-/*read in all the selected order into the Items cart */
-read_sales_order($_GET['trans_no'], $_SESSION['Items']);
+$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
start_table("$table_style2 width=95%", 5);
echo "
";
start_table("$table_style width=95%");
-label_row(_("Customer Name"), $_SESSION['Items']->customer_name, "class='tableheader2'",
+label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
"colspan=3");
-start_row();
-label_cells(_("Customer Order Ref."), $_SESSION['Items']->cust_ref, "class='tableheader2'");
-label_cells(_("Deliver To Branch"), $_SESSION['Items']->deliver_to, "class='tableheader2'");
+start_row();
+label_cells(_("Customer Order Ref."), $_SESSION['View']->cust_ref, "class='tableheader2'");
+label_cells(_("Deliver To Branch"), $_SESSION['View']->deliver_to, "class='tableheader2'");
end_row();
start_row();
-label_cells(_("Ordered On"), $_SESSION['Items']->orig_order_date, "class='tableheader2'");
-label_cells(_("Requested Delivery"), $_SESSION['Items']->delivery_date, "class='tableheader2'");
+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'");
+else
+ label_cells(_("Requested Delivery"), $_SESSION['View']->due_date, "class='tableheader2'");
end_row();
start_row();
-label_cells(_("Order Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'");
-label_cells(_("Deliver From Location"), $_SESSION['Items']->location_name, "class='tableheader2'");
+label_cells(_("Order Currency"), $_SESSION['View']->customer_currency, "class='tableheader2'");
+label_cells(_("Deliver From Location"), $_SESSION['View']->location_name, "class='tableheader2'");
end_row();
-label_row(_("Delivery Address"), nl2br($_SESSION['Items']->delivery_address),
+label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
"class='tableheader2'", "colspan=3");
-label_row(_("Telephone"), $_SESSION['Items']->phone, "class='tableheader2'", "colspan=3");
-label_row(_("E-mail"), "email . "'>" . $_SESSION['Items']->email . "",
+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 . "",
"class='tableheader2'", "colspan=3");
-label_row(_("Comments"), $_SESSION['Items']->Comments, "class='tableheader2'", "colspan=3");
+label_row(_("Comments"), $_SESSION['View']->Comments, "class='tableheader2'", "colspan=3");
end_table();
-echo " | ";
+if ($_GET['trans_type'] != ST_SALESQUOTE)
+{
+ echo " | ";
-start_table($table_style);
-display_heading2(_("Delivery Notes"));
+ start_table($table_style);
+ 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");
+ $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
+ table_header($th);
-$delivery_total = 0;
-$k = 0;
+ $result = get_related_documents(ST_CUSTDELIVERY, $_GET['trans_no']);
-while ($del_row = db_fetch($result))
-{
+ $delivery_total = 0;
+ $k = 0;
- alt_table_row_color($k);
+ while ($del_row = db_fetch($result))
+ {
- $this_total = $del_row["ov_freight"] + $del_row["ov_gst"] + $del_row["ov_amount"];
- $delivery_total += $this_total;
+ alt_table_row_color($k);
- label_cell(get_customer_trans_view_str($del_row["type"], $del_row["trans_no"]));
- label_cell($del_row["reference"]);
- label_cell(sql2date($del_row["tran_date"]));
- amount_cell($this_total);
- end_row();
+ $this_total = $del_row["ov_freight"]+ $del_row["ov_amount"] + $del_row["ov_freight_tax"] + $del_row["ov_gst"] ;
+ $delivery_total += $this_total;
-}
+ label_cell(get_customer_trans_view_str($del_row["type"], $del_row["trans_no"]));
+ label_cell($del_row["reference"]);
+ label_cell(sql2date($del_row["tran_date"]));
+ amount_cell($this_total);
+ end_row();
-label_row(null, number_format2($delivery_total,user_price_dec()), "", "colspan=4 align=right");
+ }
-end_table();
-echo " | ";
+ label_row(null, price_format($delivery_total), " ", "colspan=4 align=right");
-start_table($table_style);
-display_heading2(_("Sales Invoices"));
+ end_table();
+ echo " | ";
-$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
-table_header($th);
+ start_table($table_style);
+ display_heading2(_("Sales Invoices"));
-$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");
+ $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
+ table_header($th);
-$invoices_total = 0;
-$k = 0;
+ $result = get_related_documents(ST_SALESINVOICE, $_GET['trans_no']);
-while ($inv_row = db_fetch($result))
-{
+ $invoices_total = 0;
+ $k = 0;
- alt_table_row_color($k);
+ while ($inv_row = db_fetch($result))
+ {
- $this_total = $inv_row["ov_freight"] + $inv_row["ov_gst"] + $inv_row["ov_amount"];
- $invoices_total += $this_total;
+ alt_table_row_color($k);
- 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"]));
- amount_cell($this_total);
- end_row();
+ $this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"] + $inv_row["ov_gst"] + $inv_row["ov_amount"];
+ $invoices_total += $this_total;
-}
+ 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"]));
+ amount_cell($this_total);
+ end_row();
-label_row(null, number_format2($invoices_total,user_price_dec()), "", "colspan=4 align=right");
+ }
-end_table();
+ label_row(null, price_format($invoices_total), " ", "colspan=4 align=right");
-display_heading2(_("Credit Notes"));
+ end_table();
-start_table($table_style);
-$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
-table_header($th);
+ display_heading2(_("Credit Notes"));
-$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");
+ start_table($table_style);
+ $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
+ table_header($th);
-$credits_total = 0;
-$k = 0;
+ $result = get_related_documents(ST_CUSTCREDIT, $_GET['trans_no']);
-while ($credits_row = db_fetch($result))
-{
+ $credits_total = 0;
+ $k = 0;
- alt_table_row_color($k);
+ while ($credits_row = db_fetch($result))
+ {
- $this_total = $credits_row["ov_freight"] + $credits_row["ov_gst"] + $credits_row["ov_amount"];
- $credits_total += $this_total;
+ alt_table_row_color($k);
- label_cell(get_customer_trans_view_str($credits_row["type"], $credits_row["trans_no"]));
- label_cell($credits_row["reference"]);
- label_cell(sql2date($credits_row["tran_date"]));
- amount_cell(-$this_total);
- end_row();
+ $this_total = $credits_row["ov_freight"] + $credits_row["ov_freight_tax"] + $credits_row["ov_gst"] + $credits_row["ov_amount"];
+ $credits_total += $this_total;
-}
+ label_cell(get_customer_trans_view_str($credits_row["type"], $credits_row["trans_no"]));
+ label_cell($credits_row["reference"]);
+ label_cell(sql2date($credits_row["tran_date"]));
+ amount_cell(-$this_total);
+ end_row();
-label_row(null, "" . number_format2(-$credits_total,user_price_dec()) . "",
- "", "colspan=4 align=right");
+ }
+ label_row(null, "" . price_format(-$credits_total) . "",
+ " ", "colspan=4 align=right");
-end_table();
-echo " |
";
+ end_table();
-end_table();
+ echo "";
+ end_table();
+}
echo "