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

@@ -59,7 +59,7 @@ class Receptions extends DolibarrApi
* Return an array with reception informations
*
* @param int $id ID of reception
* @return array|mixed data without useless information
* @return Object Object with cleaned properties
*
* @throws RestException
*/
@@ -497,8 +497,8 @@ class Receptions extends DolibarrApi
* This may record stock movements if module stock is enabled and option to
* decrease stock on reception is on.
*
* @param int $id Reception ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @param int $id Reception ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
*
* @url POST {id}/validate
*
@@ -625,8 +625,8 @@ class Receptions extends DolibarrApi
/**
* Close a reception (Classify it as "Delivered")
*
* @param int $id Reception ID
* @param int $notrigger Disabled triggers
* @param int $id Reception ID
* @param int $notrigger Disabled triggers
*
* @url POST {id}/close
*