diff --git a/ChangeLog b/ChangeLog index 643cd482eb8..310d618d0ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ For users: - New: Added estimated value for stocks. - New: Added module Gravatar to found photo of users or members from their email on gravatar.com. +- New: Include Dolibarr version in suggested dump filename. +- New: Enhancement in project module. - Fix: Error Call to a member function trans when refusing a supplier order. - Fix: Fix payment conditions on commercial proposals. - Fix: Nb of orders to process was wrong. diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index d84ab0b24e3..31ed4887476 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -516,7 +516,7 @@ print '
'; trans("FileNameToGenerate"); ?> : " /> diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index dfcfce9e369..15b66e4b695 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -63,11 +63,13 @@ function dol_now($mode='tzserver') return $ret; } + /** * \brief Clean a string to use it as a file name. * \param str String to clean * \param newstr String to replace bad chars by * \return string String cleaned (a-zA-Z_) + * \seealso dol_string_nospecial, dol_string_unaccent */ function dol_sanitizeFileName($str,$newstr='_') { @@ -75,9 +77,10 @@ function dol_sanitizeFileName($str,$newstr='_') } /** - * \brief Clean a string from all accent characters + * \brief Clean a string from all accent characters to be used as ref, login or by dol_sanitizeFileName. * \param str String to clean * \return string Cleaned string + * \seealso dol_sanitizeFilename, dol_string_nospecial */ function dol_string_unaccent($str) { @@ -120,10 +123,11 @@ function dol_string_unaccent($str) } /** - * \brief Clean a string from all punctuation characters + * \brief Clean a string from all punctuation characters to use it as a ref or login. * \param str String to clean * \param newstr String to replace bad chars by * \return string Cleaned string + * \seealso dol_sanitizeFilename, dol_string_unaccent */ function dol_string_nospecial($str,$newstr='_') {