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

Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
This commit is contained in:
Laurent Destailleur
2016-08-02 17:43:12 +02:00
21 changed files with 135 additions and 66 deletions

View File

@@ -160,6 +160,7 @@ class CommandeApi extends DolibarrApi
if ($result)
{
$i=0;
$num = $db->num_rows($result);
while ($i < $num)
{