X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=59a3676ef5664ed7ccc7bd004411ac37c2c824aa;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hp=091a874c7852e8ca7df09606f2e86e40522cf907;hpb=d5f7c2099d1dc612e651722e5843329bd8314863;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 091a874c..59a3676e 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -37,6 +37,15 @@ function find_submit($prefix, $numeric=true)
     }
     return $numeric ? -1 : null;
 }
+/*
+	Helper function.
+	Returns true if input $name with $submit_on_change option set is subject to update.
+*/
+function input_changed($name)
+{
+	return isset($_POST['_'.$name.'_changed']);
+}
+
 //------------------------------------------------------------------------------
 //
 // Helper function for simple db table editor pages
@@ -47,11 +56,12 @@ function simple_page_mode($numeric_id = true)
 
 	$default = $numeric_id ? -1 : '';
 	$selected_id = get_post('selected_id', $default);
-	foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET') as $m) {
+	foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET', 'CLONE') as $m) {
 		if (isset($_POST[$m])) {
 			$Ajax->activate('_page_body');
-			if ($m == 'RESET') 
+			if ($m == 'RESET'  || $m == 'CLONE') 
 				$selected_id = $default;
+			unset($_POST['_focus']);
 			$Mode = $m; return;
 		}
 	}
@@ -74,7 +84,7 @@ function simple_page_mode($numeric_id = true)
 //
 //	Read numeric value from user formatted input
 //
-function input_num($postname=null, $dflt=null)
+function input_num($postname=null, $dflt=0)
 {
 	if (!isset($_POST[$postname]) || $_POST[$postname] == "")
 	  	return $dflt;
@@ -83,10 +93,16 @@ function input_num($postname=null, $dflt=null)
 }
 
 //---------------------------------------------------------------------------------
+//
+//	Thanks to hidden fields buffering hidden() helper can be used in arbitrary places and 
+//  proper html structure is still preserved. Buffered hidden fields are output on the nearest 
+//  table or form closing tag (see output_hidden()).
+//
+$hidden_fields = array();
 
 function hidden($name, $value=null, $echo=true)
 {
-  	global $Ajax;
+  	global $Ajax, $hidden_fields;
 	
 	if ($value === null) 
 		$value = get_post($name);
@@ -94,7 +110,7 @@ function hidden($name, $value=null, $echo=true)
   	$ret = "<input type=\"hidden\" name=\"$name\" value=\"$value\">";
 	$Ajax->addUpdate($name, $name, $value);
 	if ($echo)
-		echo $ret."\n";
+			$hidden_fields[] = $ret;
 	else
 		return $ret;
 }
@@ -106,31 +122,48 @@ function hidden($name, $value=null, $echo=true)
 		null  - button visible only in fallback mode; optional icon
 	 Ajax submit:
 		true	  - standard button; optional icon
-		'process' - displays progress bar during call; optional icon
+
 		'default' - default form submit on Ctrl-Enter press; dflt ICON_OK icon
+		'selector' - ditto with closing current popup editor window
 		'cancel'  - cancel form entry on Escape press; dflt ICON_CANCEL
