Merging changes form main trunk 2.2.5-2.2.6

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

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 685619736746e6bffbd9b152d5adf4ed95f8c3d0..34bbdaabd1786c9b26131e4237515d1f0b6e791c 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -34,7 +34,7 @@ function delete_gl_account($code)
        db_query($sql, "could not delete gl account");
 }
 
-function get_gl_accounts($from=null, $to=null)
+function get_gl_accounts($from=null, $to=null, $type=null)
 {
        $sql = "SELECT ".TB_PREF."chart_master.*,".TB_PREF."chart_types.name AS AccountTypeName
                FROM ".TB_PREF."chart_master,".TB_PREF."chart_types
@@ -43,6 +43,8 @@ function get_gl_accounts($from=null, $to=null)
                $sql .= " AND ".TB_PREF."chart_master.account_code >= ".db_escape($from);
        if ($to != null)
                $sql .= " AND ".TB_PREF."chart_master.account_code <= ".db_escape($to);
+       if ($type != null)
+               $sql .= " AND account_type=".db_escape($type);
        $sql .= " ORDER BY account_code";
 
        return db_query($sql, "could not get gl accounts");