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

Merge pull request #4884 from simnandez/dolibarr-3510

Browse Source 
NEW #3510 : Standardize module
This commit is contained in:
Juanjo Menent 2016-03-23 23:00:43 +01:00
commit 9b1cfe4731
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -502,7 +502,7 @@ class RemiseCheque extends CommonObject
dol_syslog("RemiseCheque::generatePdf model=".$model." id=".$this->id, LOG_DEBUG);
$dir=DOL_DOCUMENT_ROOT ."/core/modules/cheque/pdf/";
$dir=DOL_DOCUMENT_ROOT ."/core/modules/cheque/doc/";
// Charge le modele
$file = "pdf_".$model.".class.php";

4
htdocs/core/class/html.formfile.class.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2008-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Charles-Fr BENKE <charles.fr@benke.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
@ -445,7 +445,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed;
else
{
include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php';
include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
$modellist=ModeleChequeReceipts::liste_modeles($this->db);
}
}

0
htdocs/core/modules/cheque/pdf/index.html → htdocs/core/modules/cheque/doc/index.html
View File

5
htdocs/core/modules/cheque/pdf/pdf_blochet.class.php → htdocs/core/modules/cheque/doc/pdf_blochet.class.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2009-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -18,14 +19,14 @@
*/
/**
* \file htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
* \file htdocs/core/modules/cheque/doc/pdf_blochet.class.php
* \ingroup banque
* \brief File to build cheque deposit receipts
*/
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
/**

5
htdocs/core/modules/cheque/pdf/modules_chequereceipts.php → htdocs/core/modules/cheque/modules_chequereceipts.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
*
* 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/cheque/pdf/modules_chequereceipts.php
* \file htdocs/core/modules/cheque/modules_chequereceipts.php
* \ingroup facture
* \brief File with parent class of check receipt document generators
*/
@ -78,7 +79,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
global $conf,$langs;
$langs->load("bills");
$dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/pdf/";
$dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/doc/";
// Positionne modele sur le nom du modele a utiliser
if (! dol_strlen($modele))