X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=c8a212e33447f503f7343c2f74eaca2572f57a1a;hb=953b3605810699962454b624e19bd0779b17e7f7;hp=77d411751759567650bc5fa7142d7be51636746b;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 77d41175..c8a212e3 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
-$path_to_root="../..";
+$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");
@@ -23,24 +23,34 @@ $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 
-page(_("View Sales Order"), true, false, "", $js);
-
-display_heading(sprintf(_("Sales Order #%d"),$_GET['trans_no']));
+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
+{
+	page(_($help_context = "View Sales Order"), true, false, "", $js);
+	display_heading(sprintf(_("Sales Order #%d"),$_GET['trans_no']));
+}
 
 if (isset($_SESSION['View']))
 {
 	unset ($_SESSION['View']);
 }
 
-$_SESSION['View'] = new Cart(30, $_GET['trans_no'], true);
+$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
 
 start_table("$table_style2 width=95%", 5);
 echo "<tr valign=top><td>";
 display_heading2(_("Order Information"));
-echo "</td><td>";
-display_heading2(_("Deliveries"));
-echo "</td><td>";
-display_heading2(_("Invoices/Credits"));
+if ($_GET['trans_type'] != ST_SALESQUOTE)
+{
+	echo "</td><td>";
+	display_heading2(_("Deliveries"));
+	echo "</td><td>";
+	display_heading2(_("Invoices/Credits"));
+}	
 echo "</td></tr>";
 
 echo "<tr valign=top><td>";
@@ -54,7 +64,10 @@ 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'");
-label_cells(_("Requested Delivery"), $_SESSION['View']->due_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['View']->customer_currency, "class='tableheader2'");
@@ -63,118 +76,124 @@ end_row();
 
 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"), "<a href='mailto:" . $_SESSION['View']->email . "'>" . $_SESSION['View']->email . "</a>",
 	"class='tableheader2'", "colspan=3");
 label_row(_("Comments"), $_SESSION['View']->Comments, "class='tableheader2'", "colspan=3");
 end_table();
 
-echo "</td><td valign='top'>";
+if ($_GET['trans_type'] != ST_SALESQUOTE)
+{
+	echo "</td><td valign='top'>";
 
-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;
+	$sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_CUSTDELIVERY." AND order_=".db_escape($_GET['trans_no']);
+	$result = db_query($sql,"The related delivery notes could not be retreived");
 
-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_amount"] + $del_row["ov_freight_tax"]  + $del_row["ov_gst"] ;
-	$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, price_format($delivery_total), "", "colspan=4 align=right");
+	}
 
-end_table();
-echo "</td><td valign='top'>";
+	label_row(null, price_format($delivery_total), " ", "colspan=4 align=right");
 
-start_table($table_style);
-display_heading2(_("Sales Invoices"));
+	end_table();
+	echo "</td><td valign='top'>";
 
-$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;
+	$sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($_GET['trans_no']);
+	$result = db_query($sql,"The related invoices could not be retreived");
 
-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_freight_tax"]  + $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, price_format($invoices_total), "", "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;
+	$sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_CUSTCREDIT." AND order_=".db_escape($_GET['trans_no']);
+	$result = db_query($sql,"The related credit notes could not be retreived");
 
-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_freight_tax"]  + $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, "<font color=red>" . price_format(-$credits_total) . "</font>",
-	"", "colspan=4 align=right");
+	}
 
+	label_row(null, "<font color=red>" . price_format(-$credits_total) . "</font>",
+		" ", "colspan=4 align=right");
 
-end_table();
 
-echo "</td></tr>";
+	end_table();
 
-end_table();
+	echo "</td></tr>";
 
+	end_table();
+}
 echo "<center>";
+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");
@@ -209,9 +228,9 @@ $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);