X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=3ee19edbc7a493be95e19e3763c7ecd0d95cf7ef;hb=9dab04be9d81766f1878d3688ee73d0bcf29f5d2;hp=6bcb0dbd41f81b2789557db48003c4fbbad9c347;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 6bcb0dbd..3ee19edb 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security =10; -$path_to_root=".."; +$page_security = 'SA_SETUPCOMPANY'; +$path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Company Setup")); +page(_($help_context = "Company Setup")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -26,6 +26,12 @@ 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.")); + set_focus('login_tout'); + $input_error = 1; + } if (strlen($_POST['coy_name'])==0) { $input_error = 1; @@ -94,6 +100,10 @@ if (isset($_POST['update']) && $_POST['update'] != "") $_POST['coy_logo'] = ""; } } + if ($_POST['add_pct'] == "") + $_POST['add_pct'] = -1; + if ($_POST['round_to'] <= 0) + $_POST['round_to'] = 1; if ($input_error != 1) { update_company_setup($_POST['coy_name'], $_POST['coy_no'], @@ -102,8 +112,10 @@ if (isset($_POST['update']) && $_POST['update'] != "") $_POST['email'], $_POST['coy_logo'], $_POST['domicile'], $_POST['use_dimension'], $_POST['curr_default'], $_POST['f_year'], check_value('no_item_list'), check_value('no_customer_list'), - check_value('no_supplier_list'), $_POST['base_sales'], check_value('time_zone')); - + check_value('no_supplier_list'), $_POST['base_sales'], + check_value('time_zone'), $_POST['add_pct'], $_POST['round_to'], + $_POST['login_tout']); + $_SESSION['wa_current_user']->timeout = $_POST['login_tout']; display_notification_centered(_("Company setup has been updated.")); } set_focus('coy_name'); @@ -114,30 +126,33 @@ if (isset($_POST['update']) && $_POST['update'] != "") start_form(true); -if (!isset($_POST['coy_name'])) { - $myrow = get_company_prefs(); - - $_POST['coy_name'] = $myrow["coy_name"]; - $_POST['gst_no'] = $myrow["gst_no"]; - $_POST['tax_prd'] = $myrow["tax_prd"]; - $_POST['tax_last'] = $myrow["tax_last"]; - $_POST['coy_no'] = $myrow["coy_no"]; - $_POST['postal_address'] = $myrow["postal_address"]; - $_POST['phone'] = $myrow["phone"]; - $_POST['fax'] = $myrow["fax"]; - $_POST['email'] = $myrow["email"]; - $_POST['coy_logo'] = $myrow["coy_logo"]; - $_POST['domicile'] = $myrow["domicile"]; - $_POST['use_dimension'] = $myrow["use_dimension"]; - $_POST['base_sales'] = $myrow["base_sales"]; - $_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"]; - $_POST['version_id'] = $myrow["version_id"]; -} +$myrow = get_company_prefs(); + +$_POST['coy_name'] = $myrow["coy_name"]; +$_POST['gst_no'] = $myrow["gst_no"]; +$_POST['tax_prd'] = $myrow["tax_prd"]; +$_POST['tax_last'] = $myrow["tax_last"]; +$_POST['coy_no'] = $myrow["coy_no"]; +$_POST['postal_address'] = $myrow["postal_address"]; +$_POST['phone'] = $myrow["phone"]; +$_POST['fax'] = $myrow["fax"]; +$_POST['email'] = $myrow["email"]; +$_POST['coy_logo'] = $myrow["coy_logo"]; +$_POST['domicile'] = $myrow["domicile"]; +$_POST['use_dimension'] = $myrow["use_dimension"]; +$_POST['base_sales'] = $myrow["base_sales"]; +$_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"]; +$_POST['version_id'] = $myrow["version_id"]; +$_POST['add_pct'] = $myrow['add_pct']; +$_POST['login_tout'] = $myrow['login_tout']; +if ($_POST['add_pct'] == -1) + $_POST['add_pct'] = ""; +$_POST['round_to'] = $myrow['round_to']; $_POST['del_coy_logo'] = 0; start_outer_table($table_style2); @@ -146,6 +161,7 @@ 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(_("Domicile:"), 'domicile', 25, 55); text_row_ex(_("Phone Number:"), 'phone', 25, 55); text_row_ex(_("Fax Number:"), 'fax', 25); @@ -165,17 +181,20 @@ text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months label_row(_("Company Logo:"), $_POST['coy_logo']); label_row(_("New Company Logo (.jpg)") . ":", ""); check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']); -text_row_ex(_("Domicile:"), 'domicile', 25, 55); number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2); 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']); -check_row(_("Search Item List"), 'no_item_list', $_POST['no_item_list']); -check_row(_("Search Customer List"), 'no_customer_list', $_POST['no_customer_list']); -check_row(_("Search Supplier List"), 'no_supplier_list', $_POST['no_supplier_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(_("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);