From 4cf7f68b6cbc3d3b7d2d9c9d0655468690f9214b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:44:05 +0200
Subject: [PATCH 01/13] Fix search on pages

---
 htdocs/website/class/websitepage.class.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index c63823f51a1..3e518d4d633 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -329,14 +329,23 @@ class WebsitePage extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_website') {
+				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
 					$sqlwhere[] = $key.'='.$value;
+				} elseif ($key == 'type_container') {
+					$sqlwhere[] = $key."='".$value."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
+					$foundnull = 0;
 					foreach(explode(',', $value) as $tmpvalue) {
+						if ($tmpvalue == 'null') {
+							$foundnull++;
+							continue;
+						}
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
-					$sqlwhere[] = $key." IN (".join(',', $listoflang).")";
+					$stringtouse = $key." IN (".join(',', $listoflang).")";
+					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}

From 0842259012f041d7f0ed33dbcf9be5d0fc97ddd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:55:20 +0200
Subject: [PATCH 02/13] Fix lang must be set to null and not 0 when not defined

---
 htdocs/website/class/websitepage.class.php | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 3e518d4d633..2a72a222265 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -108,6 +108,29 @@ class WebsitePage extends CommonObject
 	const STATUS_VALIDATED = 1;
 
 
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
@@ -122,7 +145,7 @@ class WebsitePage extends CommonObject
 	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
 		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
 		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
-		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
+		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
 	    'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
 	    'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),

From 3811586cd0654ef0d99c6369177d7b96cf35b50d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 14 May 2020 20:34:48 +0200
Subject: [PATCH 03/13] FIX Site ec.europa.eu has moved to https://

---
 htdocs/societe/checkvat/checkVatPopup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 689df14f3d7..e1f940cfab8 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -28,9 +28,9 @@ require_once NUSOAP_PATH.'/nusoap.php';
 $langs->load("companies");
 
 //http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl
-$WS_DOL_URL='http://ec.europa.eu/taxation_customs/vies/services/checkVatService';
+$WS_DOL_URL='https://ec.europa.eu/taxation_customs/vies/services/checkVatService';
 //$WS_DOL_URL_WSDL=$WS_DOL_URL.'?wsdl';
-$WS_DOL_URL_WSDL='http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl';
+$WS_DOL_URL_WSDL='https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl';
 $WS_METHOD ='checkVat';
 
 

From cb98ec4d232b0be9d776e5b50a0745f307f5b016 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 15 May 2020 01:18:53 +0200
Subject: [PATCH 04/13] Fix datapolicycron

---
 htdocs/datapolicy/class/datapolicycron.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 0d241f75334..81e9d009a56 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -461,7 +461,7 @@ class DataPolicyCron
                 )
             ),
         );
-
+		
         $this->db->begin();
 
         foreach ($arrayofparameters as $key => $params)
@@ -470,15 +470,15 @@ class DataPolicyCron
             {
                 $sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
 
-                $resql = $db->query($sql);
+                $resql = $this->db->query($sql);
 
-                if ($resql && $db->num_rows($resql) > 0)
+                if ($resql && $this->db->num_rows($resql) > 0)
                 {
-                    $num = $db->num_rows($resql);
+                    $num = $this->db->num_rows($resql);
                     $i = 0;
 
                     require_once $params['file'];
-                    $object = new $params['class']($db);
+                    $object = new $params['class']($this->db);
 
                     while ($i < $num && ! $error)
                     {

From e691045c3d6ef5ad11fd9539fc702ed706229165 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 14 May 2020 23:20:39 +0000
Subject: [PATCH 05/13] Fixing style errors.

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

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 81e9d009a56..ac364c78f30 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -461,7 +461,7 @@ class DataPolicyCron
                 )
             ),
         );
-		
+
         $this->db->begin();
 
         foreach ($arrayofparameters as $key => $params)

From bfca151d8553e7e8fe4487d7cf5d73c8459e520f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 11:58:50 +0200
Subject: [PATCH 06/13] Responsive

---
 htdocs/public/demo/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index c470055dbce..cbed76af71f 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -280,7 +280,7 @@ print '</div>';
 
 print '<div class="demobantext" style="max-width: 1024px;">';
 print '<div style="font-size: 20px; padding: 40px;">';
-print '<div style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
+print '<div class="hideonsmartphone" style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
 print '<div class="titre"><font style="font-size: 20px">'.$langs->trans("ChooseYourDemoProfil").'</font></div>';
 print '</div>';
 print '</div>';

From ad906fc508d3a712ddcd2133299bf0827d16a0b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 12:43:48 +0200
Subject: [PATCH 07/13] Fix use SVG logo instead of PNG

