X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=899c039a645936d746bc357b72b35253fd886634;hb=1b163e169c22e3b38d3bb766ceee8fa2b08aa084;hp=66a11281fa9cabb3711b2440bf36ec3961d2bd12;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 66a11281..899c039a 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -13,7 +13,7 @@ $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");
@@ -40,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);
@@ -86,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);
@@ -102,17 +100,19 @@ 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'],
-			$_POST['login_tout']);
+		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."));
 	}
@@ -151,9 +151,10 @@ $_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($table_style2);
+start_outer_table(TABLESTYLE2);
 
 table_section(1);
 
@@ -170,14 +171,13 @@ 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']);
-
-table_section(2);
-
 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']);
-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);
@@ -186,11 +186,13 @@ sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POS
 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("", "&nbsp;");
 
 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(_("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']);