Removed obsolete complete parameter.

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

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 75d89eae034fda36bdd62960cbb371dab7a4e065..cf20d52b8b00a65b96120d315417b5846916f8fe 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -12,13 +12,15 @@
 /*
        Update main or gl company setup.
 */
-function update_company_prefs( $params )
+function update_company_prefs( $params, $pref = TB_PREF )
 {
-       $sql = "UPDATE ".TB_PREF."sys_prefs SET value = ";
+       $sql = "UPDATE {$pref}sys_prefs SET value = ";
        foreach($params as $name => $value) {
                if (!db_query($sql. db_escape($value). " WHERE name=".db_escape($name),
                         "The company prefferences could not be updated "))
                        return false;
+               // update cached value
+               $_SESSION['SysPrefs']->prefs[$name] = $value;
        }
        return true;
 }
@@ -36,7 +38,7 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
 
                $_SESSION['SysPrefs'] = new sys_prefs();
 
-               $sql = "SELECT name, value FROM ".$tbpref."sys_prefs";
+               $sql = "SELECT name, value FROM {$tbpref}sys_prefs";
                $result = @db_query($sql); // supress errors before 2.3 db structure upgrade
 
                if(!$result)
@@ -57,7 +59,7 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
        if (!$prefs)
                return $all;
        elseif (is_string($prefs))
-               return $all[$prefs];
+               return @$all[$prefs];
 
        $ret = array();
        foreach($prefs as $name)
@@ -73,11 +75,7 @@ function get_company_prefs($tbpref = TB_PREF)
 
 function get_base_sales_type()
 {
-       $sql = "SELECT base_sales FROM ".TB_PREF."company WHERE coy_code=1";
-
-       $result = db_query($sql, "could not get base sales type");
-       $myrow = db_fetch($result);
-       return $myrow[0];
+       return get_company_pref('base_sales');
 }
 
 function get_company_extensions($id = -1) {
@@ -137,9 +135,11 @@ function delete_payment_terms($selected_id)
 
 function get_payment_terms($selected_id)
 {
-       $sql = "SELECT * FROM ".TB_PREF."payment_terms WHERE terms_indicator=".db_escape($selected_id);
+       $sql = "SELECT *, (t.days_before_due=0) AND (t.day_in_following_month=0) as cash_sale
+        FROM ".TB_PREF."payment_terms t WHERE terms_indicator=".db_escape($selected_id);
 
        $result = db_query($sql,"could not get payment term");
+
        return db_fetch($result);
 }