Merging changes form main trunk 2.2.5-2.2.6

[fa-stable.git] / gl / includes / db / gl_db_account_types.inc

diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc
index 94d27fccffb0028e25c2149a56a6b3f9c2d02208..a3771230116e2fc1d5d8b886216952a52c714a1c 100644 (file)
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -52,11 +52,18 @@ function update_account_type($id, $name, $class_id, $parent, $old_id)
        return $ret;
 }
 
-function get_account_types($all=false)
+function get_account_types($all=false, $class_id=false, $parent=false)
 {
        $sql = "SELECT * FROM ".TB_PREF."chart_types";
 
-       if (!$all) $sql .= " WHERE !inactive";
+       if (!$all) 
+               $sql .= " WHERE !inactive";
+       if ($class_id != false) 
+               $sql .= " AND class_id=".db_escape($class_id);
+       if ($parent == -1) 
+               $sql .= " AND parent <= 0";
+       elseif ($parent != false) 
+               $sql .= " AND parent=".db_escape($parent);
        $sql .= " ORDER BY class_id, id, parent";
 
        return db_query($sql, "could not get account types");
@@ -104,13 +111,19 @@ function update_account_class($id, $name, $ctype)
        return db_query($sql);
 }
 
-function get_account_classes($all=false)
+function get_account_classes($all=false, $balance=-1)
 {
        $sql = "SELECT * FROM ".TB_PREF."chart_class";
-       if (!$all) $sql .= " WHERE !inactive";
+
+       if (!$all) 
+               $sql .= " WHERE !inactive";
+       if ($balance == 0) 
+               $sql .= " AND ctype>".CL_EQUITY." OR ctype=0";
+       elseif ($balance == 1) 
+               $sql .= " AND ctype>0 AND ctype<".CL_INCOME; 
        $sql .= " ORDER BY ctype, cid";
 
-       return db_query($sql, "could not get account types");
+       return db_query($sql, "could not get account classes");
 }
 
 function get_account_class($id)