X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=c7c5a4061bb80b2449fa96886a35a1c7faf27402;hb=db103dd1d931a0c49fada9e5e8076b9a1add1db8;hp=9ea529965d026c3a51d782d0426cd94c2cccd32b;hpb=70840a5223cf5c9f31d360946225bbad6a2a1943;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 9ea52996..c7c5a406 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -345,7 +345,9 @@ $opts = array(		// default options
         			$img_title = _("Search suppliers");
         			break;
       			case "account":
-        			$link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&client_id=" . $id;
+      			case "account2":
+      				$skip = strtolower($type) == "account" ? false : true;
+        			$link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
         			$img_title = _("Search GL accounts");
         			break;
     		}
@@ -551,10 +553,11 @@ function supplier_list_cells($label, $name, $selected_id=null, $all_option=false
 	$submit_on_change=false, $all=false, $editkey = false)
 {
 	if ($label != null)
-		echo "<td>$label</td><td>\n";
-		echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+		echo "<td>$label</td>\n";
+	echo "<td>";	
+	echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
 		$all, $editkey);
-		echo "</td>\n";
+	echo "</td>\n";
 }
 
 function supplier_list_row($label, $name, $selected_id=null, $all_option = false, 
@@ -1202,7 +1205,7 @@ function tax_types_list_row($label, $name, $selected_id=null, $none_option=false
 function tax_groups_list($name, $selected_id=null,
 	$none_option=false, $submit_on_change=false)
 {
-	$sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
+	$sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups";
 
 	return combo_input($name, $selected_id, $sql, 'id', 'name',
 		array(
@@ -1232,25 +1235,28 @@ function tax_groups_list_row($label, $name, $selected_id=null, $none_option=fals
 
 //------------------------------------------------------------------------------------
 
-function item_tax_types_list($name, $selected_id=null)
+function item_tax_types_list($name, $selected_id=null, $show_inactive = false)
 {
 	$sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
+	if (!$show_inactive)
+		$sql .= " WHERE !inactive";
+
 	return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
 }
 
-function item_tax_types_list_cells($label, $name, $selected_id=null)
+function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	echo item_tax_types_list($name, $selected_id);
+	echo item_tax_types_list($name, $selected_id, $show_inactive);
 	echo "</td>\n";
 }
 
-function item_tax_types_list_row($label, $name, $selected_id=null)
+function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false)
 {
 	echo "<tr><td class='label'>$label</td>";
-	item_tax_types_list_cells(null, $name, $selected_id);
+	item_tax_types_list_cells(null, $name, $selected_id, $show_inactive);
 	echo "</tr>\n";
 }
 
@@ -1308,25 +1314,27 @@ function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=fals
 
 //------------------------------------------------------------------------------------
 
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
 {
 	$sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
-	return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+	return combo_input($name, $selected_id, $sql, 'area_code', 'description', 
+		array('spec_option' => $special_option===true ? ' ' : $special_option,
+		'order' => 'description', 'spec_id' => 0));
 }
 
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	echo sales_areas_list($name, $selected_id);
+	echo sales_areas_list($name, $selected_id, $special_option);
 	echo "</td>\n";
 }
 
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
 {
 	echo "<tr><td class='label'>$label</td>";
-	sales_areas_list_cells(null, $name, $selected_id);
+	sales_areas_list_cells(null, $name, $selected_id, $special_option);
 	echo "</tr>\n";
 }
 
@@ -1802,7 +1810,7 @@ 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, $all=false)
+	$cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
 {
 	if ($skip_bank_accounts)
 		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
@@ -1815,7 +1823,8 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
 		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
 			FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
 			WHERE chart.account_type=type.id";
-
+	if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
+	$account = ($skip_bank_accounts ? "account2" : "account");
 	return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
 		array(
 			'format' => '_format_account',
@@ -1832,7 +1841,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
 			'async' => false,
 			'category' => 2,
 			'show_inactive' => $all
-		), "account" );
+		), $account );
 }
 
 function _format_account($row)
@@ -1842,22 +1851,22 @@ function _format_account($row)
 
 function gl_all_accounts_list_cells($label, $name, $selected_id=null, 
 	$skip_bank_accounts=false, $cells=false, $all_option=false, 
-	$submit_on_change=false, $all=false)
+	$submit_on_change=false, $all=false, $type_id=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
 	echo gl_all_accounts_list($name, $selected_id, 
-		$skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
+		$skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
 	echo "</td>\n";
 }
 
 function gl_all_accounts_list_row($label, $name, $selected_id=null, 
-	$skip_bank_accounts=false, $cells=false, $all_option=false)
+	$skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=false)
 {
 	echo "<tr><td class='label'>$label</td>";
 	gl_all_accounts_list_cells(null, $name, $selected_id, 
-		$skip_bank_accounts, $cells, $all_option);
+		$skip_bank_accounts, $cells, $all_option, $type_id);
 	echo "</tr>\n";
 }
 
@@ -2633,12 +2642,12 @@ function subledger_list($name, $account, $selected_id=null)
 		FROM "
 		.TB_PREF."debtors_master d,"
 		.TB_PREF."cust_branch c
-		WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account);
+		WHERE d.debtor_no=c.debtor_no AND NOT d.inactive AND c.receivables_account=".db_escape($account);
 	else
 		$sql = "SELECT supplier_id as id, supp_ref as name 
 		FROM "
 		.TB_PREF."suppliers s
-		WHERE s.payable_account=".db_escape($account);
+		WHERE NOT s.inactive AND s.payable_account=".db_escape($account);
 
 	$mode = get_company_pref('no_customer_list');