* 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
This commit is contained in:
Frédéric FRANCE 2024-06-03 13:44:31 +02:00 committed by GitHub
parent 652c8526fa
commit d5de4f4f67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions

View file

@ -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 '<td class="center tdoverflowmax80">'.$journaltoshow.'</td>';
if (!$i) {

View file

@ -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 = '';

View file

@ -64,7 +64,6 @@ function dol_json_encode($elements)
$num = count($elements);
}
}
//var_dump($num);
// determine type
if (is_numeric($elements)) {

View file

@ -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