X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=order_lines_view.php;h=0bbc5e45b9b9b865608db862b5e56d3b24f652bc;hb=e83dd263203cb4f16aec72e084825198b5e12259;hp=361de53c41431a2b3de1a56dacbdbc18bf00f813;hpb=785e111cb505d2ddc072de77455c79ef92a13e98;p=order_line_extra.git

diff --git a/order_lines_view.php b/order_lines_view.php
index 361de53..0bbc5e4 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -25,6 +25,7 @@ $_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);
@@ -39,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);
 
 
 
@@ -54,28 +67,32 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$customer_id = $_POST['customer_id'];
 if($customer_id) {
-	$sql = get_order_details_extra($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')
+		,_("Item Code") => array('ord' => '', 'fun' => 'item_link')
+		,_("Quantity") => array('type' => 'qty', 'dec' => 0)
+		,_("Available") => array('fun' => 'available_quantity', 'dec' => 0, 'ord' => '')
 	,_("Required Date") => array('fun' => 'input_date_details', 'ord' => '')
 	,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '')
 	);
 }
 else {
-	$sql = get_order_summary();
+	$sql = get_order_summary('DEF');
 	$cols = array(
-_("Customer") => array('ord' => ''),
+	'customer id' => 'skip',
+_("Customer") => array('ord' => '', 'fun' => 'customer_link'),
 _("Branch") => array('ord' => ''),
-_("Delivery Date") => array('ord' => ''),
-_("Quantity") => array('ord' => ''),
+_("Delivery Date") => array('ord' => '', 'type' => 'date'),
+_("Quantity") => array('ord' => '', 'type' => 'qty', 'dec' => 0),
 _("Amount") => array('ord' => '', 'type' => 'amount'),
+_("Avail. Q") => array('ord' => '', 'type' => 'qty', 'dec' => 0),
+_("Avail. A") => array('ord' => '', 'type' => 'amount', 'dec' => 0),
 _("required date") => array('ord' => '', 'type' => 'date'),
-_("comment") => array('ord' => ''),
+_("Comments") => array('ord' => '', 'fun' => 'aggregate_comment'),
+_("comment 2 ") =>  'skip'
 	);
 }
 
@@ -87,9 +104,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>