Fix CI
This commit is contained in:
parent
6cde33dfd1
commit
7d62a04fda
3 changed files with 8 additions and 4 deletions
|
|
@ -3146,7 +3146,7 @@ class BookKeeping extends CommonObject
|
|||
}
|
||||
}
|
||||
|
||||
// Insert bookkeeping record for income statement
|
||||
// Insert bookkeeping record for income statement (loss or profit when closing)
|
||||
if (!$error && $income_statement_amount != 0) {
|
||||
$mt = $income_statement_amount;
|
||||
$accountingaccount = new AccountingAccount($this->db);
|
||||
|
|
@ -3165,6 +3165,7 @@ class BookKeeping extends CommonObject
|
|||
$bookkeeping->thirdparty_code = '';
|
||||
|
||||
if ($separate_auxiliary_account) {
|
||||
/* $obj->subledger_account is not defined here, so all this code do nothing
|
||||
$bookkeeping->subledger_account = $obj->subledger_account;
|
||||
$sql = 'SELECT';
|
||||
$sql .= " subledger_label";
|
||||
|
|
@ -3180,6 +3181,9 @@ class BookKeeping extends CommonObject
|
|||
}
|
||||
$objtmp = $this->db->fetch_object($result);
|
||||
$bookkeeping->subledger_label = $objtmp->subledger_label ?? null; // latest subledger label used
|
||||
*/
|
||||
$bookkeeping->subledger_account = null;
|
||||
$bookkeeping->subledger_label = null;
|
||||
} else {
|
||||
$bookkeeping->subledger_account = null;
|
||||
$bookkeeping->subledger_label = null;
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@
|
|||
|
||||
// Load Dolibarr environment
|
||||
require '../main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
|
||||
|
||||
/**
|
||||
* @var Conf $conf
|
||||
* @var DoliDB $db
|
||||
|
|
@ -37,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
|
|||
*
|
||||
* @var string $dolibarr_main_url_root
|
||||
*/
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("admin", "other", "agenda"));
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ parameters:
|
|||
- '#Empty array passed to foreach#'
|
||||
- '#Unable to resolve the template type T#'
|
||||
- '#in empty\(\) always exists and is always falsy#'
|
||||
- '#in empty\(\) always exists and is not falsy#'
|
||||
internalErrorsCountLimit: 50
|
||||
cache:
|
||||
# nodesByFileCountMax: 512
|
||||
|
|
|
|||
Loading…
Reference in a new issue