X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=5ff1c72a0ad8dc6adb9186581e542437b96ac5ae;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=7bdb916e3d3e6d20d964c3269fa216ad1f647c73;hpb=498f13d19b716779a3b986ff399121fb2ac9a53a;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 7bdb916e..5ff1c72a 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -210,9 +210,15 @@ class Report
 					$sql = "SELECT id, name FROM ".TB_PREF."chart_types";
 					$st .= combo_input("PARAM_$index", '', $sql, 'id', 'name',array('spec_option'=>_("No Account Group Filter"),'spec_id'=>ALL_NUMERIC));
 					break;
+				case 'ACCOUNTS_NO_FILTER':
+					$sql = "SELECT id, name FROM ".TB_PREF."chart_types";
+					$st .= combo_input("PARAM_$index", '', $sql, 'id', 'name', null);
+					break;
 				case 'GL_ACCOUNTS':
-					$sql = "SELECT account_code, concat(account_code, ' - ', account_name) as account_name FROM ".TB_PREF."chart_master";
-					$st .= combo_input("PARAM_$index", '', $sql, 'account_code', 'account_name',array('order'=>array('account_code')));
+					$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";
+					$st .= combo_input("PARAM_$index", '', $sql, 'chart.account_code', 'chart.account_name',
+						array('format' => '_format_account','order' => array('type.id','account_code'),'async' => false,'category' => 2));
 					break;
 				case 'BANK_ACCOUNTS':
 					$sql = "SELECT ".TB_PREF."bank_accounts.id, concat(bank_account_name, if (bank_curr_code=curr_default,'', concat(' - ', bank_curr_code))) AS name FROM ".TB_PREF."bank_accounts, ".TB_PREF."company";
@@ -339,18 +345,14 @@ class Report
 					$sql = "SELECT id, user_id FROM ".TB_PREF."users";
 					$st .= combo_input("PARAM_$index", '', $sql, 'id', 'user_id',array('spec_option'=>_("No Users Filter"),'spec_id'=>ALL_NUMERIC));
 					break;
-				case 'ACCOUNTS_NO_FILTER':
-					$sql = "SELECT id, name FROM ".TB_PREF."chart_types";
-					$st .= combo_input("PARAM_$index", '', $sql, 'id', 'name', null);
-					break;
 				case 'ACCOUNTTAGS':
 				case 'DIMENSIONTAGS':
 					if ($param->param_type == 'ACCOUNTTAGS')
-						$type = 0;
+						$type = TAG_ACCOUNT;
 					else
-						$type = 1;
+						$type = TAG_DIMENSION;
 					$sql = "SELECT id, name FROM ".TB_PREF."tags WHERE type=$type"; 
-					$st .= combo_input("PARAM_$index", '', $sql, 'id', 'name',array('spec_option'=>_("No tags"),'spec_id' => ALL_NUMERIC,'multi'=>true,'height'=>4));
+					$st .= combo_input("PARAM_$index", '', $sql, 'id', 'name',array('spec_option'=>_("No tags"),'spec_id' => ALL_NUMERIC,'multi'=>true,'height'=>5));
 					break;
 
 			}