From 37afc58c485b69d6462c544080dfd7ded926e0d3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 7 Feb 2018 17:45:13 +0100 Subject: [PATCH] The module ExpenseReport use numbering rules that you can setup (like other modules do). If you need to keep the hard coded numbering rule of expenses report used in 6.0, just add constant EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1. --- ChangeLog | 4 +++- htdocs/core/modules/expensereport/mod_expensereport_jade.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cf9f178a16..3a5fa7d4f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -277,7 +277,9 @@ Following changes may create regressions for some external modules, but were nec * Jquery plugin tableDnd updated. You now need to use decodeURI on the return value of tableDnDSerialize() and add 'td.' to the beginning of the dragHandle match string. * IE8 and earlier and Firefox 12 and earlier (< 2012) are no more supported. - +* The module ExpenseReport use numbering rules that you can setup (like other modules do). If you need to + keep the hard coded numbering rule of expenses report used in 6.0, just add constant + EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1. * If you use the external module "multicompany", you must also upgrade the module. Multicompany module for Dolibarr v7 is required because with Dolibarr v7, payment modes and payment conditions are management as data that are dedicated to each company. If you keep your old version of multicompany module, mode and diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php index c6153d422eb..1bae5aece16 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php @@ -102,7 +102,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport global $db,$conf; // For backward compatibility and restore old behavior to get ref of expense report - if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE) + if ($conf->global->) { $fuser = null; if ($object->fk_user_author > 0)