X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=13bebb09beec97d4fcb670a17d68c6bcfe8123c6;hb=082b0f00ec5292669a82a0c611ef67650282a7c4;hp=a1b638621e475ffc0ff3efb63e73f2429321d925;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index a1b63862..13bebb09 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -16,25 +16,22 @@ if ($use_popup_windows)
 
 page(_("View Sales Order"), true, false, "", $js);
 
-display_heading(_("Sales Order") . " #" . $_GET['trans_no']);
+display_heading(sprintf(_("Sales Order #%d"),$_GET['trans_no']));
 
 if (isset($_SESSION['Items']))
 {
 	unset ($_SESSION['Items']);
 }
 
-$_SESSION['Items'] = new cart;
-
-/*read in all the selected order into the Items cart  */
-read_sales_order($_GET['trans_no'], $_SESSION['Items']);
+$_SESSION['Items'] = new Cart(30, $_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(_("Sales Invoices"));
+display_heading2(_("Deliveries"));
 echo "</td><td>";
-display_heading2(_("Credit Notes"));
+display_heading2(_("Invoices/Credits"));
 echo "</td></tr>";
 
 echo "<tr valign=top><td>";
@@ -47,8 +44,8 @@ label_cells(_("Customer Order Ref."), $_SESSION['Items']->cust_ref, "class='tabl
 label_cells(_("Deliver To Branch"), $_SESSION['Items']->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['Items']->document_date, "class='tableheader2'");
+label_cells(_("Requested Delivery"), $_SESSION['Items']->due_date, "class='tableheader2'");
 end_row();
 start_row();
 label_cells(_("Order Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'");
@@ -66,6 +63,40 @@ end_table();
 echo "</td><td valign='top'>";
 
 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");
+
+$delivery_total = 0;
+$k = 0;
+
+while ($del_row = db_fetch($result)) 
+{
+
+	alt_table_row_color($k);
+
+	$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'>";
+
+start_table($table_style);
+display_heading2(_("Sales Invoices"));
 
 $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
 table_header($th);
@@ -81,7 +112,7 @@ while ($inv_row = db_fetch($result))
 
 	alt_table_row_color($k);
 
-	$this_total = $inv_row["ov_freight"] + $inv_row["ov_gst"] + $inv_row["ov_amount"];
+	$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"]));
@@ -92,11 +123,12 @@ while ($inv_row = db_fetch($result))
 
 }
 
-label_row(null, number_format2($invoices_total,user_price_dec()), "", "colspan=4 align=right");
+label_row(null, price_format($invoices_total), "", "colspan=4 align=right");
 
 end_table();
 
-echo "</td><td valign='top'>";
+display_heading2(_("Credit Notes"));
+
 start_table($table_style);
 $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
 table_header($th);
@@ -112,7 +144,7 @@ while ($credits_row = db_fetch($result))
 
 	alt_table_row_color($k);
 
-	$this_total = $credits_row["ov_freight"] + $credits_row["ov_gst"] + $credits_row["ov_amount"];
+	$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"]));
@@ -123,7 +155,7 @@ while ($credits_row = db_fetch($result))
 
 }
 
-label_row(null, "<font color=red>" . number_format2(-$credits_total,user_price_dec()) . "</font>",
+label_row(null, "<font color=red>" . price_format(-$credits_total) . "</font>",
 	"", "colspan=4 align=right");
 
 
@@ -145,7 +177,8 @@ $k = 0;  //row colour counter
 
 foreach ($_SESSION['Items']->line_items as $stock_item) {
 
-	$line_total =	$stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent);
+	$line_total = round($stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent), 
+	   user_price_dec());
 
 	alt_table_row_color($k);
 
@@ -157,17 +190,17 @@ foreach ($_SESSION['Items']->line_items as $stock_item) {
 	amount_cell($stock_item->discount_percent * 100);
 	amount_cell($line_total);
 	
-	qty_cell($stock_item->qty_inv);
+	qty_cell($stock_item->qty_done);
 	end_row();
 }
 
 $items_total = $_SESSION['Items']->get_items_total();
 
-$display_total = number_format2($items_total + $_SESSION['Items']->freight_cost,user_price_dec());
+$display_total = price_format($items_total + $_SESSION['Items']->freight_cost);
 
-label_row(_("Shipping"), number_format2($_SESSION['Items']->freight_cost,user_price_dec()),
+label_row(_("Shipping"), price_format($_SESSION['Items']->freight_cost),
 	"align=right colspan=6", "nowrap align=right");
-label_row(_("Total Excluding Tax"), $display_total, "align=right colspan=6",
+label_row(_("Total Order Value"), $display_total, "align=right colspan=6",
 	"nowrap align=right");
 
 end_table(2);