From bde49e05e7aca32b0da06eff0ed0b0235720134e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 18:23:38 +0200
Subject: [PATCH 1/4] Fix doc

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

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 3fc7b225c77..a82ad69091b 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -320,7 +320,7 @@ class SocieteAccount extends CommonObject
 	* @param	string	$id			Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...)
 	* @param	string	$site		Site (example: 'stripe', '...')
 	* @param	int		$status		Status (0=test, 1=live)
-	* @return	string				Id of third party
+	* @return	int					Id of third party
 	* @see getCustomerAccount()
 	*/
 	public function getThirdPartyID($id, $site, $status = 0)

From a6d4475afff68f0ce1c0e808aec631a553d97f6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 18:24:45 +0200
Subject: [PATCH 2/4] Fix scrutinizer

---
 htdocs/stripe/class/stripe.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index dd66c7607e5..d754b8d3962 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -247,6 +247,8 @@ class Stripe extends CommonObject
 	 */
 	public function getPaymentMethodStripe($paymentmethod, $key = '', $status = 0)
 	{
+		$stripepaymentmethod = null;
+
 		try {
 			// Force to use the correct API key
 			global $stripearrayofkeysbyenv;
@@ -261,6 +263,7 @@ class Stripe extends CommonObject
 		{
 			$this->error = $e->getMessage();
 		}
+
 		return $stripepaymentmethod;
 	}
 

From 42e58d9ea59f6231dc08836f0e719fb7a83253bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 18:38:14 +0200
Subject: [PATCH 3/4] Fix preview of interventions

---
 htdocs/core/lib/functions.lib.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4bbd030b1eb..7341bc0c2cb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1330,10 +1330,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 				$nophoto='';
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			}
-			//elseif ($conf->browser->layout != 'phone') {    // Show no photo link
+			else {    // Show no photo link
 				$nophoto='/public/theme/common/nophoto.png';
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
-			//}
+			}
 		}
 	}
 	elseif ($object->element == 'ticket')
@@ -1349,10 +1349,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 				$nophoto='';
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			}
-			//elseif ($conf->browser->layout != 'phone') {    // Show no photo link
-			$nophoto='/public/theme/common/nophoto.png';
-			$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
-			//}
+			else {    // Show no photo link
+				$nophoto='/public/theme/common/nophoto.png';
+				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' style="width: '.$width.'px"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
+			}
 		}
 	}
 	else
@@ -5260,7 +5260,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		// Here, object->id, object->ref and modulepart are required.
 		//var_dump($modulepart);
         if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice',
-			'supplier_order','supplier_proposal','shipment','contract','expensereport')))
+			'supplier_order','supplier_proposal','shipment','contract','expensereport','ficheinter')))
 		{
 			$path=($object->ref?$object->ref:$object->id);
 		}

From 0123a18ff86c89272404e57ae6cb65ccfd3c4566 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 18:44:08 +0200
Subject: [PATCH 4/4] Look and feel v10

---
 htdocs/core/tpl/resource_view.tpl.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index d2e0441b60b..014560e0299 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -53,11 +53,11 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 		}
 		else
 		{
-			$style='';
+			$class='';
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
-				$style='style="background: orange;"';
+				$class='highlight';
 
-			print '<div class="tagtr oddeven" '.$style.'>';
+			print '<div class="tagtr oddeven'.($class?' '.$class:'').'">';
 
 			print '<div class="tagtd">';
 			print $object_resource->getNomUrl(1);
@@ -81,7 +81,7 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			print '</a>';
 			print '&nbsp;';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
-			print img_delete();
+			print img_picto($langs->trans("Unlink"), 'unlink');
 			print '</a>';
 			print '</div>';