Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI

Browse Source
This commit is contained in:
Laurent Destailleur
2025-11-20 20:14:52 +01:00
parent 13bcab94c5
commit ae4522c152
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/tpl/list_print_total.tpl.php
View File

@@ -24,12 +24,14 @@
* @var Translate $langs * @var Translate $langs
* *
* @var int $trforbreaknobg * @var int $trforbreaknobg
* @var ?mixed|null $limit * @var ?int $limit
* @var ?int $offset
* @var array{nbfield:int,type?:array<int,string>,pos?:array<int,string>,val?:array<int,float>} $totalarray * @var array{nbfield:int,type?:array<int,string>,pos?:array<int,string>,val?:array<int,float>} $totalarray
*/ */
' '
@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,string>,val?:array<int,float>} $totalarray @phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,string>,val?:array<int,float>} $totalarray
@phan-var-force ?string $sqlfields @phan-var-force ?string $sqlfields
@phan-var-force ?int $limit
'; ';
if (!function_exists('printTotalValCell')) { // allow two list with total on same screen if (!function_exists('printTotalValCell')) { // allow two list with total on same screen

10
htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
View File

@@ -111,16 +111,6 @@ class InterfaceWebhookTriggers extends DolibarrTriggers
$resobject->object = dol_clone_in_array($object); $resobject->object = dol_clone_in_array($object);
if (property_exists($resobject->object, 'fields')) {
unset($resobject->object->fields);
}
if (property_exists($resobject->object, 'error')) {
unset($resobject->object->error);
}
if (property_exists($resobject->object, 'errors')) {
unset($resobject->object->errors);
}
$jsonstr = json_encode($resobject); $jsonstr = json_encode($resobject);
$headers = array( $headers = array(

2
htdocs/mrp/class/mo.class.php
View File

@@ -1032,7 +1032,7 @@ class Mo extends CommonObject
$resdel = $moline->delete($user, $notrigger); $resdel = $moline->delete($user, $notrigger);
if ($resdel < 0) { if ($resdel < 0) {
$this->error++; $error++;
$this->setErrorsFromObject($moline); $this->setErrorsFromObject($moline);
} }
} }