---
 htdocs/cache.manifest                      |   2 +-
 htdocs/core/lib/ticket.lib.php             |   6 +++---
 htdocs/opensurvey/fonctions.php            |   2 +-
 htdocs/public/demo/index.php               |   2 +-
 htdocs/public/members/new.php              |   6 +++---
 htdocs/public/onlinesign/newonlinesign.php |   2 +-
 htdocs/public/payment/newpayment.php       |   2 +-
 htdocs/public/payment/paymentko.php        |   2 +-
 htdocs/public/payment/paymentok.php        |   2 +-
 htdocs/theme/dolibarr_logo.png             | Bin 9663 -> 14082 bytes
 htdocs/user/passwordforgotten.php          |   8 ++++----
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest
index ebbf1aab4eb..5e514a32a47 100644
--- a/htdocs/cache.manifest
+++ b/htdocs/cache.manifest
@@ -8,7 +8,7 @@ CACHE MANIFEST
 # Files listed under CACHE will be ALWAYS cached after they are loaded.
 # And they will be always used from Cache after (even after refresh).
 CACHE:
-theme/dolibarr_logo.png
+theme/dolibarr_logo.svg
 support/
 support/index.php
 
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 0a50eb7407f..1b2a5c1245f 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -230,8 +230,8 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
         	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
         		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);
         		$width = 150;
-        	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) {
-        		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+        	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+        		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
         	}
         }
     }
@@ -254,7 +254,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
     	}
     	print '</div>';
     	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
     	}
     	print '</div>';
     }
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 30529b49f56..31ec69f3a42 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -121,7 +121,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '>';
 		print '</div>';
 		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index cbed76af71f..f0caf948770 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -274,7 +274,7 @@ print "\n";
 
 print '<div class="demoban demobackground">';
 print '<div class="right" style="padding-right: 30px; padding-top: 30px;">';
-print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></a>';
+print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" alt="Dolibarr logo"></a>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 5b456893bf9..7f788a84671 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -113,9 +113,9 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
         $width = 150;
     }
-    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
     {
-        $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+        $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
         $width = 150;
     }
 
@@ -130,7 +130,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     	print '>';
     	print '</div>';
     	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
     	}
     	print '</div>';
     }
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 83e757b78f8..2378728a8d3 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -191,7 +191,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index ddd1943329e..ea7fd71c9e6 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -793,7 +793,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 2610219d69d..a3f6d733fcb 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -245,7 +245,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 6b7805cf473..b1d6c149a51 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -181,7 +181,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
index 77c2146191034eb2b02c61b2f67c26fcf5d6aa19..c15f03c821baf1e72192ebaee9c73477f5668810 100644
GIT binary patch
literal 14082
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
XceF3C*bLCO$6(~7m8GgBOuzp>ibZ10

literal 9663
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
BfOh}@

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index b0f3a5aab6c..83289521538 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -192,13 +192,13 @@ elseif (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 	$width = 128;
 }
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
+elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
 {
-	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
+	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg';
 }
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 {
-	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 }
 
 // Security graphical code

From 8a2741650a6096bdad3f165ce12aa98d54aa051b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 12:46:55 +0200
Subject: [PATCH 08/13] Fix css

---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index afb154408c5..a6e9258ea39 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1362,6 +1362,9 @@ td.showDragHandle {
 	transition: left 0.5s ease;
 }
 
+.demologo {
+	width: 200px;
+}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index da2df5eb788..38a9ec38fe5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2471,6 +2471,9 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
+.demologo {
+	width: 200px;
+}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;

From 949ef8d7d89f413cd8b3c72eb5c5f85a9c409e20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 12:49:22 +0200
Subject: [PATCH 09/13] Fix css

---
 htdocs/public/demo/demo.css      | 5 ++++-
 htdocs/theme/eldy/global.inc.php | 3 ---
 htdocs/theme/md/style.css.php    | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index 9328a8ecd1b..b185f8c933f 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -105,8 +105,11 @@ img.demothumb {
     object-fit: contain;
     height: 140px;
     background-position-y: bottom;
+	background-position-x: right;
+}
+.demologo {
+	width: 200px;
 }
