lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: uniformize structure

Browse Source
This commit is contained in:
Regis Houssin 2012-01-23 14:43:31 +01:00
parent b4eb5a8cbf
commit 190cc7b13c
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/fichinter.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
@ -107,7 +107,7 @@ if ($action == 'specimen')
$inter->initAsSpecimen(); $inter->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = "/core/modules/fichinter/"; $dir = "/core/modules/fichinter/doc/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($file)) if (file_exists($file))
@ -363,7 +363,7 @@ clearstatcache();
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/core/modules/fichinter/"; $dir = $dirroot . "/core/modules/fichinter/doc/";
if (is_dir($dir)) if (is_dir($dir))
{ {

11
htdocs/core/modules/fichinter/pdf_soleil.modules.php → htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -1,8 +1,9 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Fabrice CHERRIER (12/05/2011) http://www.fcinc.fr * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2011 Fabrice CHERRIER
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * \ingroup ficheinter
* \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
*/ */

4
htdocs/core/modules/fichinter/modules_fichinter.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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; global $conf,$langs;
$langs->load("ficheinter"); $langs->load("ficheinter");
$dir = "/core/modules/fichinter/"; $dir = "/core/modules/fichinter/doc/";
// Positionne modele sur le nom du modele de facture a utiliser // Positionne modele sur le nom du modele de facture a utiliser
if (! dol_strlen($modele)) if (! dol_strlen($modele))