Use isModEnabled
This commit is contained in:
parent
93c69aaaff
commit
dc059eccab
@ -152,10 +152,10 @@ $arrayfields = array(
|
||||
'datev' =>array('label'=>"DateValue", 'checked'=>-1, 'position'=>130),
|
||||
'type' =>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>140),
|
||||
'project' =>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>!empty($conf->project->enabled)),
|
||||
'bank' =>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>!empty($conf->banque->enabled)),
|
||||
'entry' =>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>!empty($conf->banque->enabled)),
|
||||
'account' =>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>!empty($conf->accounting->enabled)),
|
||||
'subledger' =>array('label'=>"SubledgerAccount", 'checked'=>1, 'position'=>410, "enabled"=>!empty($conf->accounting->enabled)),
|
||||
'bank' =>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>isModEnabled('banque')),
|
||||
'entry' =>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>isModEnabled('banque')),
|
||||
'account' =>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>isModEnabled('accounting')),
|
||||
'subledger' =>array('label'=>"SubledgerAccount", 'checked'=>1, 'position'=>410, "enabled"=>isModEnabled('accounting')),
|
||||
'debit' =>array('label'=>"Debit", 'checked'=>1, 'position'=>500),
|
||||
'credit' =>array('label'=>"Credit", 'checked'=>1, 'position'=>510),
|
||||
);
|
||||
@ -190,7 +190,7 @@ $form = new Form($db);
|
||||
if ($arrayfields['account']['checked'] || $arrayfields['subledger']['checked']) {
|
||||
$formaccounting = new FormAccounting($db);
|
||||
}
|
||||
if ($arrayfields['bank']['checked'] && !empty($conf->accounting->enabled)) {
|
||||
if ($arrayfields['bank']['checked'] && isModEnabled('accounting')) {
|
||||
$accountingjournal = new AccountingJournal($db);
|
||||
}
|
||||
if ($arrayfields['ref']['checked']) {
|
||||
@ -621,7 +621,7 @@ if ($resql) {
|
||||
$accountstatic->ref = $obj->bref;
|
||||
$accountstatic->number = $obj->bnumber;
|
||||
|
||||
if (!empty($conf->accounting->enabled)) {
|
||||
if (isModEnabled('accounting')) {
|
||||
$accountstatic->account_number = $obj->bank_account_number;
|
||||
$accountingjournal->fetch($obj->accountancy_journal);
|
||||
$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user