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

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 75d89eae..52185138 100644
--- 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;
 }
@@ -28,7 +30,7 @@ function update_company_prefs( $params )
 	$prefs can be preference name, array of names, or null for all preferences.
 	
 */
-function get_company_pref($prefs = null, $tbpref = TB_PREF)
+function get_company_pref($prefs = null, $tbpref = null)
 {
 	global $SysPrefs, $core_version;
 	
@@ -36,7 +38,10 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
 
 		$_SESSION['SysPrefs'] = new sys_prefs();
 
-		$sql = "SELECT name, value FROM ".$tbpref."sys_prefs";
+		if (!isset($tbpref))
+			$tbpref = TB_PREF;
+
+		$sql = "SELECT name, value FROM {$tbpref}sys_prefs";
 		$result = @db_query($sql); // supress errors before 2.3 db structure upgrade
 
 		if(!$result)
@@ -57,7 +62,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 +78,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 +138,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);
 }
 
@@ -149,15 +152,36 @@ function get_payment_terms_all($show_inactive)
 	if (!$show_inactive) $sql .= " WHERE !inactive";
 	return db_query($sql,"could not get payment terms");
 }
-
-function key_in_foreign_table($id, $table, $key, $escaped=false)
+/*
+	Return number of records in tables, where some foreign key $id is used.
+	$id - searched key value
+	$tables - array of table names (without prefix); when table name is used as a key, then
+		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)
 {
 	if (!$escaped)
 		$id = db_escape($id);
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."$table WHERE $key = $id";
-	$result = db_query($sql,"check $table relations failed");
-	$myrow = db_fetch_row($result);
-	return ($myrow[0] > 0); 
+
+	if (!is_array($tables))
+		$tables = array($tables);
+
+	$sqls = array();
+	foreach ($tables as $tbl => $key) {
+		if (is_numeric($tbl)) {
+			$tbl = $key;
+			$key = $stdkey;
+		}
+		$sqls[] = "(SELECT COUNT(*) as cnt FROM ".TB_PREF."$tbl WHERE $key=$id)\n";
+	}
+
+	$sql = "SELECT sum(cnt) FROM (". implode(' UNION ', $sqls).") as counts";
+
+	$result = db_query($sql, "check relations for ".implode(',',$tables)." failed");
+	$count =  db_fetch($result);
+
+	return $count[0];
 }
 
 ?>
\ No newline at end of file