Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

models_modules isn't enough so we use same facture_invoice,

Browse Source 
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
This commit is contained in:
Laurent Destailleur
2012-03-01 02:06:08 +01:00
parent b9705ebff7 0b945f0716
commit 7c4e908639
7 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/commande.php
View File

@@ -73,7 +73,7 @@ if ($action == 'specimen')
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->models_modules);
$dirmodels=array_merge(array('/'),$conf->commande_modules);
foreach($dirmodels as $reldir)
{
$file=dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php",0);
@@ -251,14 +251,11 @@ print "</tr>\n";
clearstatcache();
// Check if there is external models to do asked by plugins
if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
}
$dirmodels=array_merge(array('/'),$conf->commande_modules);
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
$dir = $dirroot . "/core/modules/commande/";
$dir = dol_buildpath($reldir."core/modules/commande/");
if (is_dir($dir))
{
@@ -387,17 +384,14 @@ print "</tr>\n";
clearstatcache();
// Check if there is external models to do asked by plugins
if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
}
$dirmodels=array_merge(array('/'),$conf->commande_modules);
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
{
$dir = $dirroot . "/core/modules/commande".$valdir;
$dir = dol_buildpath($reldir."core/modules/commande".$valdir);
if (is_dir($dir))
{