-
 
 @media only screen and (max-width: 767px)
 {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a6e9258ea39..afb154408c5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1362,9 +1362,6 @@ td.showDragHandle {
 	transition: left 0.5s ease;
 }
 
-.demologo {
-	width: 200px;
-}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 38a9ec38fe5..da2df5eb788 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2471,9 +2471,6 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
-.demologo {
-	width: 200px;
-}
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;

From 91f87d6834ad67d11caf7edc7b932993a0999029 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 13:52:35 +0200
Subject: [PATCH 10/13] Fix bad param of getNomUrl

---
 htdocs/compta/accounting-files.php      | 12 +++----
 htdocs/don/class/don.class.php          | 22 +++++++++----
 htdocs/loan/class/paymentloan.class.php | 42 ++++++++++++++++---------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index f9bc453d999..7d8b819b75c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -672,27 +672,27 @@ if (!empty($date_start) && !empty($date_stop))
 				} elseif ($data['item'] == 'ExpenseReport') {
                     $expensereport->id = $data['id'];
                 	$expensereport->ref = $data['ref'];
-                	print $expensereport->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
 				} elseif ($data['item'] == 'SalaryPayment') {
                     $salary_payment->id = $data['id'];
                 	$salary_payment->ref = $data['ref'];
-                	print $salary_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $salary_payment->getNomUrl(1, '', 0, '', 0);
 				} elseif ($data['item'] == 'Donation') {
                     $don->id = $data['id'];
                 	$don->ref = $data['ref'];
-                	print $don->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $don->getNomUrl(1, 0, '', 0);
 				} elseif ($data['item'] == 'SocialContributions') {
                     $charge_sociales->id = $data['id'];
                 	$charge_sociales->ref = $data['ref'];
-                	print $charge_sociales->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
 				} elseif ($data['item'] == 'VariousPayment') {
                     $various_payment->id = $data['id'];
                 	$various_payment->ref = $data['ref'];
-                	print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $various_payment->getNomUrl(1, '', 0, 0);
 				} elseif ($data['item'] == 'LoanPayment') {
                     $payment_loan->id = $data['id'];
                 	$payment_loan->ref = $data['ref'];
-                	print $payment_loan->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+                	print $payment_loan->getNomUrl(1, 0, 0, '', 0);
 				} else {
                 	print $data['ref'];
 				}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 77dbd177cbd..59c293e6386 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -916,11 +916,13 @@ class Don extends CommonObject
     /**
      *	Return clicable name (with picto eventually)
      *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param	int  	$notooltip		1=Disable tooltip
-     *	@return	string					Chaine avec URL
+     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+     *	@param	int  	$notooltip					1=Disable tooltip
+     *	@param	string	$moretitle					Add more text to title tooltip
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return	string								Chaine avec URL
      */
-    public function getNomUrl($withpicto = 0, $notooltip = 0)
+    public function getNomUrl($withpicto = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
     {
         global $conf, $langs;
 
@@ -928,10 +930,18 @@ class Don extends CommonObject
 
         $result = '';
         $label = '<u>'.$langs->trans("Donation").'</u>';
-        if (!empty($this->id))
+        if (!empty($this->id)) {
         	$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+        }
+        if ($moretitle) $label .= ' - '.$moretitle;
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/don/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $url = DOL_URL_ROOT.'/don/card.php?id='.$this->id;
+
+       	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+       	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+       	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+
+        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend = '</a>';
 
         $result .= $linkstart;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 485d48dc443..ce152317710 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -507,25 +507,39 @@ class PaymentLoan extends CommonObject
 	/**
 	 *  Return clicable name (with eventually a picto)
 	 *
-	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=No picto
-	 * 	@param	int		$maxlen			Max length label
-	 *	@return	string					Chaine with URL
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=No picto
+	 * 	@param	int		$maxlen						Max length label
+     *	@param	int  	$notooltip					1=Disable tooltip
+     *	@param	string	$moretitle					Add more text to title tooltip
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $maxlen = 0)
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
 	{
-		global $langs;
+		global $langs, $conf;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-
-		if (!empty($this->id))
-		{
-			$link = '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id.'">';
-			$linkend = '</a>';
-
-			if ($withpicto) $result .= ($link.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result .= ' ';
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+		$label = '<u>'.$langs->trans("Loan").'</u>';
+		if (!empty($this->id)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
 		}
+		if ($moretitle) $label .= ' - '.$moretitle;
+
+		$url = DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id;
+
+		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+		if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
 		return $result;
 	}

From 02b40ae8f60cfd76c70453d631af0c21618655ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 13:54:05 +0200
Subject: [PATCH 11/13] Fix scrutinizer

---
 htdocs/core/class/interfaces.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 9302ed09afb..4199e51cb68 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -328,6 +328,8 @@ class Interfaces
                 continue;
             }
 
+            $text = '';
+
             try {
 	            $objMod = new $modName($db);
 

From 672ea60ffd471b2156bf45c28c60c3dc57223906 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 May 2020 13:58:34 +0200
Subject: [PATCH 12/13] FIX #13896

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

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index fad19564fdc..2070bedf568 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -440,7 +440,7 @@ class MyObject extends CommonObject
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < min($limit, $num))
+			while ($i < ($limit ? min($limit, $num) : $num))
 			{
 				$obj = $this->db->fetch_object($resql);
 

From dc6ae70aa6ddc311b8967dd9bf8d445e70c815a1 Mon Sep 17 00:00:00 2001
From: Langlais115 <Langlais115@users.noreply.github.com>
Date: Fri, 15 May 2020 10:25:56 +0200
Subject: [PATCH 13/13] Fix  #13805

Add proper type check to "seuil_stock_alerte" parameter.
---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bb2a1652d8f..7b6892552d1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1015,7 +1015,7 @@ class Product extends CommonObject
             $sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
             $sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
             $sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
-            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");
+            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (int) $this->seuil_stock_alerte : 'null');
             $sql .= ", description = '".$this->db->escape($this->description)."'";
             $sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
             $sql .= ", customcode = '".$this->db->escape($this->customcode)."'";