Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts: htdocs/core/class/utils.class.php
This commit is contained in:
commit
5e3698b023
@ -732,7 +732,7 @@ class Utils
|
||||
chdir($dirofmodule);
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
|
||||
$utils = new Utils($db);
|
||||
$utils = new Utils($this->db);
|
||||
|
||||
// Build HTML doc
|
||||
$command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOC;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user