Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-10-06 01:37:53 +02:00
parent efc15d7d1f 56fed15f5b
commit 2da06f9fb1
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/.gitignore vendored
View File

@@ -21,7 +21,6 @@
/cabinetmed*
/webmail*
/conf/conf.php
/subtotal*
/abricot*
/nomenclature*
/of/

5
htdocs/comm/action/class/actioncomm.class.php
View File

@@ -2788,8 +2788,9 @@ class ActionComm extends CommonObject
// Content
$sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray);
//Topic
$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->transnoentities('EventReminder'));
// Topic
$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : $langs->transnoentitiesnoconv('EventReminder');
$sendTopic = make_substitutions($sendTopic, $substitutionarray);
// Recipient
$recipient = new User($this->db);

3
htdocs/core/modules/security/captcha/modCaptchaStandard.class.php
View File

@@ -82,6 +82,7 @@ class modCaptchaStandard extends ModeleCaptcha
global $db, $conf, $langs, $user;
$generator = new modGeneratePassStandard($db, $conf, $langs, $user);
$generator->length = '5';
$example = $generator->getExample();
if (function_exists("imagecreate") && function_exists("imagepng")) {
@@ -89,7 +90,7 @@ class modCaptchaStandard extends ModeleCaptcha
if (!$img) {
return "Problem with GD creation";
}
//$background_color = imagecolorallocate($img, 250, 250, 250);
$background_color = imagecolorallocate($img, 250, 250, 250); // do not comment this line
$ecriture_color = imagecolorallocate($img, 0, 0, 0);
imagestring($img, 4, 15, 8, $example, $ecriture_color);

5
htdocs/fourn/facture/list.php
View File

@@ -1626,7 +1626,7 @@ $totalarray['val'] = array();
$totalarray['val']['f.total_ht'] = 0;
$totalarray['val']['f.total_vat'] = 0;
$totalarray['val']['f.total_localtax1'] = 0;
$totalarray['val']['f.total_localtax1'] = 0;
$totalarray['val']['f.total_localtax2'] = 0;
$totalarray['val']['f.total_ttc'] = 0;
$totalarray['val']['totalam'] = 0;
$totalarray['val']['rtp'] = 0;
@@ -2049,9 +2049,6 @@ while ($i < $imaxinloop) {
$totalarray['nbfield']++;
$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
}
if (empty($totalarray['val']['totalam'])) {
$totalarray['val']['totalam'] = 0; // avoid PHP Warning: Undefined array key "totalam" on line 1891
}
$totalarray['val']['totalam'] += $totalpay;
}