X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=order_lines_view.php;h=926a8a9f8859238674bc7372689aa8f3a7d54e2f;hb=cac7335b5528b1eca9cc02ca7bc9760a080b676f;hp=2b53170d4963c9a506ac64243591131b8eda3a6b;hpb=c5e23a3f72b184822b7581e157f88a4b36c2fbc0;p=order_line_extra.git

diff --git a/order_lines_view.php b/order_lines_view.php
index 2b53170..926a8a9 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -17,13 +17,16 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 include_once("includes/order_lines.inc");
+include_once("includes/splitter.inc");
 
 $page_security = 'SA_ORDERLINEX_EDIT';
 add_access_extensions();
 
 $_SESSION['page_title'] = _($help_context = "Edit lines extra parameters");
 
+// Process POST
 update_extra_order_details();
+split_order_details();
 
 
 $js = "";
@@ -44,6 +47,7 @@ start_row();
 if(!isset($_POST['customer_id'])) {
 	if(isset($_GET['customer_id'])) {
 		$customer_id = $_GET['customer_id'];
+		$_POST['customer_id'] = $customer_id;
 	}
 else $customer_id = null;
 
@@ -67,18 +71,23 @@ end_table(1);
 //	Orders inquiry table
 //
 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' => '')
+		,_("Item Code") => array('ord' => '', 'fun' => 'item_link')
 		,_("Quantity") => array('type' => 'qty', 'dec' => 0)
-	,_("Required Date") => array('fun' => 'input_date_details', 'ord' => '')
+		,_("Available") => array('fun' => 'available_quantity', 'dec' => 0, 'ord' => '')
+		,_("Before") => 'skip'
+		,_("Priority") => array('fun' => 'input_priority_date_details', 'ord' => '')
+		,_("Hold Until") => array('fun' => 'input_hold_until_date_details', 'ord' => '')
+		,_("Require By") => array('fun' => 'input_required_date_details', 'ord' => '')
+		,_("Expiry Date") => array('fun' => 'input_expiry_date_details', 'ord' => '')
 	,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '')
 	);
 }
 else {
-	$sql = get_order_summary();
+	$sql = get_order_summary('DEF');
 	$cols = array(
 	'customer id' => 'skip',
 _("Customer") => array('ord' => '', 'fun' => 'customer_link'),
@@ -86,6 +95,8 @@ _("Branch") => 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'),
 _("Comments") => array('ord' => '', 'fun' => 'aggregate_comment'),
 _("comment 2 ") =>  'skip'
@@ -99,9 +110,21 @@ $table->width = "80%";
 
 display_db_pager($table);
 
+function display_split_area() {
+start_table(TABLESTYLE_NOBORDER);
+date_cells('Start', 'start_date');
+date_cells('End', 'end_date');
+qty_cells('Max', 'max_quantity', 6);
+submit_cells('Split', 'Split');
+end_table();
+
+}
+display_split_area();
+
+
 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();
@@ -110,18 +133,21 @@ submit_center_last('Cancel', _("Cancel"), true, '', 'cancel', true);
 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 {
+:hover > span.tooltip, span.tooltip:hover {
 	display: inline;
 }
 span.before-tooltip {
 	color: #800;
 	font-style: italic;
+	position: relative;
 }
 
 </style>