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

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 4270bb8f..34af247c 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."));
@@ -40,24 +38,31 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 	}
 	if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
 	{
+    if ($_FILES['pic']['error'] == UPLOAD_ERR_INI_SIZE) {
+			display_error(_('The file size is over the maximum allowed.'));
+			$input_error = 1;
+    }
+    elseif ($_FILES['pic']['error'] > 0) {
+			display_error(_('Error uploading logo file.'));
+			$input_error = 1;
+    }
 		$result = $_FILES['pic']['error'];
 		$filename = company_path()."/images";
 		if (!file_exists($filename))
 		{
 			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 +83,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 +99,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;
@@ -107,10 +111,12 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 		update_company_prefs(
 			get_post( array('coy_name','coy_no','gst_no','tax_prd','tax_last',
 				'postal_address','phone', 'fax', 'email', 'coy_logo', 'domicile',
-				'use_dimension', 'curr_default', 'f_year', 
+				'use_dimension', 'curr_default', 'f_year', 'shortname_name_in_list',
 				'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, 'company_logo_report' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval',
+				'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates',
+				'use_manufacturing', 'use_fixed_assets'))
 		);
 
 		$_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
@@ -120,10 +126,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 	$Ajax->activate('_page_body');
 } /* end of if submit */
 
-//---------------------------------------------------------------------------------------------
-
-
 start_form(true);
+
 $myrow = get_company_prefs();
 
 $_POST['coy_name'] = $myrow["coy_name"];
@@ -139,12 +143,24 @@ $_POST['coy_logo']  = $myrow["coy_logo"];
 $_POST['domicile']  = $myrow["domicile"];
 $_POST['use_dimension']  = $myrow["use_dimension"];
 $_POST['base_sales']  = $myrow["base_sales"];
+if (!isset($myrow["shortname_name_in_list"]))
+{
+	set_company_pref("shortname_name_in_list", "setup.company", "tinyint", 1, '0');
+	$myrow["shortname_name_in_list"] = get_company_pref("shortname_name_in_list");
+}
+$_POST['shortname_name_in_list']  = $myrow["shortname_name_in_list"];
 $_POST['no_item_list']  = $myrow["no_item_list"];
 $_POST['no_customer_list']  = $myrow["no_customer_list"];
 $_POST['no_supplier_list']  = $myrow["no_supplier_list"];
 $_POST['curr_default']  = $myrow["curr_default"];
 $_POST['f_year']  = $myrow["f_year"];
 $_POST['time_zone']  = $myrow["time_zone"];
+if (!isset($myrow["company_logo_report"]))
+{
+	set_company_pref("company_logo_report", "setup.company", "tinyint", 1, '0');
+	$myrow["company_logo_report"] = get_company_pref("company_logo_report");
+}
+$_POST['company_logo_report']  = $myrow["company_logo_report"];
 $_POST['version_id']  = $myrow["version_id"];
 $_POST['add_pct'] = $myrow['add_pct'];
 $_POST['login_tout'] = $myrow['login_tout'];
@@ -153,48 +169,71 @@ 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"];
+$_POST['use_manufacturing']  = $myrow["use_manufacturing"];
+$_POST['use_fixed_assets']  = $myrow["use_fixed_assets"];
 
 start_outer_table(TABLESTYLE2);
 
 table_section(1);
+table_section_title(_("General settings"));
 
-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, 5);
 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.'));
-
-table_section(2);
 
 label_row(_("Company Logo:"), $_POST['coy_logo']);
 file_row(_("New Company Logo (.jpg)") . ":", 'pic', 'pic');
 check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']);
 
-number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
+check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']);
+check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']);
+check_row(_("Company Logo on Reports"), 'company_logo_report', $_POST['company_logo_report']);
+label_row(_("Database Scheme Version"), $_POST['version_id']);
+
+table_section(2);
+
+table_section_title(_("General Ledger Settings"));
+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_title(_("Sales Pricing"));
 sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POST['base_sales'], false,
     _('No base price list') );
+
 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']);
+text_row_ex(_("Round calculated prices to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']);
+label_row("", " ");
+
+
+table_section_title(_("Optional Modules"));
+check_row(_("Manufacturing"), 'use_manufacturing', null);
+check_row(_("Fixed Assets"), 'use_fixed_assets', null);
+number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
 
+table_section_title(_("User Interface Options"));
+
+check_row(_("Short Name and Name in List"), 'shortname_name_in_list', $_POST['shortname_name_in_list']);
 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("", " ");
-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'));
-label_row(_("Version Id"), $_POST['version_id']);
 
 end_outer_table(1);
 
@@ -206,4 +245,3 @@ end_form(2);
 
 end_page();
 
-?>