X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fdb%2Fcompany_db.inc;h=1bb58326d8bacbdefedb7afb4ff14af08bc25b2d;hb=f20f229779b9db77c3f978fac90dfcb571bd551c;hp=e288e1aaa26b186380c24fbd6874056b9ab08d04;hpb=f9a5e41b07e0692301a89b475b6e1fce680e0c8d;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index e288e1aa..1bb58326 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -1,8 +1,19 @@
 <?php
-
-
-function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act, 
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	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/gpl-3.0.html>.
+***********************************************************************/
+
+function update_company_gl_setup($retained_act, $profit_loss_act, $debtors_act, $pyt_discount_act, $creditors_act,
 		$freight_act,
+		$exchange_diff_act,
+		$bank_charge_act,
 		$default_sales_act,
 		$default_sales_discount_act,
 		$default_prompt_payment_act,
@@ -14,15 +25,21 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 		$allow_negative_stock,
 		$po_over_receive,
 		$po_over_charge,
+		$accumulate_shipping,
+		$legal_text,
 		$past_due_days,
 		$default_credit_limit,
 		$default_workorder_required,
-		$default_dim_required)
+		$default_dim_required,
+		$default_delivery_required)
 {
 	$sql = "UPDATE ".TB_PREF."company SET
+		retained_earnings_act=".db_escape($retained_act).", profit_loss_year_act=".db_escape($profit_loss_act).",
 		debtors_act=".db_escape($debtors_act).", pyt_discount_act=".db_escape($pyt_discount_act).",
 		creditors_act=".db_escape($creditors_act).",
 		freight_act=".db_escape($freight_act).",
+		exchange_diff_act=".db_escape($exchange_diff_act).",
+		bank_charge_act=".db_escape($bank_charge_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).",
@@ -34,19 +51,22 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 		allow_negative_stock=$allow_negative_stock,
 		po_over_receive=$po_over_receive,
 		po_over_charge=$po_over_charge,
+		accumulate_shipping=$accumulate_shipping,
+		legal_text=".db_escape($legal_text).",
 		past_due_days=$past_due_days,
 		default_credit_limit=$default_credit_limit,
 		default_workorder_required=$default_workorder_required,
-		default_dim_required=$default_dim_required
+		default_dim_required=$default_dim_required,
+		default_delivery_required=$default_delivery_required
 		WHERE coy_code=1";
 
 	db_query($sql, "The company gl setup could not be updated ");
 }
 
-function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last, $postal_address, $phone, $fax, $email,
-		$coy_logo, $domicile, $Dimension, $custom1_name, $custom2_name, $custom3_name,
-		$custom1_value, $custom2_value, $custom3_value, $curr_default, $f_year, $no_item_list, $no_customer_list,
-		$no_supplier_list, $base_sales)
+function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last, 
+	$postal_address, $phone, $fax, $email, $coy_logo, $domicile, $Dimension, 
+	$curr_default, $f_year, $no_item_list, $no_customer_list, $no_supplier_list, 
+	$base_sales, $time_zone)
 {
 	if ($f_year == null)
 		$f_year = 0;
@@ -64,23 +84,19 @@ function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last,
 		no_item_list=$no_item_list,
 		no_customer_list=$no_customer_list,
 		no_supplier_list=$no_supplier_list,
-        custom1_name=".db_escape($custom1_name).",
-        custom2_name=".db_escape($custom2_name).",
-        custom3_name=".db_escape($custom3_name).",
-        custom1_value=".db_escape($custom1_value).",
-        custom2_value=".db_escape($custom2_value).",
-        custom3_value=".db_escape($custom3_value).",
 		curr_default=".db_escape($curr_default).",
 		f_year=$f_year,
-		base_sales=$base_sales
+		base_sales=$base_sales,
+		time_zone=$time_zone
 		WHERE coy_code=1";
 
 	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)
@@ -89,9 +105,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];
 }
 
@@ -107,12 +123,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");
 }
@@ -124,11 +138,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");
 
@@ -146,12 +158,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");
 
@@ -161,7 +172,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];