X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=ff88393cf4c5b86e9f2fae197397ee7f0efaba14;hb=bac6bc5d595dab716bb3c65e451e81d724b8de2d;hp=f9d0629c70920f27c789a7333c9a0278213bfcf7;hpb=2fc77410bad647c6888a6f82ca4efaef41d9d95b;p=fa-stable.git

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index f9d0629c..ff88393c 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -74,6 +74,7 @@ label_cells(_("Order Currency"), $_SESSION['View']->customer_currency, "class='t
 label_cells(_("Deliver From Location"), $_SESSION['View']->location_name, "class='tableheader2'");
 end_row();
 
+label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
 label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
 	"class='tableheader2'", "colspan=3");
 label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3");
@@ -94,26 +95,26 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 	$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
 	table_header($th);
 
-	$result = get_related_documents(ST_CUSTDELIVERY, $_GET['trans_no']);
-
-	$delivery_total = 0;
-	$k = 0;
 	$dn_numbers = array();
-	
-	while ($del_row = db_fetch($result))
-	{
+	$delivery_total = 0;
 
-		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;
+	if ($result = get_sales_child_documents(ST_SALESORDER, $_GET['trans_no'])) {
 
-		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();
+		$k = 0;
+		while ($del_row = db_fetch($result))
+		{
 
+			alt_table_row_color($k);
+			$dn_numbers[] = $del_row["trans_no"];
+			$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");
@@ -127,32 +128,28 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 	$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)).")";
-
-	$result = get_related_documents(ST_SALESINVOICE, $_GET['trans_no']);
-
-	$invoices_total = 0;
-	$k = 0;
 	$inv_numbers = array();
+	$invoices_total = 0;
 
-	while ($inv_row = db_fetch($result))
-	{
+	if ($result = get_sales_child_documents(ST_CUSTDELIVERY, $dn_numbers)) {
 
-		alt_table_row_color($k);
+		$k = 0;
 
-		$this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"]  + $inv_row["ov_gst"] + $inv_row["ov_amount"];
-		$invoices_total += $this_total;
+		while ($inv_row = db_fetch($result))
+		{
+			alt_table_row_color($k);
 
-		$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"]));
-		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;
 
+			$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"]));
+			amount_cell($this_total);
+			end_row();
+		}
 	}
-
 	label_row(null, price_format($invoices_total), " ", "colspan=4 align=right");
 
 	end_table();
@@ -162,10 +159,10 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 	start_table(TABLESTYLE);
 	$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
 	table_header($th);
-	if(count($inv_numbers)) {
-		$result = get_related_credits($inv_numbers);
-
-		$credits_total = 0;
+	
+	$credits_total = 0;
+	
+	if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
 		$k = 0;
 
 		while ($credits_row = db_fetch($result))
@@ -184,9 +181,9 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
 		}
 
-		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();
 
@@ -226,15 +223,26 @@ foreach ($_SESSION['View']->line_items as $stock_item) {
 	end_row();
 }
 
-$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", 1);
-label_row(_("Total Order Value"), $display_total, "align=right colspan=6",
+
+$sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost;
+
+$display_sub_tot = price_format($sub_tot);
+
+label_row(_("Sub Total"), $display_sub_tot, "align=right colspan=6",
 	"nowrap align=right", 1);
 
+$taxes = $_SESSION['View']->get_taxes();
+
+$tax_total = display_edit_tax_items($taxes, 6, $_SESSION['View']->tax_included,2);
+
+$display_total = price_format($sub_tot + $tax_total);
+
+start_row();
+label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
+label_cell('', "colspan=2");
+end_row();
 end_table(2);
 
 end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']);