X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=b889aeb96031bbdedc115bdc56463648ce74a897;hb=11403450bbf64674332f64459670a1c06dd92265;hp=4270bb8f83fc7f1e2cbd9e5ceab569cd021a5545;hpb=4a4cafb0a0184fdcc96fcde391f01ce02dbf31b1;p=fa-stable.git

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 4270bb8f..b889aeb9 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -23,9 +23,7 @@ include_once($path_to_root . "/admin/db/company_db.inc");
 
 if (isset($_POST['update']) && $_POST['update'] != "")
 {
-
 	$input_error = 0;
-
 	if (!check_num('login_tout', 10))
 	{
 		display_error(_("Login timeout must be positive number not less than 10."));
@@ -46,18 +44,17 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 		{
 			mkdir($filename);
 		}
-		$filename .= "/".$_FILES['pic']['name'];
+		$filename .= "/".clean_file_name($_FILES['pic']['name']);
 
 		 //But check for the worst
-		if (!in_array((substr(trim($_FILES['pic']['name']),-3)), 
-			array('jpg','JPG','png','PNG')))
+		if (!in_array( substr($filename,-4), array('.jpg','.JPG','.png','.PNG')))
 		{
 			display_error(_('Only jpg and png files are supported - a file extension of .jpg or .png is expected'));
 			$input_error = 1;
 		}
-		elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024))
+		elseif ( $_FILES['pic']['size'] > ($SysPrefs->max_image_size * 1024))
 		{ //File Size Check
-			display_error(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $max_image_size);
+			display_error(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $SysPrefs->max_image_size);
 			$input_error = 1;
 		}
 		elseif ( $_FILES['pic']['type'] == "text/plain" )
@@ -78,14 +75,14 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 		if ($input_error != 1)
 		{
 			$result  =  move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
-			$_POST['coy_logo'] = $_FILES['pic']['name'];
+			$_POST['coy_logo'] = clean_file_name($_FILES['pic']['name']);
 			if(!$result) 
 				display_error(_('Error uploading logo file'));
 		}
 	}
 	if (check_value('del_coy_logo'))
 	{
-		$filename = company_path()."/images/".$_POST['coy_logo'];
+		$filename = company_path()."/images/".clean_file_name($_POST['coy_logo']);
 		if (file_exists($filename))
 		{
 			$result = unlink($filename);
@@ -94,9 +91,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 				display_error(_('The existing image could not be removed'));
 				$input_error = 1;
 			}
-			else
-				$_POST['coy_logo'] = "";
 		}
+		$_POST['coy_logo'] = "";
 	}
 	if ($_POST['add_pct'] == "")
 		$_POST['add_pct'] = -1;
@@ -110,7 +106,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 				'use_dimension', 'curr_default', 'f_year', 
 				'no_item_list' => 0, 'no_customer_list' => 0, 
 				'no_supplier_list' =>0, 'base_sales', 
-				'time_zone' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval'))
+				'time_zone' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval',
+				'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates'))
 		);
 
 		$_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
@@ -121,9 +118,21 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 } /* end of if submit */
 
 //---------------------------------------------------------------------------------------------
-
+if (get_company_pref('bcc_email') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
+	set_company_pref('bcc_email', 'setup.company', 'varchar', 100, '');
+	refresh_sys_prefs();
+}
+if (get_company_pref('alternative_tax_include_on_docs') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
+	set_company_pref('alternative_tax_include_on_docs', 'setup.company', 'tinyint', 1, '0');
+	refresh_sys_prefs();
+}
+if (get_company_pref('suppress_tax_rates') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
+	set_company_pref('suppress_tax_rates', 'setup.company', 'tinyint', 1, '0');
+	refresh_sys_prefs();
+}
 
 start_form(true);
+
 $myrow = get_company_prefs();
 
 $_POST['coy_name'] = $myrow["coy_name"];
@@ -153,26 +162,32 @@ if ($_POST['add_pct'] == -1)
 $_POST['round_to'] = $myrow['round_to'];	
 $_POST['auto_curr_reval'] = $myrow['auto_curr_reval'];	
 $_POST['del_coy_logo']  = 0;
+$_POST['bcc_email']  = $myrow["bcc_email"];
+$_POST['alternative_tax_include_on_docs']  = $myrow["alternative_tax_include_on_docs"];
+$_POST['suppress_tax_rates']  = $myrow["suppress_tax_rates"];
 
 start_outer_table(TABLESTYLE2);
 
 table_section(1);
 
-text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50);
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 6);
+text_row_ex(_("Name (to appear on reports):"), 'coy_name', 50, 50);
+textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 34, 6);
 text_row_ex(_("Domicile:"), 'domicile', 25, 55);
 
 text_row_ex(_("Phone Number:"), 'phone', 25, 55);
 text_row_ex(_("Fax Number:"), 'fax', 25);
-email_row_ex(_("Email Address:"), 'email', 25, 55);
+email_row_ex(_("Email Address:"), 'email', 50, 55);
+
+email_row_ex(_("BCC Address for all outgoing mails:"), 'bcc_email', 50, 55);
 
 text_row_ex(_("Official Company Number:"), 'coy_no', 25);
 text_row_ex(_("GSTNo:"), 'gst_no', 25);
 
-currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
 fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
 text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.'));
 text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.'));
+check_row(_("Put alternative Tax Include on Docs"), 'alternative_tax_include_on_docs', null);
+check_row(_("Suppress Tax Rates on Docs"), 'suppress_tax_rates', null);
 
 table_section(2);
 
@@ -186,11 +201,13 @@ sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POS
 text_row_ex(_("Add Price from Std Cost:"), 'add_pct', 10, 10, '', null, null, "%");
 $curr = get_currency($_POST['curr_default']);
 text_row_ex(_("Round to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']);
+label_row("", " ");
 
 check_row(_("Search Item List"), 'no_item_list', null);
 check_row(_("Search Customer List"), 'no_customer_list', null);
 check_row(_("Search Supplier List"), 'no_supplier_list', null);
 label_row("", " ");
+currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
 check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']);
 check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']);
 text_row_ex(_("Login Timeout:"), 'login_tout', 10, 10, '', null, null, _('seconds'));
@@ -206,4 +223,3 @@ end_form(2);
 
 end_page();
 
-?>