From 0d8447ad3918c41a248cbbbecafb8e9d4c745710 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Feb 2019 16:58:55 +0100 Subject: [PATCH] Merge branch 'develop' of https://github.com/wdammak/dolibarr into wdammak-develop # Conflicts: # htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php --- htdocs/core/modules/fichinter/modules_fichinter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index 3903d6154e5..0c88cd88d56 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -109,7 +109,7 @@ abstract class ModeleNumRefFicheinter } /** - * Tests if the numbers already in force in the database do not cause conflicts + * Tests if the numbers already in force in the database do not cause conflicts * that would prevent this numbering from working. * * @return boolean false si conflit, true si ok