From 8645a7f524ff2862ab9c5ab71ddec8bc7806160d Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 2 Jan 2019 18:48:27 +0100 Subject: [PATCH 1/4] FIX Interface regression for bind people. Fix option MAIN_OPTIMIZEFORTEXTBROWSER --- htdocs/core/lib/ajax.lib.php | 1 + htdocs/core/lib/usergroups.lib.php | 40 ++++++++++++++++++++++++++++++ htdocs/user/param_ihm.php | 6 +++++ 3 files changed, 47 insertions(+) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 92f057b4b94..12088894896 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -400,6 +400,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $ if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; if (empty($conf->use_javascript_ajax)) return ''; if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return ''; + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return ''; if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index b8833e42543..abe774950a5 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -458,6 +458,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': '.$default.') '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // Background color THEME_ELDY_BACKBODY @@ -503,6 +504,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': ffffff) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // TopMenuBackgroundColor @@ -550,6 +552,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': '.$default.') '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // LeftMenuBackgroundColor @@ -597,6 +600,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': '.$default.') '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // TextTitleColor @@ -678,6 +682,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': '.$default.') '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // BackgroundTableLineEvenColor @@ -706,6 +711,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': '.$default.') '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // Text LinkColor @@ -755,6 +761,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '   ('.$langs->trans("Default").': 000078) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; + print ''; } // Use Hover @@ -801,5 +808,38 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; } + // Use MAIN_OPTIMIZEFORTEXTBROWSER + if ($foruserprofile) + { + $default=$langs->trans('No'); + print ''; + print ''.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").''; + print ''; + if ($edit) + { + print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1); + } + else + { + if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) + { + print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER); + } + else + { + print yn(1); + if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')'; + } + } + print '   ('.$langs->trans("Default").': '.yn(0).') '; + print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc")); + print ''; + print ''; + } + else + { + // TODO + } + print ''; } diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 64913683276..929720e983b 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -142,6 +142,12 @@ if (empty($reshook)) { $tabparam["THEME_ELDY_USE_HOVER"] = 0; } + if (GETPOST('MAIN_OPTIMIZEFORTEXTBROWSER')) { + $tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 1; + } else { + $tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 0; + } + $result = dol_set_user_param($db, $conf, $object, $tabparam); header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id); From 15cc45b8ae9273972b3824906ff708267104a5a3 Mon Sep 17 00:00:00 2001 From: Ferran Marcet Date: Fri, 4 Jan 2019 10:52:10 +0100 Subject: [PATCH 2/4] FIX: Can't generate invoice pdf --- htdocs/core/actions_massactions.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index 4fad63ca840..0c66d51d589 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -1,6 +1,7 @@ * Copyright (C) 2018 Juanjo Menent + * Copyright (C) 2019 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -680,6 +681,7 @@ if ($massaction == 'confirm_createbills') } $id = $objecttmp->id; // For builddoc action + $object = $objecttmp; // Builddoc $donotredirect = 1; From 4694af048837c94c9b3e738f1724618b0a574a21 Mon Sep 17 00:00:00 2001 From: Ferran Marcet Date: Fri, 4 Jan 2019 11:45:02 +0100 Subject: [PATCH 3/4] FIX: Can't generate invoice pdf --- htdocs/commande/list.php | 1 + htdocs/core/actions_massactions.inc.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 04ef69b2638..27fa4bd48e3 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -102,6 +102,7 @@ if (! $sortorder) $sortorder='DESC'; $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'orderlist'; // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +$object = new Commande($db); $hookmanager->initHooks(array($contextpage)); $extrafields = new ExtraFields($db); diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index 0c66d51d589..a89b6dcdb2c 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -681,7 +681,6 @@ if ($massaction == 'confirm_createbills') } $id = $objecttmp->id; // For builddoc action - $object = $objecttmp; // Builddoc $donotredirect = 1; From f3dd875fc799a059225221629323e8d007458b33 Mon Sep 17 00:00:00 2001 From: Ferran Marcet Date: Fri, 4 Jan 2019 12:00:39 +0100 Subject: [PATCH 4/4] FIX: Can't generate invoice pdf --- htdocs/commande/list.php | 1 - htdocs/core/actions_massactions.inc.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 27fa4bd48e3..04ef69b2638 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -102,7 +102,6 @@ if (! $sortorder) $sortorder='DESC'; $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'orderlist'; // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$object = new Commande($db); $hookmanager->initHooks(array($contextpage)); $extrafields = new ExtraFields($db); diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index a89b6dcdb2c..0c66d51d589 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -681,6 +681,7 @@ if ($massaction == 'confirm_createbills') } $id = $objecttmp->id; // For builddoc action + $object = $objecttmp; // Builddoc $donotredirect = 1;