From d5de4f4f671eab6636c676238f5cfdc697a03cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 3 Jun 2024 13:44:31 +0200 Subject: [PATCH] fix cti (#29809) * fix cti * Update accountingaccount.class.php * Update accountingaccount.class.php * Update admin.lang * Update ignore_translation_keys.lst * Update ignore_translation_keys.lst * Update json.lib.php --- htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +- htdocs/accountancy/class/accountingaccount.class.php | 8 ++++---- htdocs/core/lib/json.lib.php | 1 - htdocs/langs/en_US/admin.lang | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index ac84728cc99..e08bf420eb6 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -1135,7 +1135,7 @@ while ($i < min($num, $limit)) { // Journal code if (!empty($arrayfields['t.code_journal']['checked'])) { $accountingjournal = new AccountingJournal($db); - $result = $accountingjournal->fetch('', $line->code_journal); + $result = $accountingjournal->fetch(0, $line->code_journal); $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal); print ''.$journaltoshow.''; if (!$i) { diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 98c5009594e..25e9b0ca80d 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -874,9 +874,9 @@ class AccountingAccount extends CommonObject if ($factureDet->desc == "(DEPOSIT)" || $facture->type == $facture::TYPE_DEPOSIT) { $accountdeposittoventilated = new self($this->db); if ($type == 'customer') { - $result = $accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 1); + $result = $accountdeposittoventilated->fetch(0, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 1); } elseif ($type == 'supplier') { - $result = $accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1); + $result = $accountdeposittoventilated->fetch(0, getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1); } if (isset($result) && $result < 0) { return -1; @@ -897,9 +897,9 @@ class AccountingAccount extends CommonObject if ($facture->type == $facture::TYPE_CREDIT_NOTE && $invoiceSource->type == $facture::TYPE_DEPOSIT) { $accountdeposittoventilated = new self($this->db); if ($type == 'customer') { - $accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 1); + $accountdeposittoventilated->fetch(0, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 1); } elseif ($type == 'supplier') { - $accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1); + $accountdeposittoventilated->fetch(0, getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1); } $code_l = $accountdeposittoventilated->ref; $code_p = ''; diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php index 988a8dc734d..d9c3d09008a 100644 --- a/htdocs/core/lib/json.lib.php +++ b/htdocs/core/lib/json.lib.php @@ -64,7 +64,6 @@ function dol_json_encode($elements) $num = count($elements); } } - //var_dump($num); // determine type if (is_numeric($elements)) { diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 47a7d9122ac..9bd77c5bdd4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1688,6 +1688,7 @@ ForANonAnonymousAccess=For an authenticated access (for a write access for examp PerfDolibarr=Performance setup/optimizing report YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance. NotInstalled=Not installed. +Installed=Installed. NotSlowedDownByThis=Not slowed down by this. NotRiskOfLeakWithThis=Not risk of leak with this. ApplicativeCache=Applicative cache