lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
commit 7c4e908639
7 changed files with 34 additions and 49 deletions
Show Stats 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))
{

26
htdocs/admin/facture.php
View File

@ -72,7 +72,7 @@ if ($action == 'specimen')
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->models_modules);
$dirmodels=array_merge(array('/'),$conf->facture_modules);
foreach($dirmodels as $reldir)
{
$file=dol_buildpath($reldir."core/modules/facture/doc/pdf_".$modele.".modules.php",0);
@ -291,6 +291,8 @@ if ($action == 'setforcedate')
* View
*/
$dirmodels=array_merge(array('/'),$conf->facture_modules);
llxHeader("",$langs->trans("BillsSetup"),'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura');
$form=new Form($db);
@ -318,21 +320,16 @@ 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);
}
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
$dir = $dirroot . "/core/modules/facture/";
$dir = dol_buildpath($reldir."core/modules/facture/");
if (is_dir($dir))
{
$handle = opendir($dir);
if (is_resource($handle))
{
$var=true;
while (($file = readdir($handle))!==false)
{
if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@ -488,17 +485,12 @@ 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);
}
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
{
$dir = $dirroot . "/core/modules/facture".$valdir;
$dir = dol_buildpath($reldir."core/modules/facture".$valdir);
if (is_dir($dir))
{

22
htdocs/admin/propale.php
View File

@ -71,10 +71,10 @@ if ($action == 'specimen')
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->models_modules);
$dirmodels=array_merge(array('/'),$conf->propale_modules);
foreach($dirmodels as $reldir)
{
$file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php",0);
$file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
if (file_exists($file))
{
$filefound=1;
@ -283,14 +283,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->propale_modules);
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
$dir = $dirroot . "/core/modules/propale/";
$dir = dol_buildpath($reldir."core/modules/propale/");
if (is_dir($dir))
{
@ -419,17 +416,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->propale_modules);
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
{
$dir = $dirroot . "/core/modules/propale".$valdir;
$dir = dol_buildpath($reldir."core/modules/propale".$valdir);
if (is_dir($dir))
{

9
htdocs/core/class/conf.class.php
View File

@ -53,17 +53,20 @@ class Conf
public $modules = array(); // List of activated modules
public $sms_engine_modules = array();
// TODO Remove all thoose tabs with one generic
public $css_modules = array();
public $tabs_modules = array();
public $triggers_modules = array();
public $menus_modules = array();
public $hooks_modules = array();
public $models_modules = array();
public $login_modules = array();
public $sms_engine_modules = array();
public $barcode_modules = array();
public $substitutions_modules = array();
public $societe_modules = array();
public $facture_modules = array();
public $commande_modules = array();
public $propale_modules = array();
var $logbuffer = array();
@ -166,7 +169,9 @@ class Conf
$arrValue = @unserialize($value);
if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
else if (in_array($partname,array('login','menus','triggers'))) $value = '/'.$modulename.'/core/'.$partname.'/';
else if (in_array($partname,array('facture','commande','propale'))) $value = '/'.$modulename.'/';
else if ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/';
//print 'xxx'.$varname.' '.$value.'<br>';
$this->$varname = array_merge($this->$varname, array($modulename => $value));
}
// If this is a module constant (must be at end)

2
htdocs/core/modules/commande/modules_commande.php
View File

@ -183,7 +183,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
// 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)
{
foreach(array('doc','pdf') as $prefix)

2
htdocs/core/modules/facture/modules_facture.php
View File

@ -181,7 +181,7 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->models_modules);
$dirmodels=array_merge(array('/'),$conf->facture_modules);
foreach($dirmodels as $reldir)
{
foreach(array('doc','pdf') as $prefix)

2
htdocs/core/modules/propale/modules_propale.php
View File

@ -184,7 +184,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->models_modules);
$dirmodels=array_merge(array('/'),$conf->propale_modules);
foreach($dirmodels as $reldir)
{
foreach(array('doc','pdf') as $prefix)