Added a date column and combined the # and View column in 'View / Print Transactions.

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

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 3bd7d05e85487bc9d365697e93d3347d1d1dc351..74a9faec64b955a3c2efec6e0b6aed0cc83064d3 100644 (file)
--- 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 <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"));
+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;
@@ -34,9 +40,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        }
        if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
        {
-               $user_comp = user_company();
                $result = $_FILES['pic']['error'];
-               $filename = $comp_path . "/$user_comp/images";
+               $filename = company_path()."/images";
                if (!file_exists($filename))
                {
                        mkdir($filename);
@@ -80,8 +85,7 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        }
        if (check_value('del_coy_logo'))
        {
-               $user_comp = user_company();
-               $filename = $comp_path . "/$user_comp/images/".$_POST['coy_logo'];
+               $filename = company_path()."/images/".$_POST['coy_logo'];
                if (file_exists($filename))
                {
                        $result = unlink($filename);
@@ -96,16 +100,20 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        }
        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'], 
-                       $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'],
-                       $_POST['postal_address'], $_POST['phone'], $_POST['fax'], 
-                       $_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'), $_POST['add_pct'], $_POST['round_to']);
-
+               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', 
+                               'no_item_list' => 0, 'no_customer_list' => 0, 
+                               'no_supplier_list' =>0, 'base_sales', 
+                               'time_zone' => 0, 'add_pct', 'round_to', 'login_tout'))
+               );
+
+               $_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
                display_notification_centered(_("Company setup has been updated."));
        }
        set_focus('coy_name');
@@ -139,12 +147,13 @@ $_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);
+start_outer_table(TABLESTYLE2);
 
 table_section(1);
 
@@ -168,7 +177,7 @@ 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.'));
 
 label_row(_("Company Logo:"), $_POST['coy_logo']);
-label_row(_("New Company Logo (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
+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);
@@ -183,6 +192,7 @@ 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);