X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=fde84cfe29b2a69ccd04a8807659f9faa0e8c9cd;hb=16ba695b81cd7283faa18372a74670415b562eb5;hp=29c1caf900da1f9159155fbdaef176fa989c69c9;hpb=217f175953339fd10cd5aee5942cc263a4092323;p=fa-stable.git

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 29c1caf9..fde84cfe 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -1,9 +1,9 @@
 <?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,
+		$exchange_diff_act,
 		$default_sales_act,
 		$default_sales_discount_act,
 		$default_prompt_payment_act,
@@ -12,7 +12,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,
@@ -22,21 +21,18 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 		$default_dim_required)
 {
 	$sql = "UPDATE ".TB_PREF."company SET
-		debtors_act='$debtors_act', pyt_discount_act='$pyt_discount_act',
-		creditors_act='$creditors_act', grn_act='$grn_act',
-		exchange_diff_act='$exchange_diff_act',
-		purch_exchange_diff_act='$purch_exchange_diff_act',
-		retained_earnings_act='$retained_earnings_act',
-		freight_act='$freight_act',
-		default_sales_act='$default_sales_act',
-		default_sales_discount_act='$default_sales_discount_act',
-		default_prompt_payment_act='$default_prompt_payment_act',
-		default_inventory_act='$default_inventory_act',
-		default_cogs_act='$default_cogs_act',
-		default_adj_act='$default_adj_act',
-		default_inv_sales_act='$default_inv_sales_act',
-		default_assembly_act='$default_assembly_act',
-		payroll_act='$payroll_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).",
+		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).",
+		default_inventory_act=".db_escape($default_inventory_act).",
+		default_cogs_act=".db_escape($default_cogs_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).",
 		allow_negative_stock=$allow_negative_stock,
 		po_over_receive=$po_over_receive,
 		po_over_charge=$po_over_charge,
@@ -52,40 +48,42 @@ 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;
-	$sql = "UPDATE ".TB_PREF."company SET coy_name='$coy_name',
-		coy_no = '$coy_no',
-		gst_no='$gst_no',
+	$sql = "UPDATE ".TB_PREF."company SET coy_name=".db_escape($coy_name).",
+		coy_no = ".db_escape($coy_no).",
+		gst_no=".db_escape($gst_no).",
 		tax_prd=$tax_prd,
 		tax_last=$tax_last,
-		postal_address ='$postal_address',
-		phone='$phone', fax='$fax',
-		email='$email',
-		coy_logo='$coy_logo',
-		domicile='$domicile',
+		postal_address =".db_escape($postal_address).",
+		phone=".db_escape($phone).", fax=".db_escape($fax).",
+		email=".db_escape($email).",
+		coy_logo=".db_escape($coy_logo).",
+		domicile=".db_escape($domicile).",
 		use_dimension=$Dimension,
 		no_item_list=$no_item_list,
 		no_customer_list=$no_customer_list,
 		no_supplier_list=$no_supplier_list,
-        custom1_name='$custom1_name',
-        custom2_name='$custom2_name',
-        custom3_name='$custom3_name',
-        custom1_value='$custom1_value',
-        custom2_value='$custom2_value',
-        custom3_value='$custom3_value',
-		curr_default='$curr_default',
-		f_year=$f_year
+        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
 		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)
@@ -94,9 +92,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,17 +105,15 @@ function add_fiscalyear($from_date, $to_date, $closed)
 	$to = date2sql($to_date);
 
 	$sql = "INSERT INTO ".TB_PREF."fiscal_year (begin, end, closed)
-		VALUES ('$from', '$to', $closed)";
+		VALUES (".db_escape($from).",".db_escape($to).", $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='$from'";
+		WHERE id=".db_escape($id);
 
 	db_query($sql, "could not update fiscal year");
 }
@@ -129,11 +125,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='$from'";
+	$sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($id);
 
 	$result = db_query($sql, "could not get fiscal year");
 
@@ -151,17 +145,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='$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