Added fixed asset related db changes in upgrade class.

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

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 8762378dcd6573eaf0b16ecfbd084cb0061c9ffe..74b7071bbe76a9b4e926bd1f045fa9809d6c1946 100644 (file)
--- 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,6 +38,14 @@ 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))
@@ -49,14 +55,14 @@ if (isset($_POST['update']) && $_POST['update'] != "")
                $filename .= "/".clean_file_name($_FILES['pic']['name']);
 
                 //But check for the worst
-               if (!in_array( substr($filename,-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" )
@@ -109,7 +115,7 @@ if (isset($_POST['update']) && $_POST['update'] != "")
                                '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',
-                               'bcc_email'))
+                               'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates'))
                );
 
                $_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
@@ -119,13 +125,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        $Ajax->activate('_page_body');
 } /* 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();
-}
-
 start_form(true);
+
 $myrow = get_company_prefs();
 
 $_POST['coy_name'] = $myrow["coy_name"];
@@ -156,28 +157,31 @@ $_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', 25, 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);
 
@@ -197,6 +201,7 @@ 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'));
@@ -212,4 +217,3 @@ end_form(2);
 
 end_page();
 
-?>