Merge branch '6.0' into 6.0_bug2
This commit is contained in:
commit
1b04c4beb7
@ -38,9 +38,7 @@ if (! empty($conf->banque->enabled)) {
|
|||||||
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
|
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
|
||||||
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
|
||||||
}
|
}
|
||||||
if (! empty($conf->accounting->enabled)) {
|
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
|
||||||
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user