Merged last changes from stable.

[fa-stable.git] / inventory / includes / db / items_category_db.inc

diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc
index 25368ee75e12c1357e0e002e74ab686b952af1c6..b32d472e6b15acc7ccf247e8f223e3e3f74b59a6 100644 (file)
--- a/inventory/includes/db/items_category_db.inc
+++ b/inventory/includes/db/items_category_db.inc
@@ -70,7 +70,9 @@ function get_item_categories($show_inactive)
 {
        $sql = "SELECT c.*, t.name as tax_name FROM ".TB_PREF."stock_category c, "
                .TB_PREF."item_tax_types t WHERE c.dflt_tax_type=t.id";
-       if (!$show_inactive) $sql .= " AND !c.inactive";
+       if (!$show_inactive)
+               $sql .= " AND !c.inactive";
+       $sql .= " ORDER by description";
 
        return db_query($sql, "could not get stock categories");
 }