From 07f7717b514db604e73434e1734c35147e60fb37 Mon Sep 17 00:00:00 2001
From: braito4 <braito4@hotmail.com>
Date: Mon, 28 Dec 2015 11:28:18 +0100
Subject: [PATCH 1/3] Fix Warning #4229 PHP7

---
 htdocs/resource/class/resource.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index e6c01eb09f4..b7e0caa7bfc 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -627,7 +627,7 @@ class Resource extends CommonObject
      *	 	@param  int		$fieldid   	Name of field to use for the select MAX and MIN
      *      @return int         		<0 if KO, >0 if OK
      */
-    function load_previous_next_ref($filter,$fieldid)
+    function load_previous_next_ref($filter, $fieldid, $nodbprefix ='')
     {
     	global $conf, $user;
 

From 47ee8993d3daa909e98874abad1abd17778889e4 Mon Sep 17 00:00:00 2001
From: braito4 <braito4@hotmail.com>
Date: Mon, 28 Dec 2015 11:47:12 +0100
Subject: [PATCH 2/3] fix travis

---
 htdocs/resource/class/resource.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index b7e0caa7bfc..c323ad17e69 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/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, $nodbprefix ='')
+    function load_previous_next_ref($filter, $fieldid, $nodbprefix =0)
     {
     	global $conf, $user;
 

From b6b422042c10d7e7250344af3ba32f3366746e23 Mon Sep 17 00:00:00 2001
From: Paris Liakos <rootatwc@gmail.com>
Date: Tue, 29 Dec 2015 03:43:49 +0200
Subject: [PATCH 3/3] MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden

---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e4bb572a3eb..eb3f094b7d7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2050,7 +2050,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;