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

This commit is contained in:
ldestailleur 2025-08-27 19:30:16 +02:00
commit 1938bbf63b
3 changed files with 64 additions and 2 deletions

View file

@ -64,7 +64,7 @@ function dolBECalculateStructuredCommunication($invoice_number, $invoice_type)
$controlKey = ($mod97 === 0) ? 97 : $mod97;
// Add the check digit at the end of the reference
$invoice_number .= $controlKey;
$invoice_number .= sprintf("%02d", $controlKey);
// Format reference as XXX/XXXX/XXXXX
$part1 = '+++'.substr($invoice_number, 0, 3);

View file

@ -531,7 +531,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
while ($obj = $db->fetch_object($resql)) {
$userstatic->id = $obj->rowid;
$userstatic->login = $obj->login;
$userstatic->firstname = $obj->fistname;
$userstatic->firstname = $obj->firstname;
$userstatic->lastname = $obj->lastname;
$userstatic->photo = $obj->photo;

View file

@ -0,0 +1,62 @@
<?php
/* Copyright (C) 2010-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2023 Alexandre Janniaux <alexandre.janniaux@gmail.com>
*
* 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* or see https://www.gnu.org/
*/
/**
* \file test/phpunit/FunctionsLibTest.php
* \ingroup test
* \brief PHPUnit test
* \remarks To run this script as CLI: phpunit filename.php
*/
global $conf,$user,$langs,$db,$mysoc;
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
//require_once 'PHPUnit/Autoload.php';
require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
require_once dirname(__FILE__).'/CommonClassTest.class.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/functions_be.lib.php';
/**
* Class for PHPUnit tests
*
* @backupGlobals disabled
* @backupStaticAttributes enabled
* @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
*/
class FunctionsBELibTest extends CommonClassTest
{
/**
* testDolNow
*
* @return void
*/
public function testdolBECalculateStructuredCommunication()
{
// Basic test
$this->assertEquals(dolBECalculateStructuredCommunication('00000000', '99'), '+++000/0000/00097+++');
// Test given in issue
$this->assertEquals(dolBECalculateStructuredCommunication('it-comp-25057', '0'), '+++200/0025/05702+++');
// Random test
$this->assertEquals(dolBECalculateStructuredCommunication('FA3698-5455', '0'), '+++203/6985/45505+++');
}
}