diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php index 3e9c91cce14..4ee83896570 100644 --- a/htdocs/core/tpl/list_print_total.tpl.php +++ b/htdocs/core/tpl/list_print_total.tpl.php @@ -24,12 +24,14 @@ * @var Translate $langs * * @var int $trforbreaknobg - * @var ?mixed|null $limit + * @var ?int $limit + * @var ?int $offset * @var array{nbfield:int,type?:array,pos?:array,val?:array} $totalarray */ ' @phan-var-force array{nbfield:int,type?:array,pos?:array,val?:array} $totalarray @phan-var-force ?string $sqlfields +@phan-var-force ?int $limit '; if (!function_exists('printTotalValCell')) { // allow two list with total on same screen diff --git a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php index 80b965a5a2d..e2cfbcd2df3 100644 --- a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php +++ b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php @@ -111,16 +111,6 @@ class InterfaceWebhookTriggers extends DolibarrTriggers $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); $headers = array( diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index e2f1d71006c..17db16de8ac 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -1032,7 +1032,7 @@ class Mo extends CommonObject $resdel = $moline->delete($user, $notrigger); if ($resdel < 0) { - $this->error++; + $error++; $this->setErrorsFromObject($moline); } }