X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=f4e7f9264b7b5a8ed1f500ba5f24807a5f123ea0;hb=c001557f8ebee630494c6323477bd865a61942d9;hp=9407f15c5458d7024297a90713b3c74edc273867;hpb=469ef80b1b4e95284a1f2469205a63161282276d;p=fa-stable.git

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 9407f15c..f4e7f926 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -36,6 +36,30 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 		display_error(_("The company name must be entered."));
 		set_focus('coy_name');
 	}
+	if (!check_num('tax_prd', 1))
+	{
+		display_error(_("Tax Periods must be positive number."));
+		set_focus('tax_prd');
+		$input_error = 1;
+	}
+	if (!check_num('tax_last', 1))
+	{
+		display_error(_("Tax Last Periods must be positive number."));
+		set_focus('tax_last');
+		$input_error = 1;
+	}
+	if (!check_num('round_to', 1))
+	{
+		display_error(_("Round Calculated field must be a positive number."));
+		set_focus('round_to');
+		$input_error = 1;
+	}
+	if ($_POST['add_pct'] != "" && !is_numeric($_POST['add_pct']))
+	{
+		display_error(_("Add Price from Std Cost field must be number."));
+		set_focus('add_pct');
+		$input_error = 1;
+	}	
 	if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
 	{
     if ($_FILES['pic']['error'] == UPLOAD_ERR_INI_SIZE) {
@@ -114,16 +138,16 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 				'use_dimension', 'curr_default', 'f_year', 'shortname_name_in_list',
 				'no_item_list' => 0, 'no_customer_list' => 0, 
 				'no_supplier_list' =>0, 'base_sales', 'ref_no_auto_increase' => 0,
-				'time_zone' => 0, 'company_logo_report' => 0, 'barcodes_on_stock' => 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'))
+				'time_zone' => 0, 'company_logo_report' => 0, 'barcodes_on_stock' => 0, 'print_dialog_direct' => 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'];
 		display_notification_centered(_("Company setup has been updated."));
+		set_focus('coy_name');
+		$Ajax->activate('_page_body');
 	}
-	set_focus('coy_name');
-	$Ajax->activate('_page_body');
 } /* end of if submit */
 
 start_form(true);
@@ -173,6 +197,12 @@ if (!isset($myrow["barcodes_on_stock"]))
 	$myrow["barcodes_on_stock"] = get_company_pref("barcodes_on_stock");
 }
 $_POST['barcodes_on_stock']  = $myrow["barcodes_on_stock"];
+if (!isset($myrow["print_dialog_direct"]))
+{
+	set_company_pref("print_dialog_direct", "setup.company", "tinyint", 1, '0');
+	$myrow["print_dialog_direct"] = get_company_pref("print_dialog_direct");
+}
+$_POST['print_dialog_direct']  = $myrow["print_dialog_direct"];
 $_POST['version_id']  = $myrow["version_id"];
 $_POST['add_pct'] = $myrow['add_pct'];
 $_POST['login_tout'] = $myrow['login_tout'];
@@ -244,6 +274,7 @@ number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
 table_section_title(_("User Interface Options"));
 
 check_row(_("Short Name and Name in List"), 'shortname_name_in_list', $_POST['shortname_name_in_list']);
+check_row(_("Open Print Dialog Direct on Reports"), 'print_dialog_direct', null);
 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);