+		'process' - displays progress bar during call; optional icon
+		'nonajax' - ditto, non-ajax submit
+
+	$atype can contain also multiply type selectors separated by space, 
+	however make sense only combination of 'process' and one of defualt/selector/cancel
 */
 function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false)
 {
 	global $path_to_root;
 
 	$aspect='';
-	if (!is_bool($atype)) // necessary: switch uses '=='
-	  switch($atype) {
-		case 'process':
-			$aspect = " aspect='process'"; break;
-		case 'default':
-			$aspect = " aspect='default'"; 
-			if ($icon===false) $icon=ICON_SUBMIT; break;
-		case 'cancel':
-			$aspect = " aspect='cancel'"; 
-			if ($icon===false) $icon=ICON_ESCAPE; break;
-		case null: 
-			$aspect = fallback_mode() ? 
-				" aspect='fallback'" : " style='display:none;'"; break;
-	 }
+	if ($atype === null) {
+		$aspect = fallback_mode() ? " aspect='fallback'" : " style='display:none;'";
 
-	default_focus($name);
+	} elseif (!is_bool($atype)) { // necessary: switch uses '=='
+
+		$aspect = " aspect='$atype' ";
+		$types = explode(' ', $atype);
+
+		foreach ($types as $type) {
+			switch($type) {
+				case 'selector':
+					$aspect = " aspect='selector' rel = '$value'"; 
+					$value = _("Select");
+					if ($icon===false) $icon=ICON_SUBMIT; break;
+
+				case 'default':
+					if ($icon===false) $icon=ICON_SUBMIT; break;
+
+				case 'cancel':
+					if ($icon===false) $icon=ICON_ESCAPE; break;
+
+				case 'nonajax':
+				case 'download':
+					$atype = false;
+			}
+		}
+	}
 	$submit_str = "<button class=\""
 	    .($atype ? 'ajaxsubmit' : 'inputsubmit')
 		."\" type=\"submit\""
@@ -138,7 +171,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 	    ." name=\"$name\"  id=\"$name\" value=\"$value\""
 	    .($title ? " title='$title'" : '')
 	    .">"
-		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon'>" : '')
+		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12' alt=''>" : '')
 		."<span>$value</span>"
 		."</button>\n";
 	if ($echo)
@@ -149,9 +182,9 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 
 function submit_center($name, $value, $echo=true, $title=false, $async=false, $icon=false)
 {
-	echo "<center>";
+	if ($echo) echo "<center>";
 	submit($name, $value, $echo, $title, $async, $icon);
-	echo "</center>";
+	if ($echo) echo "</center>";
 }
 
 function submit_center_first($name, $value, $title=false, $async=false, $icon=false)
@@ -170,42 +203,48 @@ 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)
+function submit_add_or_update($add=true, $title=false, $async=false, $clone=false)
 {
 	$cancel = $async;
 
 	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)
 		submit('ADD_ITEM', _("Add new"), true, $title, $async);
 	else {
-		submit('UPDATE_ITEM', _("Update"), true, $title, $async);
-		submit('RESET', _("Cancel"), true, $title, $cancel);
+		submit('UPDATE_ITEM', _("Update"), true, _('Submit changes'), $async);
+		if ($clone) submit('CLONE', _("Clone"), true, 
+			_('Edit new record with current data'), $async);
+		submit('RESET', _("Cancel"), true, _('Cancel edition'), $cancel);
 	}
 }
 
-function submit_add_or_update_center($add=true, $title=false, $async=false)
+function submit_add_or_update_center($add=true, $title=false, $async=false, $clone=false)
 {
 	echo "<center>";
-	submit_add_or_update($add, $title, $async);
+	submit_add_or_update($add, $title, $async, $clone);
 	echo "</center>";
 }
 
-function submit_add_or_update_row($add=true, $right=true, $extra="", $title=false, $async=false)
+function submit_add_or_update_row($add=true, $right=true, $extra="", $title=false, $async=false, $clone = false)
 {
 	echo "<tr>";
 	if ($right)
 		echo "<td>&nbsp;</td>\n";
 	echo "<td $extra>";
-	submit_add_or_update($add, $title, $async);
+	submit_add_or_update($add, $title, $async, $clone);
 	echo "</td></tr>\n";
 }
 
@@ -225,43 +264,69 @@ function submit_row($name, $value, $right=true, $extra="", $title=false, $async=
 	echo "</tr>\n";
 }
 
-function submit_return($name, $value, $title=false, $async=false)
+function submit_return($name, $value, $title=false)
 {
-	if (count($_SESSION['Context'])) {
-		submit($name, $value, true, $title, $async);
+	if (@$_REQUEST['popup']) {
+		submit($name, $value, true, $title, 'selector');
 	}
 }
+
+function submit_js_confirm($name, $msg, $set = true) {
+	global $Ajax;
+	$js = "_validate.$name=".($set ? "function(){ return confirm('"
+				. strtr($msg, array("\n"=>'\\n')) . "');};"
+				: 'null;');
+	if (in_ajax()) {
+		$Ajax->addScript(true, $js);
+	} else
+		add_js_source($js);
+}
 //-----------------------------------------------------------------------------------
 
 function set_icon($icon, $title=false)
 {
 	global $path_to_root;
-	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0'".($title ? " title='$title'" : "")." />\n";	
+	if (basename($icon) === $icon) // standard icons does not contain path separator
+		$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
+	return "<img src='$icon' style='vertical-align:middle;width:12px;height:12px;border:0;'".($title ? " title='$title'" : "")." >\n";	
 }
 
-function button($name, $value, $title=false, $icon=false)
+function button($name, $value, $title=false, $icon=false,  $aspect='')
 {
 	// php silently changes dots,spaces,'[' and characters 128-159
 	// to underscore in POST names, to maintain compatibility with register_globals
+	$rel = '';
+	if ($aspect == 'selector') {
+		$rel = " rel='$value'";
+		$value = _("Select");
+	}
 	if (user_graphic_links() && $icon)
 	{
 		if ($value == _("Delete")) // Helper during implementation
 			$icon = ICON_DELETE;
-		return "<button type='submit' class='editbutton' name='".
-			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
-			"' value='1'" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."\n";
+		return "<button type='submit' class='editbutton' name='"
+			.html_specials_encode(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
+			)))
+			."' value='1'" . ($title ? " title='$title'":" title='$value'")
+			. ($aspect ? " aspect='$aspect'" : '')
+			. $rel
+			." >".set_icon($icon)."</button>\n";
 	}
 	else
 		return "<input type='submit' class='editbutton' name='"
