From 730f5d1ad423477ca564652cd3357d978892981b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Dec 2018 14:05:37 +0100 Subject: [PATCH 1/4] Prepare 8.0.4 --- ChangeLog | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/ChangeLog b/ChangeLog index c0e3e277009..255810a05ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,72 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 8.0.4 compared to 8.0.3 ***** +FIX: #10030 better german chart +FIX: #10036 +FIX: #10080 Supplier translations are in english +FIX: #10183 using backport of fix done in 9.0 +FIX: #10218 Bad redirection after deleting a user or group +FIX: #3234 +FIX: #6580 +FIX: #8741 +FIX: #9629 #9625 +FIX: #9971 +FIX: avoid Class 'AdherentType' not found +FIX: Can relaunch install on v8 +FIX: Can't create a thirdparty from member if customer code is mandatory. +FIX: Can't delete a line of minimal stock per warehouse +FIX: check if "entity" is already defined in "$param" +FIX: contact/address tab issue when changing company +FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account +FIX: CVE-2018-19799 +FIX: CVE-2018-19992 +FIX: CVE-2018-19993 +FIX: CVE-2018-19994 +FIX: CVE-2018-19995 and CVE-2018-19998 +FIX: Error reported when creation of thirdparty from member fails +FIX: export only prices of the current entity ! +FIX: Extrafields on shipment module +FIX: filter on product category doesn't work +FIX: form actions: select_type_actions could be too small + bad $db init +FIX: form actions: select_type_actions could be too small + bad init +FIX: fourn payment modes musn't be available on customer docs +FIX: Function updatePrice with wrong parameters +FIX: hidden extrafield +FIX: if qty is 0 +FIX: If we change customer/supplier rule we can't edit old thirdparty. +FIX: lang not loaded +FIX: Lines are not inserted correctly if VAT have code +FIX: marge sign +FIX: Method setValid not found +FIX: Migration do not create not used table +FIX: missing action "edit" for the hook +FIX: missing field "visible" +FIX: Missing last month on vat report per month +FIX: mode is only customer in stats fichinter +FIX: OppStatusShort doesn't exists +FIX: Remote ip detection was wrong with proxy (example: cloudflare) +FIX: Removed not use table +FIX: Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE +FIX: responsive +FIX: Same on customer card +FIX: same on lines +FIX: screen size fall +FIX: Select first mail model by default +FIX: slow SQL query on creating a new supplier invoice +FIX: sql query performance on list_qualified_avoir_supplier_invoices. +FIX: supplier order list keep socid +FIX: Same on customer card +FIX: same on lines +FIX: screen size fall +FIX: Select first mail model by default +FIX: slow SQL query on creating a new supplier invoice +FIX: sql query performance on list_qualified_avoir_supplier_invoices. +FIX: supplier order list keep socid +FIX: Vendor translations are in english +FIX: Warning: count() +FIX: We want to be able to send PDF of paid invoices + ***** ChangeLog for 8.0.3 compared to 8.0.2 ***** FIX: #9161 FIX: #9432 From 63beb504656ad9db9d5811adfaa6446f67ab44d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Dec 2018 21:22:12 +0100 Subject: [PATCH 2/4] Fix missing migration of external site module --- htdocs/install/upgrade2.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 1077e37f78e..9315769d756 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -455,6 +455,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09 'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly', 'MAIN_MODULE_DON'=>'newboxdefonly', 'MAIN_MODULE_ECM'=>'newboxdefonly', + 'MAIN_MODULE_EXTERNALSITE'=>'newboxdefonly', 'MAIN_MODULE_FACTURE'=>'newboxdefonly', 'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly', 'MAIN_MODULE_HOLIDAY'=>'newboxdefonly', From cad95c7dc2411587e3e8d79b54f9273c495d427f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Jan 2019 15:39:22 +0100 Subject: [PATCH 3/4] Update societe.class.php --- htdocs/societe/class/societe.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 4b1f9053353..fcdf4e9741a 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1353,7 +1353,7 @@ class Societe extends CommonObject } // Use first price level if level not defined for third party - if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1; + if ((! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($this->price_level)) $this->price_level=1; return $result; } From 8645a7f524ff2862ab9c5ab71ddec8bc7806160d Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 2 Jan 2019 18:48:27 +0100 Subject: [PATCH 4/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);