X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_lists.inc;h=6362fe74a51e444bbf6b3e9a0ff7e829b091360b;hb=273c1123941a13bc2975756732d0216150d88380;hp=87526293545838e62b62c1a537926562758194d3;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 87526293..6362fe74 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -59,7 +59,8 @@ $opts = array(		// default options
 	'format' => null, 	 // format functions for regular options
 	'disabled' => false,
 	'box_hint' => null, // box/selectors hints; null = std see below
-	'category' => false	// category column name or false
+	'category' => false, // category column name or false
+	'show_inactive' => false // show inactive records. 
 );
 // ------ merge options with defaults ----------
 	if($options != null)
@@ -167,6 +168,12 @@ $opts = array(		// default options
 				$sel = 'selected';
 				$found = $value;
 			}
+			// show selected option even if inactive 
+			if (!$opts['show_inactive'] && @$contact_row['inactive'] && $sel==='') {
+				continue;
+			} else 
+				$optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+
 			if ($first_id === false) {
 				$first_id = $value;
 				$first_opt = $descr;
@@ -176,7 +183,7 @@ $opts = array(		// default options
 				$selector .= "<optgroup label='".$cat."'>\n";
 				$lastcat = $cat;
 			}
-			$selector .= "<option $sel value='$value'>$descr</option>\n";
+			$selector .= "<option $sel $optclass value='$value'>$descr</option>\n";
 		}
 		db_free_result($result);
 	}
@@ -185,8 +192,11 @@ $opts = array(		// default options
 	if ($spec_option !== false) { // if special option used - add it
 		$first_id = $spec_id;
 		$first_opt = $spec_option;
+//	}
+//	if($first_id !== false) {
 		$sel = $found===false ? 'selected' : '';
-		$selector = "<option $sel value='$spec_id'>$spec_option</option>\n"
+		$optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+		$selector = "<option $sel value='$first_id'>$first_opt</option>\n"
 			. $selector;
 	}
 
@@ -233,7 +243,7 @@ $opts = array(		// default options
 				$search_submit)."\n";
 		}
 	}
-	default_focus($name);
+	default_focus(($search_box && $by_id) ? $search_box : $name);
 	$str = $selector;
 	if ($search_box && $opts['cells'])
 		echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
@@ -354,11 +364,12 @@ function _format_add_curr($row)
 		'' : ("&nbsp;-&nbsp;" . $row[2]));
 }
 
-function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+	$all=false)
 {
 	global $all_items;
 
-	$sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
+	$sql = "SELECT supplier_id, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
 	$mode = get_company_pref('no_supplier_list');
 
@@ -373,15 +384,17 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 		'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
-		_('Select supplier')
+		_('Select supplier'),
+		'show_inactive'=>$all
 		));
 }
 
-function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
+	$submit_on_change=false, $all=false)
 {
 	if ($label != null)
 		echo "<td>$label</td><td>\n";
-	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change);
+	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
 		echo "</td>\n";
 	return $str;
 }
@@ -395,11 +408,11 @@ return $str;
 }
 //----------------------------------------------------------------------------------------------
 
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
 {
 	global $all_items;
 
-	$sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+	$sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
 	$mode = get_company_pref('no_customer_list');
 
@@ -415,24 +428,29 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
 		'edit_submit' => true, // call editor on F4
 		'async' => false,
 		'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
-		_('Select customer')
+		_('Select customer'),
+		'show_inactive' => $show_inactive
 	) );
 }
 
-function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
+	$submit_on_change=false, $show_inactive=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td nowrap>";
-	$str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+	$str = customer_list($name, $selected_id, $all_option, $submit_on_change,
+		$show_inactive);
 	echo "</td>\n";
 	return $str;
 }
 
-function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
+	$submit_on_change=false, $show_inactive=false)
 {
 	echo "<tr><td>$label</td><td nowrap>";
-	$str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+	$str = customer_list($name, $selected_id, $all_option, $submit_on_change,
+		$show_inactive);
 	echo "</td>\n</tr>\n";
 	return $str;
 }
