X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=899c039a645936d746bc357b72b35253fd886634;hb=a0a0a0e1318042034fe5652caa69b034200c8a90;hp=ff9dd5a9f1918eeb24cbd56de09097c02fe509c0;hpb=8259c324f645a39cb847d5a4346b70e225e1b02c;p=fa-stable.git
diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index ff9dd5a9..899c039a 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -1,23 +1,37 @@
.
+***********************************************************************/
+$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");
include_once($path_to_root . "/admin/db/company_db.inc");
-
//-------------------------------------------------------------------------------------------------
-if (isset($_POST['submit']) && $_POST['submit'] != "")
+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;
@@ -26,9 +40,8 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
}
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);
@@ -36,24 +49,24 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
$filename .= "/".$_FILES['pic']['name'];
//But check for the worst
- if (strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)) != 'JPG')
+ if (!in_array((substr(trim($_FILES['pic']['name']),-3)),
+ array('jpg','JPG','png','PNG')))
{
- display_notification(_('Only jpg files are supported - a file extension of .jpg is expected'));
+ 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))
{ //File Size Check
- display_notification(_('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') . ' ' . $max_image_size);
$input_error = 1;
}
elseif ( $_FILES['pic']['type'] == "text/plain" )
{ //File type Check
- display_notification( _('Only graphics files can be uploaded'));
+ display_error( _('Only graphics files can be uploaded'));
$input_error = 1;
}
elseif (file_exists($filename))
{
- display_notification(_('Attempting to overwrite an existing item image'));
$result = unlink($filename);
if (!$result)
{
@@ -66,22 +79,44 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
{
$result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
$_POST['coy_logo'] = $_FILES['pic']['name'];
- $message = ($result)?_('File url') ."$filename" : "Somthing is wrong with uploading a file.";
+ if(!$result)
+ display_error(_('Error uploading logo file'));
}
- /* EOF Add Image upload for New Item - by Ori */
}
-
+ if (check_value('del_coy_logo'))
+ {
+ $filename = company_path()."/images/".$_POST['coy_logo'];
+ if (file_exists($filename))
+ {
+ $result = unlink($filename);
+ if (!$result)
+ {
+ display_error(_('The existing image could not be removed'));
+ $input_error = 1;
+ }
+ else
+ $_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'], $_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['custom1_name'], $_POST['custom2_name'], $_POST['custom3_name'],
- $_POST['custom1_value'], $_POST['custom2_value'], $_POST['custom3_value'],
- $_POST['curr_default'], $_POST['f_year'], check_value('no_item_list'), check_value('no_customer_list'),
- check_value('no_supplier_list'), $_POST['base_sales']);
-
+ 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', 'auto_curr_reval'))
+ );
+
+ $_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
display_notification_centered(_("Company setup has been updated."));
}
+ set_focus('coy_name');
$Ajax->activate('_page_body');
} /* end of if submit */
@@ -89,7 +124,6 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
start_form(true);
-
$myrow = get_company_prefs();
$_POST['coy_name'] = $myrow["coy_name"];
@@ -108,67 +142,65 @@ $_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['custom1_name'] = $myrow["custom1_name"];
-$_POST['custom2_name'] = $myrow["custom2_name"];
-$_POST['custom3_name'] = $myrow["custom3_name"];
-$_POST['custom1_value'] = $myrow["custom1_value"];
-$_POST['custom2_value'] = $myrow["custom2_value"];
-$_POST['custom3_value'] = $myrow["custom3_value"];
$_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['auto_curr_reval'] = $myrow['auto_curr_reval'];
+$_POST['del_coy_logo'] = 0;
+
+start_outer_table(TABLESTYLE2);
-start_table($table_style2);
+table_section(1);
text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50);
-text_row_ex(_("Official Company Number:"), 'coy_no', 25);
-text_row_ex(_("Tax Authority Reference:"), 'gst_no', 25);
+textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 6);
+text_row_ex(_("Domicile:"), 'domicile', 25, 55);
-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.'));
+text_row_ex(_("Phone Number:"), 'phone', 25, 55);
+text_row_ex(_("Fax Number:"), 'fax', 25);
+email_row_ex(_("Email Address:"), 'email', 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.'));
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
+table_section(2);
-text_row_ex(_("Telephone Number:"), 'phone', 25, 55);
-text_row_ex(_("Facsimile Number:"), 'fax', 25);
-text_row_ex(_("Email Address:"), 'email', 25, 55);
label_row(_("Company Logo:"), $_POST['coy_logo']);
-label_row(_("New Company Logo (.jpg)") . ":", "");
-
-text_row_ex(_("Domicile:"), 'domicile', 25, 55);
+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);
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']);
+label_row("", " ");
+
+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);
-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']);
-
-start_row();
-end_row();
-label_row(_("Custom Field Name"), _("Custom Field Value"));
-
-start_row();
-text_cells(null, 'custom1_name', $_POST['custom1_name'], 25, 25);
-text_cells(null, 'custom1_value', $_POST['custom1_value'], 30, 30);
-end_row();
-
-start_row();
-text_cells(null, 'custom2_name', $_POST['custom2_name'], 25, 25);
-text_cells(null, 'custom2_value', $_POST['custom2_value'], 30, 30);
-end_row();
-
-start_row();
-text_cells(null, 'custom3_name', $_POST['custom3_name'], 25, 25);
-text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30);
-end_row();
-
-end_table(1);
hidden('coy_logo', $_POST['coy_logo']);
-submit_center('submit', _("Update"), true, '', true);
+submit_center('update', _("Update"), true, '', 'default');
end_form(2);
//-------------------------------------------------------------------------------------------------