Minor adjustments

diff --git a/reporting/includes/class.graphic.inc b/reporting/includes/class.graphic.inc
index 19572288bec1c13fae1d174d4155d72732e80593..c80f33775e377f28238dfe726450d72579e0c5d8 100644 (file)
--- a/reporting/includes/class.graphic.inc
+++ b/reporting/includes/class.graphic.inc
@@ -223,7 +223,7 @@ class graph
         imagefill($this->img, 0, 0, $this->color['background']);
         //imagefilledrectangle($this->img, 0, 0, $this->width, $this->height, $this->color['background']);
         if ($border)
-               imagerectangle($this->img, 0, 0, $this->width-1, $this->height-1, $this->color['bars']);
+               imagerectangle($this->img, 0, 0, $this->width-1, $this->height-1, imagecolorallocate($this->img, 100, 150, 200));
 
         // Draw title
         if (!empty($this->title))

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 7bdb916e3d3e6d20d964c3269fa216ad1f647c73..530add3d1124cbd5e46fb5f391320fb0561a6535 100644 (file)
--- 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,10 +345,6 @@ 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')