X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=5aa4f5694a0d1d29ba3ff9500641fdef5db6ba14;hb=463f0be41832166739eb98019a9bded55f7ed9dd;hp=0d4d0bfebfdebca788e2111a6086e6b7e7eed94a;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 0d4d0bfe..5aa4f569 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -202,6 +202,7 @@ function submit_center_last($name, $value, $title=false, $async=false, $icon=fal
 /*
 	For following controls:
 	'both' - use both Ctrl-Enter and Escape hotkeys 
+	'upgrade' - use Ctrl-Enter with progress ajax indicator and Escape hotkeys. Nonajax request for OK option is performed.
 	'cancel' - apply to 'RESET' button
 */
 function submit_add_or_update($add=true, $title=false, $async=false, $clone=false)
@@ -210,10 +211,13 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
 
 	if ($async === 'both') {
 		$async = 'default'; $cancel = 'cancel';
-	} 
-	else if ($async === 'default')
+	}
+	elseif ($async === 'upgrade') {
+		$async = 'default nonajax process'; $cancel = 'cancel';
+	}
+	elseif ($async === 'default')
 		$cancel = true;
-	else if ($async === 'cancel')
+	elseif ($async === 'cancel')
 		$async = true;
 	
 	if ($add)
@@ -343,7 +347,7 @@ function select_button_cell($name, $value, $title=false)
 
 function check_value($name)
 {
-	if (!isset($_POST[$name]))
+	if (!isset($_POST[$name]) || $_POST[$name]=='')
 		return 0;
 	return 1;
 }
@@ -500,6 +504,16 @@ function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=nul
 	echo "</tr>\n";
 }
 
+function text_input($name, $value=null, $size='', $max='', $title='', $params='')
+{
+	if ($value === null)
+		$value = get_post($name);
+
+	return "<input $params type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"$value\""
+	    .($title ? " title='$title'" : '')
+	    .">";
+}
+
 //-----------------------------------------------------------------------------------
 
 function text_cells($label, $name, $value=null, $size="", $max="", $title=false, 
@@ -512,11 +526,7 @@ function text_cells($label, $name, $value=null, $size="", $max="", $title=false,
 		label_cell($label, $labparams);
 	echo "<td>";
 
-	if ($value === null)
-		$value = get_post($name);
-	echo "<input $inparams type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"$value\""
-	    .($title ? " title='$title'" : '')
-	    .">";
+	echo text_input($name, $value, $size, $max, $title, $inparams);
 
 	if ($post_label != "")
 		echo " " . $post_label;
@@ -643,7 +653,7 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 		$calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? 
 			"$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
 		$post_label = "<a tabindex='-1' href=\"javascript:date_picker(document.getElementsByName('$name')[0]);\">"
-		. "	<img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+		. "	<img src='$calc_image' style='vertical-align:middle;padding-bottom:4px;width:16px;height:16px;border:0;' alt='"._('Click Here to Pick up the date')."'></a>\n";
 	}	
 	else
 		$post_label = "";
@@ -699,19 +709,70 @@ function file_row($label, $name, $id = "")
 	echo "</tr>\n";
 }	
 
-//-----------------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------------
 
-function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
+ Reference number input.
+
+ Optional  $context array contains transaction data used in number parsing:
+ 	'data' - data used for month/year codes
+	'location' - location code
+ 	'customer' - debtor_no
+ 	'supplier' - supplier id
+ 	'branch' - branch_code
+*/
+function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false, $type=null, $context=null)
 {
-	text_cells_ex($label, $name, 16, 18, $init, $title, $params, null, $submit_on_change);
+	global $Ajax, $Refs;
+
+	if (isset($type)) {
+		if (empty($_POST[$name.'_list'])) // restore refline id
+			$_POST[$name.'_list'] = $Refs->reflines->find_refline_id(empty($_POST[$name]) ? $init : $_POST[$name], $type);
+
+		if (empty($_POST[$name]) || ($_SERVER['REQUEST_METHOD'] == 'GET')) // initialization
+		{
+			if (isset($init))
+			{
+				$_POST[$name] = $init;
+			} else {
+				$_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context); // set default
+			}
+			$Ajax->addUpdate(true, $name, $_POST[$name]);
+		}
+
+		if (check_ui_refresh($name)) { // call context changed
+			$_POST[$name] = $Refs->normalize($init, $type, $context, $_POST[$name.'_list']);
+			$Ajax->addUpdate(true, $name, $_POST[$name]);
+		}
+
+		if ($Refs->reflines->count($type)>1) {
+			if (list_updated($name.'_list')) {
+				$_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context);
+				$Ajax->addUpdate(true, $name, $_POST[$name]);
+			}
+			$list = refline_list($name.'_list', $type);
+		} else {
+			$list = '';
+		}
+
+		if (isset($label))
+			label_cell($label, $params);
+
+		label_cell($list."<input name='".$name."' "
+			.(check_edit_access($name) ? '' : 'disabled ')
+			."value='".@$_POST[$name]."' size=10 maxlength=35>");
+	}
+	else // just wildcard ref field (e.g. for global inquires)
+	{
+		text_cells_ex($label, $name, 16, 35, $init, $title, $params, null, $submit_on_change);
+	}
 }
 
 //-----------------------------------------------------------------------------------
 
-function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
+function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false, $type=null, $context = null)
 {
 	echo "<tr><td class='label'>$label</td>";
-	ref_cells(null, $name, $title, $init, null, $submit_on_change);
+	ref_cells(null, $name, $title, $init, null, $submit_on_change, $type, $context);
 	echo "</tr>\n";
 }
 
@@ -867,26 +928,6 @@ function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params=
 	echo "</tr>\n";
 }
 
-//-----------------------------------------------------------------------------------
-/*
-function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $input_value)
-{
-  	global $Ajax;
-
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	echo "<input type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"$value\">   ";
-
-	submit($input_name, $input_value);
-
-	echo "</td></tr>\n";
-	$Ajax->addUpdate($name, $name, $value);
-}
-*/
 //-----------------------------------------------------------------------------------
 //
 //	When show_inactive page option is set