From b8683979029da4dd1b1b765c735b003b005d0cea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jan 2019 02:27:13 +0100
Subject: [PATCH 1/5] Fix colspan

---
 htdocs/accountancy/admin/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 8eca415bff9..146099347cc 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -276,7 +276,7 @@ if ($resql)
 	if (! empty($arrayfields['aa.pcg_type']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
 	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
 	if (! empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
-	print '<td align="right" colspan="2" class="liste_titre">';
+	print '<td align="right" class="liste_titre">';
 	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';

From 4ab19c25c8ea021e678b232f300b8f338e644681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 21 Jan 2019 08:23:31 +0100
Subject: [PATCH 2/5] add missing global $conf in bonprelevement class

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 4089ffd76e2..2187b99eaf3 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1591,6 +1591,7 @@ class BonPrelevement extends CommonObject
 	function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_facnumber, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
 	{
         // phpcs:enable
+        global $conf;
 		$CrLf = "\n";
 		$Rowing = sprintf("%06d", $row_idfac);
 

From 1da29fbed38d849bb83012abc4b744b92dbbf06c Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 21 Jan 2019 10:12:13 +0100
Subject: [PATCH 3/5] fix php warning

---
 htdocs/resource/class/dolresource.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index ad3355e3972..bb7aad6dd57 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -56,7 +56,9 @@ class Dolresource extends CommonObject
 	public $type_label;
 	public $tms='';
 
-	var $oldcopy;
+	public $cache_code_type_resource=array();
+
+	public $oldcopy;
 
     /**
      *  Constructor
@@ -66,6 +68,7 @@ class Dolresource extends CommonObject
     function __construct($db)
     {
         $this->db = $db;
+
     }
 
     /**

From a928f3a9d75c70d06052b8fc6c1718798cebd727 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jan 2019 18:02:43 +0100
Subject: [PATCH 4/5] Update dolresource.class.php

---
 htdocs/resource/class/dolresource.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index bb7aad6dd57..ec184cd856d 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -68,7 +68,6 @@ class Dolresource extends CommonObject
     function __construct($db)
     {
         $this->db = $db;
-
     }
 
     /**

From 6f553db93d0323d5725c253187f79192ce7eb448 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jan 2019 20:47:07 +0100
Subject: [PATCH 5/5] Remove bad text

---
 htdocs/admin/system/filecheck.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 309d20e0abe..14b25aedac2 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -338,7 +338,6 @@ if (! $error && $xml)
                 $out.='<tr class="oddeven">';
                 $out.='<td>'.$i.'</td>' . "\n";
                 $out.='<td>'.$file['filename'];
-                $out.=PHP_OS;
                 if (! preg_match('/^win/i',PHP_OS)) {
                 	$htmltext=$langs->trans("YouCanDeleteFileOnServerWith", 'rm '.DOL_DOCUMENT_ROOT.'/'.$file['filename']);
                 	$out.=' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm');