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

Fix debug modulebuilder for doc and ref generation

Browse Source
This commit is contained in:
Laurent Destailleur
2020-05-31 22:59:33 +02:00
parent 6e55abe831
commit e2bb04dcae
7 changed files with 1872 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/class/commonobject.class.php
View File

@@ -4555,7 +4555,7 @@ abstract class CommonObject
// Search template files
$file = '';
$classname = '';
$filefound = 0;
$filefound = '';
$dirmodels = array('/');
if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
foreach ($dirmodels as $reldir)
@@ -4569,7 +4569,7 @@ abstract class CommonObject
$file = dol_buildpath($reldir.$modelspath.$file, 0);
if (file_exists($file))
{
$filefound = 1;
$filefound = $file;
$classname = $prefix.'_'.$modele;
break;
}
@@ -4766,8 +4766,13 @@ abstract class CommonObject
return -1;
}
} else {
$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
dol_print_error('', $this->error);
if (! $filefound) {
$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
dol_print_error('', $this->error);
} else {
$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound);
dol_print_error('', $this->error);
}
return -1;
}
} else return $reshook;