X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=17c61441db0d32fa4ff24873daf4487f42c95fe7;hb=4301c9cda0f510cc52335408380b368e51c2a663;hp=b0b8d68958e88e0c8f60a70d25778ceb6aeebf58;hpb=37da0ea920fdff712ccef4e1324aa822e981c8fc;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index b0b8d689..17c61441 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -188,7 +188,7 @@ $opts = array(		// default options
 		global $_select_button;
 	// button class selects form reload/ajax selector update
 		$selector .= sprintf($_select_button, $disabled, user_theme(),
-			(in_ajax() ? 'display:none;':''),
+			(fallback_mode() ? '' : 'display:none;'),
 			$select_submit)."\n";
 	}
 // ------ make combo ----------
@@ -199,12 +199,12 @@ $opts = array(		// default options
 			$opts['size']."' maxlength='".$opts['max'].
 			"' value='$txt' class='$class' rel='$name' autocomplete='off' title='"
 			.$opts['box_hint']."'"
-			.(in_ajax() && !$by_id ? " style=display:none;":'')
+			.(!fallback_mode() && !$by_id ? " style=display:none;":'')
 			.">\n";
 		if ($search_submit != false) {
 			global $_search_button;
 			$edit_entry .= sprintf($_search_button, $disabled, user_theme(),
-				(in_ajax() ? 'display:none;':''),
+				(fallback_mode() ? '' : 'display:none;'),
 				$search_submit)."\n";
 		}
 	}
@@ -307,7 +307,7 @@ $opts = array(		// default options
 	if ($select_submit != false) { // if submit on change is used - add select button
 		global $_select_button;
 		$selector .= sprintf($_select_button, $disabled, user_theme(),
-			(in_ajax() ? 'display:none;':''),
+			(fallback_mode() ? '' : 'display:none;'),
 			$select_submit)."\n";
 	}
 	default_focus($name);
@@ -887,26 +887,26 @@ function tax_groups_list($name, $selected_id=null,
 	array(
 		'order' => 'id',
 		'spec_option' => $none_option,
-		'spec_id' => 0,
+		'spec_id' => reserved_words::get_all_numeric(),
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 	) );
 }
 
-function tax_groups_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	$str = tax_groups_list($name, $selected_id, false, $submit_on_change);
+	$str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
 	echo "</td>\n";
 	return $str;
 }
 
-function tax_groups_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
 	echo "<tr>\n";
-	$str = tax_groups_list_cells($label, $name, $selected_id, false, $submit_on_change);
+	$str = tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
 	echo "</tr>\n";
 	return $str;
 }
@@ -1225,7 +1225,61 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 	echo "</tr>\n";
 	return $str;
 }
+//-----------------------------------------------------------------------------------------------
+
+function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+	$sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
+		FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
+		WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code"
+		. " AND ".TB_PREF."bank_accounts.account_type=3";
+
+	if ($label != null)
+		echo "<tr><td>$label</td>\n";
+	echo "<td>";
+	$str = combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+	array(
+		'format' => '_format_add_curr',
+		'select_submit'=> $submit_on_change,
+		'async' => true
+	) );
+	echo "</td></tr>\n";
+	return $str;
+}
+//-----------------------------------------------------------------------------------------------
+
+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";
+
+	default_focus($name);
+	echo '<tr>';
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
+
+	$str = combo_input($name, $selected_id, $sql, 'id', 'pos_name',
+	array(
+		'select_submit'=> $submit_on_change,
+		'async' => true,
+		'spec_option' =>$spec_option,
+		'spec_id' => -1,
+	) );
+	echo "</td></tr>\n";
+
+	return $str;	
+}
+//-----------------------------------------------------------------------------------------------
 
+function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+{
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
+	$str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+	echo "</td>\n";
+	return $str;
+}
 //-----------------------------------------------------------------------------------------------
 
 function class_list($name, $selected_id=null, $submit_on_change=false)
@@ -1506,6 +1560,37 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate
 	return $str;
 }
 
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false)
+{
+	$sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+	if ($expense)
+		$sql .= " WHERE deposit=0";
+	else
+		$sql .= " WHERE deposit=1";
+	if ($bank_only)
+		$sql .= " AND bank_only=1";
+	else
+		$sql .= " AND bank_only=0";
+	combo_input($name, $selected_id, $sql, 'id', 'description',
+		array(
+			'spec_id' => '',
+			'order' => 'description',
+			'select_submit'=> $submit_on_change,
+			'async' => false
+		) );
+
+}
+
+function quick_entries_list_row($label, $name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false)
+{
+	echo "<tr><td>$label</td><td>\n";
+	quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change);
+	echo "</td></tr>\n";
+}
+
+
 //------------------------------------------------------------------------------------------------
 
 function wo_types_list($name, $selected_id=null)