-			.htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
+			.htmlentities(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
+			)))
 			."' value='$value'"
-			.($title ? " title='$title'":'')." />\n";
+			.($title ? " title='$title'":'')
+			. ($aspect ? " aspect='$aspect'" : '')
+			. $rel
+			." >\n";
 }
 
-function button_cell($name, $value, $title=false, $icon=false)
+function button_cell($name, $value, $title=false, $icon=false, $aspect='')
 {
-	echo "<td>";
-	echo button($name, $value, $title, $icon);
+	echo "<td align='center'>";
+	echo button($name, $value, $title, $icon, $aspect);
 	echo "</td>";
 }
 
@@ -274,13 +339,22 @@ function edit_button_cell($name, $value, $title=false)
 {
 	button_cell($name, $value, $title, ICON_EDIT);
 }
+
+function select_button_cell($name, $value, $title=false)
+{
+	button_cell($name, $value, $title, ICON_ADD, 'selector');
+}
 //-----------------------------------------------------------------------------------
 
 function check_value($name)
 {
-	if (!isset($_POST[$name]))
-		return 0;
-	return 1;
+	if (is_array($name)) {
+		$ret = array();
+		foreach($name as $key)
+			$ret[$key] = check_value($key);
+		return $ret;
+	} else
+		return (empty($_POST[$name]) ? 0 : 1);
 }
 
 function checkbox($label, $name, $value=null, $submit_on_change=false, $title=false)
