Merge remote-tracking branch 'upstream/develop' into multidiroutput

This commit is contained in:
Frédéric FRANCE
2023-03-09 16:13:19 +01:00
34 changed files with 289 additions and 147 deletions

View File

@@ -2727,7 +2727,7 @@ class Commande extends CommonOrder
* @param int $offset For pagination
* @param string $sortfield Sort criteria
* @param string $sortorder Sort order
* @return int -1 if KO, array with result if OK
* @return int|array -1 if KO, array with result if OK
*/
public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC')
{