diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 38968ab9cd5..c7a3f04a403 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -313,6 +313,7 @@ foreach ($dirmodels as $reldir) $filebis = $file."/".$file.".modules.php"; $classname = "mod_facture_".$file; } + $classname = preg_replace('/\-.*$/','',$classname); if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php') { // Chargement de la classe de numerotation diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index b863d80e91c..06e90c57fa1 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2522,6 +2522,7 @@ class Facture extends CommonInvoice { $file = $conf->global->FACTURE_ADDON."/".$conf->global->FACTURE_ADDON.".modules.php"; $classname = "mod_facture_".$conf->global->FACTURE_ADDON; + $classname = preg_replace('/\-.*$/','',$classname); // Include file with class foreach ($conf->file->dol_document_root as $dirroot) { diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars-es_ES.php similarity index 97% rename from htdocs/core/modules/facture/mod_facture_mars.php rename to htdocs/core/modules/facture/mod_facture_mars-es_ES.php index 28a32868d39..5430ed539ba 100644 --- a/htdocs/core/modules/facture/mod_facture_mars.php +++ b/htdocs/core/modules/facture/mod_facture_mars-es_ES.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2013 Juanjo Menent * * 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 @@ -25,8 +25,8 @@ */ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; -/** \class mod_facture_mars - * \brief Classe du modele de numerotation de reference de facture Mars +/** + * Classe du modele de numerotation de reference de facture Mars */ class mod_facture_mars extends ModeleNumRefFactures {