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

Merge pull request #64 from grandoc/develop

Browse Source 
Develop
This commit is contained in:
Regis Houssin 2011-12-08 02:21:46 -08:00
commit dac379af17
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ class FormFile
if (is_array($genallowed)) $modellist=$genallowed; if (is_array($genallowed)) $modellist=$genallowed;
else else
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/doc/ModelePdfExpedition.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php');
$modellist=ModelePDFExpedition::liste_modeles($this->db); $modellist=ModelePDFExpedition::liste_modeles($this->db);
} }
} }

2
htdocs/install/upgrade2.php
View File

@ -1744,7 +1744,7 @@ function migrate_modeles($db,$langs,$conf)
if (! empty($conf->expedition->enabled)) if (! empty($conf->expedition->enabled))
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/doc/ModelePdfExpedition.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php');
$modellist=ModelePDFExpedition::liste_modeles($db); $modellist=ModelePDFExpedition::liste_modeles($db);
if (count($modellist)==0) if (count($modellist)==0)
{ {

2
test/phpunit/BuildDocTest.php
View File

@ -51,7 +51,7 @@ require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/modules_comm
require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/modules_propale.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/modules_propale.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/project/modules_project.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/project/modules_project.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/modules_fichinter.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/modules_fichinter.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/doc/ModelePdfExpedition.class.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/modules_expedition.php';
if (empty($user->id)) if (empty($user->id))
{ {