Skip to content

Commit

Permalink
fixed out of date reference
Browse files Browse the repository at this point in the history
fixed merge error
  • Loading branch information
BurksEngineering committed Nov 18, 2023
1 parent 79a7273 commit fbddfa7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions htdocs/accountancy/journal/expensereportsjournal.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@
$num = $db->num_rows($result);

// Variables
$account_salary = (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
$account_vat = (!empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
$group_tax_with_lines = getDolGlobalInt('ER_JOURNAL_GROUP_TAX_WITH_LINES'); //If enabled, Tax will NOT get split off from the base entry and credited to a separate tax account
$account_salary = (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
$account_vat = (getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT')) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
$group_tax_with_lines = getDolGlobalInt('ER_JOURNAL_GROUP_TAX_WITH_LINES'); //If enabled, Tax will NOT get split off from the base entry and credited to a separate tax account (good for non-VAT countries like USA)

$i = 0;
while ($i < $num) {
Expand Down

0 comments on commit fbddfa7

Please sign in to comment.