From e5f2b0c623cb6b2e806c8315ae9f03106be1253d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean=20Traull=C3=A9?=
 <613615+jtraulle@users.noreply.github.com>
Date: Mon, 26 Aug 2019 14:10:28 +0200
Subject: [PATCH 1/2] Add project funding links

---
 .github/FUNDING.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000000..81813c2bebe
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+open_collective: dolibarr
+custom: https://wiki.dolibarr.org/index.php/Subscribe

From bc7250dc92e0a00a562dfba2ffe29ac780d4fac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean=20Traull=C3=A9?=
 <613615+jtraulle@users.noreply.github.com>
Date: Mon, 26 Aug 2019 15:17:19 +0200
Subject: [PATCH 2/2] Fix CI

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index c6df1206d0f..cf683671c5d 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -78,9 +78,10 @@ class Stripe extends CommonObject
 	 * Return main company OAuth Connect stripe account
 	 *
 	 * @param 	string	$mode		'StripeTest' or 'StripeLive'
+	 * @param	int		$fk_soc		Id of thirdparty
 	 * @return 	string				Stripe account 'acc_....' or '' if no OAuth token found
 	 */
-	public function getStripeAccount($mode = 'StripeTest')
+	public function getStripeAccount($mode = 'StripeTest', $fk_soc = 0)
 	{
 		global $conf;
 
@@ -88,6 +89,13 @@ class Stripe extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
 		$sql.= " WHERE entity = ".$conf->entity;
 		$sql.= " AND service = '".$mode."'";
+		if ($fk_soc > 0) {
+			$sql.= " AND fk_soc = ".$fk_soc;
+		}
+		else {
+			$sql.= " AND fk_soc IS NULL";
+		}
+		$sql.= " AND fk_user IS NULL AND fk_adherent IS NULL";
 
 		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);