X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdisplay_prefs.php;h=e686a81a59ff4d6f1dc493d77a524cb78a3d9a17;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=fb7004da738808dcbbda4bd7539ecb345b63422e;hpb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;p=fa-stable.git

diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index fb7004da..e686a81a 100644
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -30,8 +30,11 @@ if (isset($_POST['setprefs']))
 		display_error( _("Query size must be integer and greater than zero."));
 		set_focus('query_size');
 	} else {
+		$_POST['theme'] = clean_file_name($_POST['theme']);
 		$chg_theme = user_theme() != $_POST['theme'];
 		$chg_lang = $_SESSION['language']->code != $_POST['language'];
+		$chg_date_format = user_date_format() != $_POST['date_format'];
+		$chg_date_sep = user_date_sep() != $_POST['date_sep'];
 
 		set_user_prefs(get_post( 
 			array('prices_dec', 'qty_dec', 'rates_dec', 'percent_dec',
@@ -39,19 +42,22 @@ if (isset($_POST['setprefs']))
 			'theme', 'page_size', 'language', 'startup_tab',
 			'show_gl' => 0, 'show_codes'=> 0, 'show_hints' => 0,
 			'rep_popup' => 0, 'graphic_links' => 0, 'sticky_doc_date' => 0,
-			'query_size' => 10.0)));
+			'query_size' => 10.0, 'transaction_days' => 30, 'save_report_selections' => 0,
+			'use_date_picker' => 0, 'def_print_destination' => 0, 'def_print_orientation' => 0)));
 
 		if ($chg_lang)
 			$_SESSION['language']->set_language($_POST['language']);
 			// refresh main menu
 
-		flush_dir($comp_path.'/'.user_company().'/js_cache');	
+		flush_dir(company_path().'/js_cache');	
 
-		if ($chg_theme || $chg_lang)
+		if ($chg_theme && $SysPrefs->allow_demo_mode)
+			$_SESSION["wa_current_user"]->prefs->theme = $_POST['theme'];
+		if ($chg_theme || $chg_lang || $chg_date_format || $chg_date_sep)
 			meta_forward($_SERVER['PHP_SELF']);
 
 		
-		if ($allow_demo_mode)  
+		if ($SysPrefs->allow_demo_mode)  
 			display_warning(_("Display settings have been updated. Keep in mind that changed settings are restored on every login in demo mode."));
 		else
 			display_notification_centered(_("Display settings have been updated."));
@@ -60,19 +66,19 @@ if (isset($_POST['setprefs']))
 
 start_form();
 
-start_outer_table($table_style2);
+start_outer_table(TABLESTYLE2);
 
 table_section(1);
 table_section_title(_("Decimal Places"));
 
-text_row_ex(_("Prices/Amounts:"), 'prices_dec', 5, 5, '', user_price_dec());
-text_row_ex(_("Quantities:"), 'qty_dec', 5, 5, '', user_qty_dec());
-text_row_ex(_("Exchange Rates:"), 'rates_dec', 5, 5, '', user_exrate_dec());
-text_row_ex(_("Percentages:"), 'percent_dec',  5, 5, '', user_percent_dec());
+number_list_row(_("Prices/Amounts:"), 'prices_dec', user_price_dec(), 0, 10);
+number_list_row(_("Quantities:"), 'qty_dec', user_qty_dec(), 0, 10);
+number_list_row(_("Exchange Rates:"), 'rates_dec', user_exrate_dec(), 0, 10);
+number_list_row(_("Percentages:"), 'percent_dec', user_percent_dec(), 0, 10);
 
-table_section_title(_("Dateformat and Separators"));
+table_section_title(_("Date Format and Separators"));
 
-dateformats_list_row(_("Dateformat:"), "date_format", user_date_format());
+dateformats_list_row(_("Date Format:"), "date_format", user_date_format());
 
 dateseps_list_row(_("Date Separator:"), "date_sep", user_date_sep());
 
@@ -88,14 +94,24 @@ decseps_list_row(_("Decimal Separator:"), "dec_sep", user_dec_sep());
 
 /* The array $decseps is set up in config.php for modifications
 possible separators can be added by modifying the array definition by editing that file */
+
+check_row(_("Use Date Picker"), 'use_date_picker', user_use_date_picker());
+
 if (!isset($_POST['language']))
 	$_POST['language'] = $_SESSION['language']->code;
 
-table_section_title(_("Language"));
+table_section_title(_("Reports"));
 
-languages_list_row(_("Language:"), 'language', $_POST['language']);
+text_row_ex(_("Save Report Selection Days:"), 'save_report_selections', 5, 5, '', user_save_report_selections());
+
+yesno_list_row(_("Default Report Destination:"), 'def_print_destination', user_def_print_destination(), 
+	$name_yes=_("Excel"), $name_no=_("PDF/Printer"));
+
+yesno_list_row(_("Default Report Orientation:"), 'def_print_orientation', user_def_print_orientation(), 
+	$name_yes=_("Landscape"), $name_no=_("Portrait"));
 
 table_section(2);
+
 table_section_title(_("Miscellaneous"));
 
 check_row(_("Show hints for new users:"), 'show_hints', user_hints());
@@ -128,11 +144,17 @@ check_row(_("Use popup window to display reports:"), 'rep_popup', user_rep_popup
 check_row(_("Use icons instead of text links:"), 'graphic_links', user_graphic_links(),
 	false, _('Set this option to on for using icons instead of text links'));
 
-text_row_ex(_("Query page size:"), 'query_size',  5, 5, '', user_query_size());
-
 check_row(_("Remember last document date:"), 'sticky_doc_date', sticky_doc_date(),
 	false, _('If set document date is remembered on subsequent documents, otherwise default is current date'));
 
+text_row_ex(_("Query page size:"), 'query_size',  5, 5, '', user_query_size());
+
+text_row_ex(_("Transaction days:"), 'transaction_days', 5, 5, '', user_transaction_days());
+
+table_section_title(_("Language"));
+
+languages_list_row(_("Language:"), 'language', $_POST['language']);
+
 end_outer_table(1);
 
 submit_center('setprefs', _("Update"), true, '',  'default');
@@ -143,4 +165,3 @@ end_form(2);
 
 end_page();
 
-?>
\ No newline at end of file