2
0
forked from Wavyzz/dolibarr

fix (qodana) fix condlicts

This commit is contained in:
FLIO
2023-02-01 23:38:49 +01:00
2929 changed files with 80743 additions and 47800 deletions

View File

@@ -64,11 +64,10 @@ class Interventions extends DolibarrApi
/**
* Get properties of a Expense Report object
*
* Return an array with Expense Report information
*
* @param int $id ID of Expense Report
* @return array|mixed Data without useless information
* @return Object Object with cleaned properties
*
* @throws RestException
*/
@@ -93,7 +92,6 @@ class Interventions extends DolibarrApi
/**
* List of interventions
*
* Return a list of interventions
*
* @param string $sortfield Sort field
@@ -336,8 +334,8 @@ class Interventions extends DolibarrApi
* "notrigger": 0
* }
*
* @param int $id Intervention ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @param int $id Intervention ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
*
* @url POST {id}/validate
*
@@ -373,7 +371,7 @@ class Interventions extends DolibarrApi
/**
* Close an intervention
*
* @param int $id Intervention ID
* @param int $id Intervention ID
*
* @url POST {id}/close
*