Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into 23.0

This commit is contained in:
Laurent Destailleur 2026-03-24 18:06:16 +01:00
commit ea051503be

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2021-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
/* Copyright (C) 2021-2026 Alexandre Spangaro <alexandre@inovea-conseil.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -189,7 +189,17 @@ if ($reload) {
$form = new Form($db);
if ($object->nature == 2) {
if ($object->nature == 1) {
$some_mandatory_steps_of_setup_were_not_done = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1'
|| !getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') || getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == '-1'
|| !getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED') || getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED') == '-1'
|| !getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED') || getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED') == '-1';
$account_accounting_not_defined = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1'
|| !getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED') || getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED') == '-1'
|| !getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED') || getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED') == '-1';
} elseif ($object->nature == 2) {
$some_mandatory_steps_of_setup_were_not_done = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1';
$account_accounting_not_defined = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1';
} elseif ($object->nature == 3) {