diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 13dc63c2c6b..5202a00667d 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2011 Juanjo Menent * Copyright (C) 2011 Philippe Grand @@ -107,7 +107,7 @@ if ($action == 'specimen') $inter->initAsSpecimen(); // Charge le modele - $dir = "/core/modules/fichinter/"; + $dir = "/core/modules/fichinter/doc/"; $file = "pdf_".$modele.".modules.php"; $file = dol_buildpath($dir.$file); if (file_exists($file)) @@ -363,7 +363,7 @@ clearstatcache(); $var=true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/core/modules/fichinter/"; + $dir = $dirroot . "/core/modules/fichinter/doc/"; if (is_dir($dir)) { diff --git a/htdocs/core/modules/fichinter/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php similarity index 96% rename from htdocs/core/modules/fichinter/pdf_soleil.modules.php rename to htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 5f2570fe10c..e399cde7cc1 100644 --- a/htdocs/core/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -1,8 +1,9 @@ - * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2008 Raphael Bertrand (Resultic) - * Copyright (C) 2011 Fabrice CHERRIER (12/05/2011) http://www.fcinc.fr +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2008 Raphael Bertrand (Resultic) + * Copyright (C) 2011 Fabrice CHERRIER * * 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 @@ -20,7 +21,7 @@ */ /** - * \file htdocs/core/modules/fichinter/pdf_soleil.modules.php + * \file htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php * \ingroup ficheinter * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil */ diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index be891eb3deb..f7ebef61859 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -145,7 +145,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='') global $conf,$langs; $langs->load("ficheinter"); - $dir = "/core/modules/fichinter/"; + $dir = "/core/modules/fichinter/doc/"; // Positionne modele sur le nom du modele de facture a utiliser if (! dol_strlen($modele))