X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=817b5d19b0c0eec69fc4a2b638a6624202f22ce2;hb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;hp=5108f3aa4049905ae02531af1d676e983b9f4965;hpb=921b0e7df6265ed280080b7810105fa4d93d9aa6;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 5108f3aa..817b5d19 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -1,9 +1,17 @@
 <?php
-
-
-function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act, $grn_act,
-		$exchange_diff_act, $purch_exchange_diff_act,
-		$retained_earnings_act, $freight_act,
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
+function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act,
+		$freight_act,
+		$exchange_diff_act,
 		$default_sales_act,
 		$default_sales_discount_act,
 		$default_prompt_payment_act,
@@ -12,7 +20,6 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 		$default_adj_act,
 		$default_inv_sales_act,
 		$default_assembly_act,
-		$payroll_act,
 		$allow_negative_stock,
 		$po_over_receive,
 		$po_over_charge,
@@ -23,11 +30,9 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 {
 	$sql = "UPDATE ".TB_PREF."company SET
 		debtors_act=".db_escape($debtors_act).", pyt_discount_act=".db_escape($pyt_discount_act).",
-		creditors_act=".db_escape($creditors_act).", grn_act=".db_escape($grn_act).",
-		exchange_diff_act=".db_escape($exchange_diff_act).",
-		purch_exchange_diff_act=".db_escape($purch_exchange_diff_act).",
-		retained_earnings_act=".db_escape($retained_earnings_act).",
+		creditors_act=".db_escape($creditors_act).",
 		freight_act=".db_escape($freight_act).",
+		exchange_diff_act=".db_escape($exchange_diff_act).",
 		default_sales_act=".db_escape($default_sales_act).",
 		default_sales_discount_act=".db_escape($default_sales_discount_act).",
 		default_prompt_payment_act=".db_escape($default_prompt_payment_act).",
@@ -36,7 +41,6 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 		default_adj_act=".db_escape($default_adj_act).",
 		default_inv_sales_act=".db_escape($default_inv_sales_act).",
 		default_assembly_act=".db_escape($default_assembly_act).",
-		payroll_act=".db_escape($payroll_act).",
 		allow_negative_stock=$allow_negative_stock,
 		po_over_receive=$po_over_receive,
 		po_over_charge=$po_over_charge,
@@ -84,9 +88,10 @@ function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last,
 	db_query($sql, "The company setup could not be updated ");
 }
 
-function get_company_prefs()
+function get_company_prefs($tbpref = TB_PREF)
 {
-	$sql = "SELECT * FROM ".TB_PREF."company WHERE coy_code=1";
+	$sql = "SELECT * FROM ".$tbpref."company WHERE coy_code=1";
+	
 	$result = db_query($sql, "The company preferences could not be retrieved");
 
 	if (db_num_rows($result) == 0)
@@ -95,9 +100,9 @@ function get_company_prefs()
 	return db_fetch($result);
 }
 
-function get_company_pref($pref_name)
+function get_company_pref($pref_name, $tbpref = TB_PREF)
 {
-	$prefs = get_company_prefs();
+	$prefs = get_company_prefs($tbpref);
 	return $prefs[$pref_name];
 }
 
@@ -113,12 +118,10 @@ function add_fiscalyear($from_date, $to_date, $closed)
 	db_query($sql, "could not add fiscal year");
 }
 
-function update_fiscalyear($from_date, $closed)
+function update_fiscalyear($id, $closed)
 {
-	$from = date2sql($from_date);
-
 	$sql = "UPDATE ".TB_PREF."fiscal_year SET closed=$closed
-		WHERE begin=".db_escape($from);
+		WHERE id=".db_escape($id);
 
 	db_query($sql, "could not update fiscal year");
 }
@@ -130,11 +133,9 @@ function get_all_fiscalyears()
 	return db_query($sql, "could not get all fiscal years");
 }
 
-function get_fiscalyear($from_date)
+function get_fiscalyear($id)
 {
-	$from = date2sql($from_date);
-
-	$sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE begin=".db_escape($from);
+	$sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($id);
 
 	$result = db_query($sql, "could not get fiscal year");
 
@@ -152,12 +153,11 @@ function get_current_fiscalyear()
 	return db_fetch($result);
 }
 
-function delete_fiscalyear($from_date)
+function delete_fiscalyear($id)
 {
-	$from = date2sql($from_date);
 	begin_transaction();
 
-	$sql="DELETE FROM ".TB_PREF."fiscal_year WHERE begin=".db_escape($from);
+	$sql="DELETE FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($id);
 
 	db_query($sql, "could not delete fiscal year");
 
@@ -167,7 +167,7 @@ function delete_fiscalyear($from_date)
 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];