@@ -288,7 +362,7 @@ function checkbox($label, $name, $value=null, $submit_on_change=false, $title=fa
   	global $Ajax;
 
 	$str = '';	
-	default_focus($name);
+
 	if ($label)
 		$str .= $label . "  ";
 	if ($submit_on_change !== false) {
@@ -315,24 +389,39 @@ function check($label, $name, $value=null, $submit_on_change=false, $title=false
 	echo checkbox($label, $name, $value, $submit_on_change, $title);
 }
 
-function check_cells($label, $name, $value, $submit_on_change=false, $title=false)
+function check_cells($label, $name, $value=null, $submit_on_change=false, $title=false,
+	$params='')
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
-	echo "<td align='center'>";
+	echo "<td $params>";
 	echo check(null, $name, $value, $submit_on_change, $title);
 	echo "</td>";
 }
 
-function check_row($label, $name, $value, $submit_on_change=false, $title=false)
+function check_row($label, $name, $value=null, $submit_on_change=false, $title=false)
 {
-	echo "<tr>";
-	echo check_cells($label, $name, $value, $submit_on_change, $title);
+	echo "<tr><td class='label'>$label</td>";
+	echo check_cells(NULL, $name, $value, $submit_on_change, $title);
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
+function radio($label, $name, $value, $selected=null, $submit_on_change=false)
+{
+	if (!isset($selected))
+		$selected = get_post($name) === (string)$value;
+
+	if ($submit_on_change === true)
+		$submit_on_change = 
+			"JsHttpRequest.request(\"_{$name}_update\", this.form);";
+
+	return "<input type='radio' name=$name value='$value' ".($selected ? "checked":'')
+	    .($submit_on_change ? " onclick='$submit_on_change'" : '')
+		.">".($label ? $label : '');
+}
 
+//-----------------------------------------------------------------------------------
 function labelheader_cell($label, $params="")
 {
 	echo "<td class='tableheader' $params>$label</td>\n";
@@ -357,6 +446,12 @@ function email_cell($label, $params="", $id=null)
 	label_cell("<a href='mailto:$label'>$label</a>", $params, $id);
 }
 
+function amount_decimal_cell($label, $params="", $id=null)
+{
+	$dec = 0;
+	label_cell(price_decimal_format($label, $dec), "nowrap align=right ".$params, $id);
+}
+
 function amount_cell($label, $bold=false, $params="", $id=null)
 {
 	if ($bold)
@@ -365,6 +460,16 @@ function amount_cell($label, $bold=false, $params="", $id=null)
 		label_cell(price_format($label), "nowrap align=right ".$params, $id);
 }
 
+//JAM  Allow entered unit prices to be fractional
+function unit_amount_cell($label, $bold=false, $params="", $id=null)
+{
+	if ($bold)
+		label_cell("<b>".unit_price_format($label)."</b>", "nowrap align=right ".$params, $id);
+	else
+		label_cell(unit_price_format($label), "nowrap align=right ".$params, $id);
+}
+
+
 function percent_cell($label, $bold=false, $id=null)
 {
 	if ($bold)
@@ -383,22 +488,37 @@ function qty_cell($label, $bold=false, $dec=null, $id=null)
 		label_cell(number_format2($label, $dec), "nowrap align=right", $id);
 }
 
-function label_cells($label, $value, $params="", $params2="", $id='')
+function label_cells($label, $value, $params="", $params2="", $id=null)
 {
 	if ($label != null)
 		echo "<td $params>$label</td>\n";
 	label_cell($value, $params2, $id);
 }
 
-function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=null)
 {
 	echo "<tr>";
+	if ($params == "")
+	{
+		echo "<td class='label'>$label</td>";
+		$label = null;
+	}	
 	label_cells($label, $value, $params, $params2, $id);
 	if ($leftfill!=0)
 	  	echo "<td colspan=$leftfill></td>";
 	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, 
@@ -411,11 +531,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;
@@ -457,9 +573,8 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null,
 
 function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
 {
-	echo "<tr>";
-
-	text_cells($label, $name, $value, $size, $max, $title, $params, $post_label);
+	echo "<tr><td class='label'>$label</td>";
+	text_cells(null, $name, $value, $size, $max, $title, $params, $post_label);
 
 	echo "</tr>\n";
 }
@@ -468,9 +583,8 @@ function text_row($label, $name, $value, $size, $max, $title=null, $params="", $
 
 function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null, $params=null, $post_label=null)
 {
-	echo "<tr>";
-
-	text_cells_ex($label, $name, $size, $max, $value, $title, $params, $post_label);
+	echo "<tr><td class='label'>$label</td>";
+	text_cells_ex(null, $name, $size, $max, $value, $title, $params, $post_label);
 
 	echo "</tr>\n";
 }
@@ -521,7 +635,7 @@ function link_row_ex($label, $name, $size, $max=null, $title=null, $value=null,
 function date_cells($label, $name, $title = null, $check=null, $inc_days=0, 
 	$inc_months=0, $inc_years=0, $params=null, $submit_on_change=false)
 {
-	global $use_date_picker, $path_to_root, $Ajax;
+	global $path_to_root, $Ajax;
 
 	if (!isset($_POST[$name]) || $_POST[$name] == "")
 	{
@@ -539,9 +653,13 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 			$_POST[$name] = $dd;
 		}
 	}
-	if ($use_date_picker)
+	if (user_use_date_picker())
+	{
+		$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='$path_to_root/themes/default/images/cal.gif' 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 = "";
 
@@ -550,13 +668,15 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 
 	echo "<td>";
 	
-	$class = $submit_on_change ? 'class="searchbox"' : '';
+	$class = $submit_on_change ? 'date active' : 'date';
 
 	$aspect = $check ? 'aspect="cdate"' : '';
 	if ($check && (get_post($name) != Today()))
 		$aspect .= ' style="color:#FF0000"';
 
-	echo "<input type=\"text\" name=\"$name\" $class $aspect size=\"9\" maxlength=\"12\" value=\"" 
+	default_focus($name);
+	$size = (user_date_format()>3)?11:10; 
+	echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"$size\" maxlength=\"12\" value=\"" 
 	 . $_POST[$name]. "\""
 	 .($title ? " title='$title'": '')." > $post_label";
 	echo "</td>\n";
@@ -566,25 +686,98 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_months=0, 
 	$inc_years=0, $params=null, $submit_on_change=false)
 {
-	echo "<tr>";
-	date_cells($label, $name, $title, $check, $inc_days, $inc_months, 
+	echo "<tr><td class='label'>$label</td>";
+	date_cells(null, $name, $title, $check, $inc_days, $inc_months, 
 		$inc_years, $params, $submit_on_change);
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
+function password_row($label, $name, $value)
+{
+	echo "<tr><td class='label'>$label</td>";
+	label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' >");
+	echo "</tr>\n";
+}	
+
+//-----------------------------------------------------------------------------------
+function file_cells($label, $name, $id="")
+{
+	if ($id != "")
+		$id = "id='$id'";
+	label_cells($label, "<input type='file' name='$name' $id >");
+}		
+function file_row($label, $name, $id = "")
+{
+	echo "<tr><td class='label'>$label</td>";
+	file_cells(null, $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])) // initialization
+		{
+			if (isset($init))
+			{
+				$_POST[$name] = $init;
+			} else {
+				$_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context);
+			}
+			$Ajax->addUpdate(true, $name, $_POST[$name]);
+		}
+
+		if (check_ui_refresh($name)) { // call context changed
+			$_POST[$name] = $Refs->normalize($_POST[$name], $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=16 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>";
-	ref_cells($label, $name, $title, $init, null, $submit_on_change);
+	echo "<tr><td class='label'>$label</td>";
+	ref_cells(null, $name, $title, $init, null, $submit_on_change, $type, $context);
 	echo "</tr>\n";
 }
 
@@ -615,8 +808,11 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
 			$_POST[$name] = '';
 	}
 	if ($label != null)
+	{
+		if ($params == null)
+			$params = "class='label'";
 		label_cell($label, $params);
-
+	}
 	if (!isset($max))
 		$max = $size;
 
@@ -644,6 +840,15 @@ function amount_cells($label, $name, $init=null, $params=null, $post_label=null,
 	amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
 }
 
+//JAM  Allow entered unit prices to be fractional
+function unit_amount_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+	if (!isset($dec))
+	  	$dec = user_price_dec()+2;
+
+	amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec+2);
+}
+
 function amount_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
 {
 	echo "<tr>";
@@ -723,38 +928,18 @@ function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $par
 
 function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="")
 {
-	echo "<tr>";
-	textarea_cells($label, $name, $value, $cols, $rows, $title, $params);
+	echo "<tr><td class='label'>$label</td>";
+	textarea_cells(null, $name, $value, $cols, $rows, $title, $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 
 //  displays value of inactive field as checkbox cell.
 //  Also updates database record after status change.
 //
-function inactive_status_cell($id, $value, $table, $key)
+function inactive_control_cell($id, $value, $table, $key)
 {
 	global	$Ajax;
 
@@ -773,7 +958,7 @@ function inactive_status_cell($id, $value, $table, $key)
 //
 //	Displays controls for optional display of inactive records
 //
-function show_inactive_row($th) {
+function inactive_control_row($th) {
 	echo  "<tr><td colspan=".(count($th)).">"
 		."<div style='float:left;'>"
 		. checkbox(null, 'show_inactive', null, true). _("Show also Inactive")
@@ -781,5 +966,63 @@ function show_inactive_row($th) {
 		. submit('Update', _('Update'), false, '', null)
 		."</div></td></tr>";
 }
+//
+//	Inserts additional column header when display of inactive records is on.
+//
+function inactive_control_column(&$th) {
+	global $Ajax;
+	
+	if (check_value('show_inactive')) 
+		array_insert($th, count($th)-2 , _("Inactive"));
+	if (get_post('_show_inactive_update')) {
+		$Ajax->activate('_page_body');
+	}
+}
 
-?>
\ No newline at end of file
+function customer_credit_row($customer, $credit, $parms='')
+{
+	global $path_to_root;
+	
+	label_row( _("Current Credit:"),
+		"<a target='_blank' " . ($credit<0 ? 'class="redfg"' : '')
+		."href='$path_to_root/sales/inquiry/customer_inquiry.php?customer_id=".$customer."'"
+		." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >"
+		. price_format($credit)
+		."</a>", $parms);
+}
+
+function supplier_credit_row($supplier, $credit, $parms='')
+{
+	global $path_to_root;
+	
+	label_row( _("Current Credit:"),
+		"<a target='_blank' " . ($credit<0 ? 'class="redfg"' : '')
+		."href='$path_to_root/purchasing/inquiry/supplier_inquiry.php?supplier_id=".$supplier."'"
+		." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >"
+		. price_format($credit)
+		."</a>", $parms);
+}
+
+function bank_balance_row($bank_acc, $parms='')
+{
+	global $path_to_root;
+
+	$to = add_days(Today(), 1);
+	$bal = get_balance_before_for_bank_account($bank_acc, $to);
+	label_row( _("Bank Balance:"),
+		"<a target='_blank' " . ($bal<0 ? 'class="redfg"' : '')
+		."href='$path_to_root/gl/inquiry/bank_inquiry.php?bank_account=".$bank_acc."'"
+		." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >&nbsp;"
+		. price_format($bal)
+		."</a>", $parms);
+}
+
+function ahref($label, $href, $target="", $onclick="") {
+  echo "<a href='$href' target='$target' onclick='$onclick'>$label</a>";
+}
+
+function ahref_cell($label, $href, $target="", $onclick="") {
+  echo "<td align='center'>&nbsp;&nbsp;";
+  ahref($label, $href, $target, $onclick);
+  echo "&nbsp;&nbsp;</td>";
+}