Better sorting in new gl types and gl accounts

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 201c16b04b5e4fceeb410a53c3e3320f98478ebb..1a2abca2af08d482fa26ddba06477798b5b9bbc4 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -26,6 +26,7 @@ $ /gl/manage/gl_account_classes.php
   /gl/manage/gl_account_types.php
   /gl/manage/gl_accounts.php
   /gl/includes/db/gl_db_account_types.inc
+  /includes/ui/ui_lists.inc
   /sql/alter2.3.sql
   /sql/en_US-demo.sql
   /sql/en_US-new.sql

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index e4f14c1ad83dd14c1e821c3958f42e518dd9905a..5d879897752f2d2346e6c0a4b23d30f7aac1916d 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1529,7 +1529,7 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
-               'order' => 'id',
+               'order' => 'class_id', 'id',
                'spec_option' =>$all_option,
                'spec_id' => $all_option_numeric ? 0 : $all_items
        ) );
@@ -1575,7 +1575,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                'format' => '_format_account',
                'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
                'spec_id' => '',
-               'order' => array('type.id','account_code'),
+               'order' => array('type.class_id','type.id','account_code'),
                'search_box' => $cells,
                        'search_submit' => false,
                        'size' => 12,