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

CI

Browse source
This commit is contained in:
Laurent Destailleur 2026-06-20 16:30:50 +02:00
parent 9f67627863
commit 2dc4faaff4
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/blockedlog/admin/blockedlog_archives.php
View file

@ -635,6 +635,8 @@ if ($action == 'export' && $user->hasRight('blockedlog', 'read')) { // read is
$firstrecorddate = 0;
global $foundoldformat, $firstrecorddate;
include DOL_DOCUMENT_ROOT.'/blockedlog/admin/lifetimeamount.inc.php';
'@phan-var-force array<string,array<string,float>> $totalamountlifetime';
'@phan-var-force array<string,array<string,float>> $totalhtamountlifetime';
$countsource = 0;
foreach ($showtotalfor as $source => $tmpval) {

2
htdocs/blockedlog/admin/blockedlog_list.php
View file

@ -969,6 +969,8 @@ if (is_array($blocks)) {
$firstrecorddate = 0;
global $foundoldformat, $firstrecorddate;
include DOL_DOCUMENT_ROOT.'/blockedlog/admin/lifetimeamount.inc.php';
'@phan-var-force array<string,array<string,float>> $totalamountlifetime';
'@phan-var-force array<string,array<string,float>> $totalhtamountlifetime';
print '<tr class="liste_titre totalblockedlog" style="border-top: 1px solid #222">';
print '<td colspan="'.$colspan.'"';

2
htdocs/core/modules/modBlockedLog.class.php
View file

@ -270,7 +270,7 @@ class modBlockedLog extends DolibarrModules
// New method
$obfuscationkey = '';
try {
dol_syslog("mysoc->profid1 = ".$mysoc->profid1);
dol_syslog("mysoc->profid1 = ".$mysoc->idprof1);
$obfuscationkey = $b->getObfuscationKey(); // Get the obfuscation key from memory or remote server. If not found, we retrieve it.
//$obfuscationkey = ''; // Uncomment this to test if obfuscation key can't be retrieved.
} catch (Exception $e) {

10
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View file

@ -530,8 +530,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
$object->sendtoid = array();
$object->fk_element = 0;
$object->elementtype = '';
} elseif ($action == 'FICHINTER_VALIDATE' && $object instanceof Fichinter) {
'@phan-var-force Fichinter $object';
// Load translation files required by the page
@ -549,8 +547,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
$object->sendtoid = array();
$object->fk_element = 0;
$object->elementtype = '';
} elseif ($action == 'FICHINTER_MODIFY' && $object instanceof Fichinter) {
'@phan-var-force Fichinter $object';
// Load translation files required by the page
@ -568,8 +564,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
$object->sendtoid = array();
$object->fk_element = 0;
$object->elementtype = '';
} elseif ($action == 'FICHINTER_SENTBYMAIL' && $object instanceof Fichinter) {
'@phan-var-force Fichinter $object';
// Load translation files required by the page
@ -639,8 +633,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
$object->sendtoid = array();
$object->fk_element = 0;
$object->elementtype = '';
} elseif ($action == 'FICHINTER_DELETE' && $object instanceof Fichinter) {
'@phan-var-force Fichinter $object';
// Load translation files required by the page
@ -658,8 +650,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
$object->sendtoid = array();
$object->fk_element = 0;
$object->elementtype = '';
} elseif ($action == 'SHIPPING_VALIDATE' && $object instanceof Expedition) {
'@phan-var-force Expedition $object';
// Load translation files required by the page