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

Dolibarr · Jan 12, 2017 · f408c88 · f408c88
2 parents 3d8c5b3 + 7a8a95c
commit f408c88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htdocs/commande/class/api_commande.class.php b/htdocs/commande/class/api_commande.class.php
@@ -193,7 +193,7 @@ function getList($mode=0, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0
      * @return  array   Array of order objects
      */
     function getListForSoc($socid = 0) {
-      return getList(0,"s.rowid","ASC",0,0,$socid);
+      return $this->getList(0,"s.rowid","ASC",0,0,$socid);
     }
 
 

diff --git a/htdocs/societe/class/api_contact.class.php b/htdocs/societe/class/api_contact.class.php
@@ -17,7 +17,7 @@
 
 use Luracast\Restler\RestException;
 
-//require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
 
 /**
  * API class for contact object