X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=632bab18a4775f83cf93de32571eb9612f72d860;hb=a92ebdde7985571d5ce5e9777b5b436ec3cec110;hp=75d89eae034fda36bdd62960cbb371dab7a4e065;hpb=f7b0f0130571e3473baead5cffe25666170fe70f;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 75d89eae..632bab18 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -19,6 +19,8 @@ function update_company_prefs( $params )
 		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;
 }
@@ -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);
 }