X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=9daed892e5467bc1c7bad21ffc3a5afde6cf9d9d;hb=98a185d9959e4e273142042b354d42f77e013cdf;hp=9c6925f46246d6c7f9897651dc1a2e30a808e59d;hpb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 9c6925f4..9daed892 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -90,6 +90,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 	$order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'],
 	    $myrow['factor']);
 
+	$order->credit = $myrow['cur_credit'];
+
 	if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE)
 	{
 		$order->dimension_id = $myrow['dimension_id'];
@@ -104,8 +106,11 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
 	$myrow = db_fetch($result);
 
+	// FIX - implement editable contact selector in sales order 
+	$contact = get_branch_contacts($branch_id, 'order', $customer_id);
+
 	$order->set_branch($branch_id, $myrow["tax_group_id"],
-	$myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
+	$myrow["tax_group_name"], @$contact[0]["phone"], @$contact[0]["email"]);
 
 	$address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"]
 		: (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver);
@@ -132,15 +137,15 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
 function display_order_summary($title, &$order, $editable_items=false)
 {
-	global $table_style, $path_to_root, $SysPrefs;
+	global $SysPrefs;
 
 	display_heading($title);
 
     div_start('items_table');
-	start_table("$table_style colspan=7 width=90%");
+	start_table(TABLESTYLE, "colspan=7 width=90%");
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Delivered"),
-		_("Unit"), _("Price"), _("Discount %"), _("Total"), "");
+		_("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), "");
 
 	if ($order->trans_no == 0) {
 	unset( $th[3] );
@@ -235,7 +240,7 @@ function display_order_summary($title, &$order, $editable_items=false)
 
 	start_row();
 	label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
-	submit_cells('update', _("Update"), "colspan=2", _("Refresh"), true);
+	submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true);
 	end_row();
 
 	end_table();
@@ -252,9 +257,9 @@ function display_order_summary($title, &$order, $editable_items=false)
 
 function display_order_header(&$order, $editable, $date_text, $display_tax_group=false)
 {
-	global $table_style2, $Ajax, $SysPrefs;
+	global $Ajax, $SysPrefs;
 
-	start_outer_table("width=80% $table_style2");
+	start_outer_table(TABLESTYLE2, "width=80%");
 
 	table_section(1);
 	
@@ -360,14 +365,19 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
 	ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
 
+	table_section(2);
+
 	if (!is_company_currency($order->customer_currency))
 	{
-	    table_section(2);
-
 		label_row(_("Customer Currency:"), $order->customer_currency);
 		exchange_rate_display($order->customer_currency, get_company_currency(),
 			($editable ? $_POST['OrderDate'] : $order->document_date));
 	}
+
+	customer_credit_row($_POST['customer_id'], $order->credit);
+
+	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
+
 	table_section(3);
 
 	if (($order->trans_type != ST_CUSTDELIVERY) && ($order->pos != -1)) { // editable payment type
@@ -403,8 +413,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		$change_prices = 1;
 	}
 
-	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
-	
 	table_section(4);
 
 	if ($editable)
@@ -550,7 +558,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 	}
 	else
 	{
-		submit_cells('AddItem', _("Add Item"), "colspan=2",
+		submit_cells('AddItem', _("Add Item"), "colspan=2 align='center'",
 		    _('Add new item to document'), true);
 	}
 
@@ -561,14 +569,14 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 function display_delivery_details(&$order)
 {
-	global $table_style2, $Ajax;
+	global $Ajax;
 
 	div_start('delivery');	
 
 	if ($order->cash) {	// Direct payment sale
 		$Ajax->activate('items_table');
 		display_heading(_('Cash payment'));
-		start_table("$table_style2 width=60%");
+		start_table(TABLESTYLE2, "width=60%");
 		label_row(_("Deliver from Location:"), $order->location_name);
 
 		hidden('Location', $order->Location);
@@ -597,7 +605,7 @@ function display_delivery_details(&$order)
 			$delname = _("Required Delivery Date").':';
 		}
 		display_heading($title);
-		start_outer_table("$table_style2 width=90%");
+		start_outer_table(TABLESTYLE2, "width=90%");
 		table_section(1);
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null,