Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
This commit is contained in:
Laurent Destailleur
2016-09-26 01:15:17 +02:00
parent ac2c685e7d 0ab3728276
commit 100312aac2
51 changed files with 369 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/commande/class/api_orders.class.php
View File

@@ -396,7 +396,7 @@ class Orders extends DolibarrApi
$this->commande->$field = $value;
}
if($this->commande->update($id, DolibarrApiAccess::$user,1,'','','update'))
if($this->commande->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
return $this->get($id);
return false;
@@ -441,8 +441,8 @@ class Orders extends DolibarrApi
*
* @param int $id Order ID
* @param int $idwarehouse Warehouse ID
* @param int $notrigger No trigger
*
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
*
* @url POST {id}/validate
*
* @return array