@@ -483,7 +501,7 @@ function locations_list($name, $selected_id=null, $all_option=false, $submit_on_
 {
 	global $all_items;
 
-	$sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations";
+	$sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations";
 
 return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
 	array(
@@ -515,7 +533,7 @@ function locations_list_row($label, $name, $selected_id=null, $all_option=false,
 
 function currencies_list($name, $selected_id=null, $submit_on_change=false)
 {
-	$sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
+	$sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
 
 // default to the company currency
 
@@ -633,11 +651,12 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false,
 
 //---------------------------------------------------------------------------------------------------
 
-function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array())
+function stock_items_list($name, $selected_id=null, $all_option=false, 
+	$submit_on_change=false, $opts=array())
 {
 	global $all_items;
 
-	$sql = "SELECT stock_id, s.description, c.description
+	$sql = "SELECT stock_id, s.description, c.description, s.inactive
 			FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
 
 	return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
@@ -661,12 +680,13 @@ function _format_stock_items($row)
 	return (user_show_codes() ?  ($row[0] . "&nbsp;-&nbsp;") : "") . $row[1];
 }
 
-function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
+	$submit_on_change=false, $all=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-		array('cells'=>true));
+		array('cells'=>true, 'show_inactive'=>$all));
 	return $str;
 }
 /*
@@ -687,7 +707,8 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
 {
 	global $all_items;
 	// all sales codes
-	$sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit
+	$sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
+			 i.inactive
 			FROM
 			".TB_PREF."item_codes i
 			LEFT JOIN
@@ -699,7 +720,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
 	} elseif ($type == 'kits') { // sales kits
 		$sql .=	" WHERE !i.is_foreign AND i.item_code!=i.stock_id";
 	}
-				
+	$sql .= " AND !i.inactive";
 	$sql .= " GROUP BY i.item_code";
 
 	return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description',
@@ -709,7 +730,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
 		'spec_option' => $all_option===true ?  _("All Items") : $all_option,
 		'spec_id' => $all_items,
 		'search_box' => true,
-		'search' => array("i.item_code", "c.description"),
+		'search' => array("i.item_code", "i.description"),
 		'search_submit' => get_company_pref('no_item_list')!=0,
 		'size'=>15,
 		'select_submit'=> $submit_on_change,
@@ -752,7 +773,7 @@ function base_stock_items_list($where, $name, $selected_id=null,
 {
 	global $all_items;
 
-	$sql = "SELECT stock_id, s.description, c.description
+	$sql = "SELECT stock_id, s.description, c.description, s.inactive
 		FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE
 		s.category_id=c.category_id";
 
@@ -863,16 +884,17 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
 
 //------------------------------------------------------------------------------------
 function stock_purchasable_items_list($name, $selected_id=null,	
-	$all_option=false, $submit_on_change=false)
+	$all_option=false, $submit_on_change=false, $all=false)
 {
 	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
 		array('where'=>array("mb_flag!= 'M'"), 
-			'edit_submit' => true));
+			'edit_submit' => true,
+			'show_inactive'=>$all));
 	return $str;
 }
 
 function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-			$all_option=false, $submit_on_change=false)
+			$all_option=false, $submit_on_change=false, $all=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -897,18 +919,14 @@ function stock_purchasable_items_list_row($label, $name, $selected_id=null,
 
 function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
 {
-	$types = array(
-		'M' => _("Manufactured"),
-		'B' => _("Purchased"),
-		'D' => _("Service")
-	);
+	global $stock_types;
 
 	echo "<tr>";
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
 
-	array_selector($name, $selected_id, $types, 
+	array_selector($name, $selected_id, $stock_types, 
 		array( 
 			'select_submit'=> true, 
 			'disabled' => !$enabled) );
@@ -1032,7 +1050,7 @@ function item_tax_types_list_row($label, $name, $selected_id=null)
 
 function shippers_list($name, $selected_id=null)
 {
-	$sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers";
+	$sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
 	combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
 }
 
@@ -1056,7 +1074,7 @@ function shippers_list_row($label, $name, $selected_id=null)
 
 function sales_persons_list($name, $selected_id=null)
 {
-	$sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
+	$sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
 	combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
 }
 
@@ -1080,7 +1098,7 @@ function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function sales_areas_list($name, $selected_id=null)
 {
-	$sql = "SELECT area_code, description FROM ".TB_PREF."areas";
+	$sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
 	combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
 }
 
@@ -1104,7 +1122,7 @@ function sales_areas_list_row($label, $name, $selected_id=null)
 
 function sales_groups_list($name, $selected_id=null, $special_option=false)
 {
-	$sql = "SELECT id, description FROM ".TB_PREF."groups";
+	$sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
 	combo_input($name, $selected_id, $sql, 'id', 'description', array(
 		'spec_option' => $special_option===true ? ' ' : $special_option,
 		'order' => 'description', 'spec_id' => 0,
@@ -1190,7 +1208,7 @@ function workorders_list_row($label, $name, $selected_id=null)
 
 function payment_terms_list($name, $selected_id=null)
 {
-	$sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms";
+	$sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
 	combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
 }
 
@@ -1214,7 +1232,7 @@ function payment_terms_list_row($label, $name, $selected_id=null)
 
 function credit_status_list($name, $selected_id=null)
 {
-	$sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status";
+	$sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status";
 	combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
 }
 
@@ -1238,7 +1256,7 @@ function credit_status_list_row($label, $name, $selected_id=null)
 
 function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
-	$sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types";
+	$sql = "SELECT id, sales_type, inactive FROM ".TB_PREF."sales_types";
 
 	return combo_input($name, $selected_id, $sql, 'id', 'sales_type',
 	array(
@@ -1333,7 +1351,7 @@ function workcenter_list($name, $selected_id=null, $all_option=false)
 {
 	global $all_items;
 
-	$sql = "SELECT id, name FROM ".TB_PREF."workcentres";
+	$sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
 
 	return combo_input($name, $selected_id, $sql, 'id', 'name',
 	array(
@@ -1363,7 +1381,7 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false
 
 function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
 {
-	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
 		FROM ".TB_PREF."bank_accounts";
 //		, ".TB_PREF."chart_master
 //		WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
@@ -1397,7 +1415,7 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
 		FROM ".TB_PREF."bank_accounts
 		WHERE ".TB_PREF."bank_accounts.account_type=3";
 
@@ -1417,7 +1435,7 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false)
 {
-	$sql = "SELECT id, pos_name FROM ".TB_PREF."sales_pos";
+	$sql = "SELECT id, pos_name, inactive FROM ".TB_PREF."sales_pos";
 
 	default_focus($name);
 	echo '<tr>';
@@ -1481,26 +1499,29 @@ function class_list_row($label, $name, $selected_id=null, $submit_on_change=fals
 
 //-----------------------------------------------------------------------------------------------
 
-function stock_categories_list($name, $selected_id=null)
+function stock_categories_list($name, $selected_id=null, $submit_on_change=false)
 {
-	$sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
+	$sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
 	combo_input($name, $selected_id, $sql, 'category_id', 'description',
-	array('order'=>'category_id'));
+ 	array('order'=>'category_id',
+ 		'select_submit'=> $submit_on_change,
+ 		'async' => true
+ 	));
 }
 
-function stock_categories_list_cells($label, $name, $selected_id=null)
+function stock_categories_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	stock_categories_list($name, $selected_id);
+	stock_categories_list($name, $selected_id, $submit_on_change);
 	echo "</td>\n";
 }
 
-function stock_categories_list_row($label, $name, $selected_id=null)
+function stock_categories_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
-	stock_categories_list_cells($label, $name, $selected_id);
+	stock_categories_list_cells($label, $name, $selected_id, $submit_on_change);
 	echo "</tr>\n";
 }
 
@@ -1541,17 +1562,17 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option
 
 //-----------------------------------------------------------------------------------------------
 function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
-	$cells=false, $all_option=false, $submit_on_change=false)
+	$cells=false, $all_option=false, $submit_on_change=false, $all=false)
 {
 	if ($skip_bank_accounts)
-		$sql = "SELECT chart.account_code, chart.account_name, type.name
+		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
 			FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
 			."LEFT JOIN ".TB_PREF."bank_accounts acc "
 			."ON chart.account_code=acc.account_code
 				WHERE acc.account_code  IS NULL
 			AND chart.account_type=type.id";
 	else
-		$sql = "SELECT chart.account_code, chart.account_name, type.name
+		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
 			FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
 			WHERE chart.account_type=type.id";
 
@@ -1568,7 +1589,8 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
 			'cells' => true,
 		'select_submit'=> $submit_on_change,
 		'async' => false,
-		'category' => 2
+		'category' => 2,
+		'show_inactive' => $all
 	) );
 
 }
@@ -1579,13 +1601,14 @@ function _format_account($row)
 }
 
 function gl_all_accounts_list_cells($label, $name, $selected_id=null, 
-	$skip_bank_accounts=false, $cells=false, $all_option=false)
+	$skip_bank_accounts=false, $cells=false, $all_option=false, 
+	$submit_on_change=false, $all=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
 	gl_all_accounts_list($name, $selected_id, 
-		$skip_bank_accounts, $cells, $all_option);
+		$skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
 	echo "</td>\n";
 }
 
@@ -2064,5 +2087,8 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on
 	echo "</td></tr>\n";
 }
 
+function record_status_list_row($label, $name) {
+	return yesno_list_row($label, $name, null, 	_('Inactive'), _('Active'));
+}
 
 ?>
\ No newline at end of file