vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2025-08-26 05:21:51 +02:00
commit 4a30325361
7 changed files with 70 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/build/exe/doliwamp/doliwamp.iss
View file

@ -38,8 +38,8 @@ DefaultGroupName=Dolibarr
;Compression=none
Compression=lzma
SolidCompression=yes
WizardImageFile=build\exe\doliwamp\doliwamp.bmp
WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
WizardImageFile=dev\build\exe\doliwamp\doliwamp.bmp
WizardSmallImageFile=dev\build\exe\doliwamp\doliwampsmall.bmp
SetupIconFile=doc\images\dolibarr_favicon.ico
;To say the installer must be ran as admin
PrivilegesRequired=admin

2
htdocs/adherents/subscription/list.php
View file

@ -737,7 +737,7 @@ while ($i < $imaxinloop) {
// Banque
if (!empty($arrayfields['d.bank']['checked'])) {
print '<td class="tdmaxoverflow100">';
print '<td class="tdoverflowmax100">';
if ($obj->fk_account > 0) {
$accountstatic->id = $obj->fk_account;
$accountstatic->fetch($obj->fk_account);

2
htdocs/compta/tva/clients.php
View file

@ -673,7 +673,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
// Company name
print '<td class="tdmaxoverflow150">';
print '<td class="tdoverflowmax150">';
print $fields['company_link'];
print '</td>';

4
htdocs/compta/tva/quadri_detail.php
View file

@ -537,7 +537,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
// Company name
print '<td class="tdmaxoverflow150">';
print '<td class="tdoverflowmax150">';
//print $company_static->getNomUrl(1);
print $fields['company_link'];
print '</td>';
@ -773,7 +773,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
// Company name
print '<td class="tdmaxoverflow150">';
print '<td class="tdoverflowmax150">';
//print $company_static->getNomUrl(1);
print $fields['company_link'];
print '</td>';

2
htdocs/core/lib/functions_be.lib.php
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);

2
htdocs/holiday/card_group.php
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;

62
test/phpunit/FunctionsBELibTest.php Normal file
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+++');
}
}