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

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

Browse source
This commit is contained in:
Laurent Destailleur 2024-03-04 18:34:05 +01:00
commit c181bbe2f2
5 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/windows-ci.yaml vendored
View file

@ -55,6 +55,8 @@ jobs:
id: cache
uses: actions/cache/restore@v4
with:
# See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
enableCrossOsArchive: true
path: |
db_init.sql
db_init.sql.md5
@ -166,5 +168,7 @@ jobs:
uses: actions/cache/save@v4
if: ${{ ! cancelled() }}
with:
# See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
enableCrossOsArchive: true
key: ${{ steps.cache.outputs.cache-primary-key }}
path: db_init.*

2
htdocs/blockedlog/class/authority.class.php
View file

@ -316,7 +316,7 @@ class BlockedLogAuthority
if ($res['content'] === 'blockalreadyadded' || $res['content'] === 'blockadded') {
$block->setCertified();
} else {
$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
$this->error = $langs->trans('ImpossibleToContactAuthority', $url);
return -1;
}
}

12
htdocs/core/class/dolgeoip.class.php
View file

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* 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
@ -34,11 +35,18 @@
class DolGeoIP
{
/**
* @var GeoIp2\Database\Reader
* @var GeoIp2\Database\Reader|string
*/
public $gi;
/**
* @var string
*/
public $error;
/**
* @var string
*/
public $errorlabel;
/**

5
htdocs/core/class/emailsenderprofile.class.php
View file

@ -3,7 +3,6 @@
* Copyright (C) 2014-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) ---Put here your own copyright and developer email---
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -28,8 +27,6 @@
// Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
/**
@ -48,7 +45,7 @@ class EmailSenderProfile extends CommonObject
public $table_element = 'c_email_senderprofile';
/**
* @var array Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int|string Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
public $ismultientitymanaged = 1;

8
htdocs/core/lib/functions.lib.php
View file

@ -7684,7 +7684,7 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
*
* @param string $stringtoclean String to clean
* @param array $disallowed_tags Array of tags not allowed
* @param string $cleanalsosomestyles Clean also some tags
* @param int $cleanalsosomestyles Clean also some tags
* @return string String cleaned
*
* @see dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_onlythesehtmlattributes()
@ -8048,7 +8048,7 @@ function dol_htmlcleanlastbr($stringtodecode)
* @param string $a Operand a
* @param string $b Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...)
* @param string $c Operand c
* @param string $keepsomeentities Entities but &, <, >, " are not converted.
* @param int $keepsomeentities Entities but &, <, >, " are not converted.
* @return string String decoded
*/
function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
@ -8086,7 +8086,7 @@ function dol_htmlentities($string, $flags = ENT_QUOTES | ENT_SUBSTITUTE, $encodi
* Example, if string contains euro symbol that has ascii code 128
*
* @param string $s String to check
* @param string $clean Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formatted file.
* @param int $clean Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formatted file.
* @return int|string 0 if bad iso, 1 if good iso, Or the clean string if $clean is 1
* @deprecated Duplicate of ascii_check()
* @see ascii_check()
@ -9538,7 +9538,7 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
*
* @param array $array Array to sort (array of array('key1'=>val1,'key2'=>val2,'key3'...) or array of objects)
* @param string $index Key in array to use for sorting criteria
* @param int $order Sort order ('asc' or 'desc')
* @param string $order Sort order ('asc' or 'desc')
* @param int $natsort If values are strings (I said value not type): 0=Use alphabetical order, 1=use "natural" sort (natsort)
* If values are numeric (I said value not type): 0=Use numeric order (even if type is string) so use a "natural" sort, 1=use "natural" sort too (same than 0), -1=Force alphabetical order
* @param int $case_sensitive 1=sort is case sensitive, 0=not case sensitive