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

htdocs/core/class/commonobject.class.php

@@ -2054,7 +2054,7 @@ abstract class CommonObject
 
         $forcedroundingmode=$roundingadjust;
         if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-        if ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
 
         $error=0;
 

htdocs/resource/class/resource.class.php

@@ -624,10 +624,11 @@ class Resource extends CommonObject
      *      Load properties id_previous and id_next
      *
      *      @param	string	$filter		Optional filter
-     *	 	@param  int		$fieldid   	Name of field to use for the select MAX and MIN
+     *	    @param  	int		$fieldid   	Name of field to use for the select MAX and MIN
+     *	    @param	int		$nodbprefix		Do not include DB prefix to forge table name
      *      @return int         		<0 if KO, >0 if OK
      */
-    function load_previous_next_ref($filter,$fieldid)
+    function load_previous_next_ref($filter, $fieldid, $nodbprefix =0)
     {
     	global $conf, $user;