X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=order_lines_view.php;h=e1366261e62fa2702f57fd929e3563a3ca40c94d;hb=3df7c3277a8c0502dca5cfeb32d63db1bef67267;hp=4129e15f1bad5ee681caed18e54d87a0c4c32b54;hpb=a13270c348c41972ac58d852d4dfded3aa8ef441;p=order_line_extra.git

diff --git a/order_lines_view.php b/order_lines_view.php
index 4129e15..e136626 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -23,6 +23,9 @@ add_access_extensions();
 
 $_SESSION['page_title'] = _($help_context = "Edit lines extra parameters");
 
+update_extra_order_details();
+
+
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 600);
@@ -37,7 +40,19 @@ start_form();
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-customer_list_cells(_("Select a customer: "), 'customer_id', false, false, true);
+
+if(!isset($_POST['customer_id'])) {
+	if(isset($_GET['customer_id'])) {
+		$customer_id = $_GET['customer_id'];
+		$_POST['customer_id'] = $customer_id;
+	}
+else $customer_id = null;
+
+}
+else {
+	$customer_id = $_POST['customer_id'];
+}
+customer_list_cells(_("Select a customer: "), 'customer_id', $customer_id, true, true);
 
 
 
@@ -52,21 +67,31 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$customer_id = $_POST['customer_id'];
-if(isset($customer_id)) {
-	$sql = get_order_details_extra($customer_id);
-
-
+if($customer_id) {
+	$sql = get_order_details_extra($customer_id, 'DEF');
 	$cols = array(
 		'detail_id' => 'skip'
-	,	_("Order #") => array('fun'=>'view_link', 'ord' => '')
-	,_("Item Code") => array('ord' => '')
-		,_("Quantity") => array('type' => 'qty')
-,_("Required Date") => array('fun' => 'input_date_details')
-,_("Comment") => array('fun' => 'input_comment_details')
+		,	_("Order #") => array('fun'=>'view_link', 'ord' => '')
+		,_("Item Code") => array('ord' => '', 'fun' => 'item_link')
+		,_("Quantity") => array('type' => 'qty', 'dec' => 0)
+		,_("Available") => array('type' => 'qty', 'dec' => 0, 'ord' => '')
+	,_("Required Date") => array('fun' => 'input_date_details', 'ord' => '')
+	,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '')
 	);
 }
 else {
+	$sql = get_order_summary();
+	$cols = array(
+	'customer id' => 'skip',
+_("Customer") => array('ord' => '', 'fun' => 'customer_link'),
+_("Branch") => array('ord' => ''),
+_("Delivery Date") => array('ord' => '', 'type' => 'date'),
+_("Quantity") => array('ord' => '', 'type' => 'qty', 'dec' => 0),
+_("Amount") => array('ord' => '', 'type' => 'amount'),
+_("required date") => array('ord' => '', 'type' => 'date'),
+_("Comments") => array('ord' => '', 'fun' => 'aggregate_comment'),
+_("comment 2 ") =>  'skip'
+	);
 }
 
 
@@ -77,9 +102,31 @@ $table->width = "80%";
 display_db_pager($table);
 
 br(1);
-submit_center_first('Update', _("Update"), true, '', 'default', true);
-submit_center_last('Cancel', _("Cancel"), true, '', 'cancel', true);
+submit_center_first('Update', _("Update"), '', 'default', false);
+submit_center_last('Cancel', _("Cancel"), '', 'cancel', false);
 
 	end_form();
 	end_page();
 ?>
+<style>
+span.tooltip{ display:none;}
+span.tooltip {
+      position: absolute;
+			right: -0px;
+			top: 20px;
+      width: 200px;
+      color: rgb(113, 157, 171);
+      background: rgb(255, 255, 255);
+      border: 1px solid rgb(113, 157, 171);
+}
+
+:hover > span.tooltip, span.tooltip:hover {
+	display: inline;
+}
+span.before-tooltip {
+	color: #800;
+	font-style: italic;
+	position: relative;
+}
+
+</style>