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."));
}
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))
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" )
'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', 'auto_curr_reval',
- 'bcc_email'))
+ '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'];
$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"];
$_POST['curr_default'] = $myrow["curr_default"];
$_POST['f_year'] = $myrow["f_year"];
$_POST['time_zone'] = $myrow["time_zone"];
+if (empty($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'];
$_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', 50, 50);
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 34, 6);
+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(_("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(_("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);
end_page();
-?>
projects / fa-stable.git / blobdiff