Fixed compatibility issue with MySQL 3.xx

[fa-stable.git] / admin / company_preferences.php

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 124d361a884a5912c3c8c0ce6574c1686a9b2aeb..66a11281fa9cabb3711b2440bf36ec3961d2bd12 100644 (file)
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security =10;
-$path_to_root="..";
+$page_security = 'SA_SETUPCOMPANY';
+$path_to_root = "..";
 include($path_to_root . "/includes/session.inc");
 
 page(_("Company Setup"));
@@ -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,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
                                $_POST['coy_logo'] = "";
                }
        }
+       if ($_POST['add_pct'] == "")
+               $_POST['add_pct'] = -1;
        if ($input_error != 1)
        {
                update_company_setup($_POST['coy_name'], $_POST['coy_no'], 
@@ -102,8 +110,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');
@@ -136,6 +146,11 @@ $_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);
@@ -144,6 +159,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);
@@ -163,17 +179,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)") . ":", "<input type='file' id='pic' name='pic'>");
 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', null);
 check_row(_("Search Customer List"), 'no_customer_list', null);
 check_row(_("Search Supplier List"), 'no_supplier_list', null);
 label_row("", "&nbsp;");
 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);