Bug 5310: DB error when on bank payment/transfer edit if current fiscal year is missi...

[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..4d6d58e876039aa5a7d29ee5fd82280f4323731f 100644 (file)
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -20,9 +20,11 @@ function add_account_type($id, $name, $class_id, $parent)
 function update_account_type($id, $name, $class_id, $parent, $old_id)
 {
        begin_transaction();
-       if ($old_id != $id)
+       if ($old_id !== $id)
        {
-               $sql = "SELECT id FROM ".TB_PREF."chart_types WHERE parent = ".db_escape($old_id);
+               $sql = "SELECT id 
+                       FROM ".TB_PREF."chart_types 
+                       WHERE parent = ".db_escape($old_id);
 
                $result = db_query($sql, "could not get account type");
 
@@ -32,19 +34,23 @@ function update_account_type($id, $name, $class_id, $parent, $old_id)
                                ." WHERE id = '".$myrow['id']."'";
                        db_query($sql, "could not update account type");
                }
-               $sql = "SELECT account_code FROM ".TB_PREF."chart_master WHERE account_type = ".db_escape($old_id);
+               $sql = "SELECT account_code 
+                       FROM ".TB_PREF."chart_master 
+                       WHERE account_type = ".db_escape($old_id);
 
                $result = db_query($sql, "could not get account");
 
                while ($myrow = db_fetch($result))
                {
-               $sql = "UPDATE ".TB_PREF."chart_master SET account_type=".db_escape($id)
+               $sql = "UPDATE ".TB_PREF."chart_master 
+                       SET account_type=".db_escape($id)
                                ." WHERE account_code = '".$myrow['account_code']."'";
                        db_query($sql, "could not update account");
                }
        }
-    $sql = "UPDATE ".TB_PREF."chart_types SET id=".db_escape($id) .", name=".db_escape($name).",
-               class_id=".db_escape($class_id).", parent=".db_escape($parent)
+    $sql = "UPDATE ".TB_PREF."chart_types 
+               SET id=".db_escape($id) .", name=".db_escape($name).",
+                       class_id=".db_escape($class_id).", parent=".db_escape($parent)
                ." WHERE id = ".db_escape($old_id);
 
        $ret = db_query($sql, "could not update account type");
@@ -52,11 +58,25 @@ 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";
+       $where = array();
+       
+       if (!$all)
+               $where[] = "!inactive";
+
+       if ($class_id != false)  
+               $where[] = "class_id=".db_escape($class_id);
+
+       if ($parent == -1) 
+               $where[] ="(parent = '' OR parent = '-1')";
+       elseif ($parent !== false) 
+               $where[] = "parent=".db_escape($parent);
+
+       if (count($where))
+               $sql .= ' WHERE '.implode(' AND ', $where);
        $sql .= " ORDER BY class_id, id, parent";
 
        return db_query($sql, "could not get account types");
@@ -104,13 +124,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)
@@ -139,4 +165,3 @@ function delete_account_class($id)
        db_query($sql, "could not delete account type");
 }
 
-?>
\ No newline at end of file