X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fdb%2Fcompany_db.inc;h=ea99d8722c12e454a01d9b2a48c3816e889054a5;hb=ac4ae9a8e2329bb8d56c06759246d02067e2fe09;hp=9ce6cee070330d153f97ee743a23a0de2c341cf3;hpb=f00216978947d0fd076550f1969430265a270ce7;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 9ce6cee0..ea99d872 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -1,9 +1,8 @@
 <?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,
+function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act, 
+		$freight_act,
 		$default_sales_act,
 		$default_sales_discount_act,
 		$default_prompt_payment_act,
@@ -12,7 +11,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,10 +21,7 @@ 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).",
 		default_sales_act=".db_escape($default_sales_act).",
 		default_sales_discount_act=".db_escape($default_sales_discount_act).",
@@ -36,7 +31,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,
@@ -52,7 +46,7 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 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)
+		$no_supplier_list, $base_sales)
 {
 	if ($f_year == null)
 		$f_year = 0;
@@ -77,7 +71,8 @@ function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last,
         custom2_value=".db_escape($custom2_value).",
         custom3_value=".db_escape($custom3_value).",
 		curr_default=".db_escape($curr_default).",
-		f_year=$f_year
+		f_year=$f_year,
+		base_sales=$base_sales
 		WHERE coy_code=1";
 
 	db_query($sql, "The company setup could not be updated ");
@@ -112,12 +107,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");
 }
@@ -129,11 +122,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");
 
@@ -151,17 +142,25 @@ 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");
 
 	commit_transaction();
 }
 
+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];
+}
+
 
 ?>
\ No newline at end of file