Reverse order of transaction in admin/view void transaction (last transaction appears...

[fa-stable.git] / admin / db / company_db.inc

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 64f44bc3f3992873966cbf4f9235127cc5e1f340..b75251d5feabc2cc0d3df5e95c29f1f061853660 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -37,7 +37,7 @@ function get_company_pref($prefs = null, $tbpref = null)
        static $cached; // retrieve values from db once a request. Some values can't be cached between requests
                                        // to ensure prefs integrity for all usrs (e.g. gl_close_date).
        
-       if (!$cached) { // cached preferences
+       if (!$cached || !isset($_SESSION['SysPrefs'])) { // cached preferences
 
                $_SESSION['SysPrefs'] = new sys_prefs();
 
@@ -177,10 +177,8 @@ function get_payment_terms_all($show_inactive)
                value is name of foreign key field. For numeric keys $stdkey field name is used.
        $stdkey - standard name of foreign key.
 */
-function key_in_foreign_table($id, $tables, $stdkey, $escaped=false)
+function key_in_foreign_table($id, $tables, $stdkey)
 {
-       if (!$escaped)
-               $id = db_escape($id);
 
        if (!is_array($tables))
                $tables = array($tables);
@@ -191,7 +189,7 @@ function key_in_foreign_table($id, $tables, $stdkey, $escaped=false)
                        $tbl = $key;
                        $key = $stdkey;
                }
-               $sqls[] = "(SELECT COUNT(*) as cnt FROM ".TB_PREF."$tbl WHERE $key=$id)\n";
+               $sqls[] = "(SELECT COUNT(*) as cnt FROM `".TB_PREF."$tbl` WHERE `$key`=".db_escape($id).")\n";
        }
 
        $sql = "SELECT sum(cnt) FROM (". implode(' UNION ', $sqls).") as counts";