diff --git a/ChangeLog b/ChangeLog
index 70ae8ff8b5c..b379c13036e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,7 +121,7 @@ NEW: Add constant XFRAMEOPTIONS_ALLOWALL
 NEW: Add function isValidVATID()
 NEW: ADD document's product support in APIs
 NEW: REST API: get the list of objects in a category.
-NEW: Update Stripe library to 6.34.3
+NEW: Update Stripe library to 6.35
 NEW: Upgrade jquery lib to 3.3.1
 NEW: Add hook 'addHtmlHeader()'
 NEW: Add hook 'createRecurringInvoices()'
@@ -174,6 +174,7 @@ Following changes may create regressions for some external modules, but were nec
 * Removed deprecated use of string in dol_print_date(). Only date allowed.
 * Deprecated property ->fk_departement is now ->state_id everywhere.
 * Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr.
+* Column llx_facture.facnumber change to llx_facture.ref
 
 
 ***** ChangeLog for 9.0.3 compared to 9.0.2 *****
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 017d4e22569..9036b513961 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -73,10 +73,10 @@ class Invoices extends DolibarrApi
 		}
 
 		// Get payment details
-		$this->invoice->totalpaye = $this->invoice->getSommePaiement();
+		$this->invoice->totalpaid = $this->invoice->getSommePaiement();
 		$this->invoice->totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
 		$this->invoice->totaldeposits = $this->invoice->getSumDepositsUsed();
-		$this->invoice->resteapayer = price2num($this->invoice->total_ttc - $this->invoice->totalpaye - $this->invoice->totalcreditnotes - $this->invoice->totaldeposits, 'MT');
+		$this->invoice->remaintopay = price2num($this->invoice->total_ttc - $this->invoice->totalpaid - $this->invoice->totalcreditnotes - $this->invoice->totaldeposits, 'MT');
 
 		if (! DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index f022d2c3791..f9b0a59280f 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -96,7 +96,7 @@ class FormMargin
 				$line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
 			}
 
-			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
+			$pv = $line->total_ht;
 			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
 			$pa = $line->qty * $pa_ht;
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 4ce610aaf90..7da112fa255 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -145,8 +145,8 @@ function user_prepare_head($object)
 
 	if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
 		|| (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read))
-		|| (! empty($conf->expensereport->enabled) && ! empty($user->rights->expensereport->lire) && $user->id == $object->id)
-		|| (! empty($conf->holiday->enabled) && ! empty($user->rights->holiday->read) && $user->id == $object->id )
+		|| (! empty($conf->expensereport->enabled) && ! empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))
+		|| (! empty($conf->holiday->enabled) && ! empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->read_all))
 		)
 	{
 		// Bank
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 1fc25035933..c7158413e24 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -667,7 +667,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     array(
                         'doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1),
                         'img/' => dol_buildpath(strtolower($this->name).'/img/', 1),
-                        'images/' => dol_buildpath(strtolower($this->name).'/imgages/', 1),
+                        'images/' => dol_buildpath(strtolower($this->name).'/images/', 1),
                     )
                 );
             }
@@ -746,7 +746,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         $filefound= false;
 
         // Define path to file README.md.
-        // First check README-la_LA.md then README.md
+        // First check ChangeLog-la_LA.md then ChangeLog.md
         $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog-'.$langs->defaultlang.'.md', 0);
         if (dol_is_file($pathoffile)) {
             $filefound = true;
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 10a2ce752d8..dfbe97c3fd5 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -301,7 +301,7 @@ class pdf_beluga extends ModelePDFProjects
                     	'table'=>'commande',
                     	'datefieldname'=>'date_commande',
                     	'test'=>$conf->commande->enabled && $user->rights->commande->lire,
-                        'lang'=>'order'),
+                        'lang'=>'orders'),
                     'invoice'=>array(
                     	'name'=>"CustomersInvoices",
                     	'title'=>"ListInvoicesAssociatedProject",
diff --git a/htdocs/debugbar/class/DebugBar.php b/htdocs/debugbar/class/DebugBar.php
index d36583d9852..8882b5f4f1e 100644
--- a/htdocs/debugbar/class/DebugBar.php
+++ b/htdocs/debugbar/class/DebugBar.php
@@ -33,7 +33,7 @@ class DolibarrDebugBar extends DebugBar
 		//$this->addCollector(new PhpInfoCollector());
 		//$this->addCollector(new DolMessagesCollector());
 		$this->addCollector(new DolRequestDataCollector());
-		$this->addCollector(new DolConfigCollector());
+		//$this->addCollector(new DolConfigCollector());      // Disabled for security purpose
 		$this->addCollector(new DolTimeDataCollector());
 		$this->addCollector(new DolMemoryCollector());
 		//$this->addCollector(new DolExceptionsCollector());
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index de6d98edf04..66b1fbaf370 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -69,6 +69,12 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_adherent_type_extraf
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_blockedlog FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_blockedlog_authority FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bom_bom FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bom_bom_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bom_bomline FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bom_bomline_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bordereau_cheque FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_boxes_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_templates FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -96,6 +102,9 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_deplacement FOR EACH
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_element_resources FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollector FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollectoraction FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollectorfilter FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_entrepot FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_events FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_expedition FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 1718a6a72d5..93f43711a78 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -292,6 +292,9 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
             //case 'TASK_TIMESPENT_CREATE':
             //case 'TASK_TIMESPENT_MODIFY':
             //case 'TASK_TIMESPENT_DELETE':
+            //case 'PROJECT_ADD_CONTACT':
+            //case 'PROJECT_DELETE_CONTACT':
+            //case 'PROJECT_DELETE_RESOURCE':
 
             // Shipping
             //case 'SHIPPING_CREATE':
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index f4f4e8c34e5..212e86ca93c 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -127,7 +127,7 @@ if (empty($reshook))
     $backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
     if (empty($backtopage)) {
         if (empty($id)) $backtopage = $backurlforlist;
-        else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
+        else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
     }
     $triggermodname = 'MYMODULE_MYOBJECT_MODIFY';	// Name of trigger action code to execute when we modify record
 
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 6bdaa92f508..51b4c0580e0 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1943,241 +1943,249 @@ if (preg_match('/^dopayment/', $action))
 
 		print '</form>'."\n";
 
-		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
-
-	    // Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
-		print '<script type="text/javascript" language="javascript">'."\n";
-
-		if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+		if (empty($stripearrayofkeys['publishable_key']))
 		{
-        ?>
-
-	    // Create a Stripe client.
-	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-	    // Create an instance of Elements
-	    var elements = stripe.elements();
-
-	    // Custom styling can be passed to options when creating an Element.
-	    // (Note that this demo uses a wider set of styles than the guide below.)
-	    var style = {
-	      base: {
-	        color: '#32325d',
-	        lineHeight: '24px',
-	        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-	        fontSmoothing: 'antialiased',
-	        fontSize: '16px',
-	        '::placeholder': {
-	          color: '#aab7c4'
-	        }
-	      },
-	      invalid: {
-	        color: '#fa755a',
-	        iconColor: '#fa755a'
-	      }
-	    };
-
-		var cardElement = elements.create('card', {style: style});
-
-		// Add an instance of the card Element into the `card-element` <div>
-		cardElement.mount('#card-element');
-
-		// Handle real-time validation errors from the card Element.
-		cardElement.addEventListener('change', function(event) {
-    		var displayError = document.getElementById('card-errors');
+		    print info_admin($langs->trans("ErrorModuleSetupNotComplete", "stripe"), 0, 0, 'error');
+		}
+		else 
+		{
+    		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
+    
+    	    // Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
+    		print '<script type="text/javascript" language="javascript">'."\n";
+    
+    		if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+    		{
+            ?>
+    		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
+    
+    	    // Create a Stripe client.
+    	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+    
+    	    // Create an instance of Elements
+    	    var elements = stripe.elements();
+    
+    	    // Custom styling can be passed to options when creating an Element.
+    	    // (Note that this demo uses a wider set of styles than the guide below.)
+    	    var style = {
+    	      base: {
+    	        color: '#32325d',
+    	        lineHeight: '24px',
+    	        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+    	        fontSmoothing: 'antialiased',
+    	        fontSize: '16px',
+    	        '::placeholder': {
+    	          color: '#aab7c4'
+    	        }
+    	      },
+    	      invalid: {
+    	        color: '#fa755a',
+    	        iconColor: '#fa755a'
+    	      }
+    	    };
+    
+    		var cardElement = elements.create('card', {style: style});
+    
+    		// Add an instance of the card Element into the `card-element` <div>
+    		cardElement.mount('#card-element');
+    
+    		// Handle real-time validation errors from the card Element.
+    		cardElement.addEventListener('change', function(event) {
+        		var displayError = document.getElementById('card-errors');
+        	      if (event.error) {
+        	      	console.log("Show event error (like 'Incorrect card number', ...)");
+        	        displayError.textContent = event.error.message;
+        	      } else {
+        	      	console.log("Reset error message");
+        	        displayError.textContent = '';
+        	      }
+    	    });
+    
+    		// Handle form submission
+            var cardholderName = document.getElementById('cardholder-name');
+            var cardButton = document.getElementById('buttontopay');
+            var clientSecret = cardButton.dataset.secret;
+    
+            cardButton.addEventListener('click', function(event) {
+            	console.log("We click on buttontopay");
+            	event.preventDefault();
+    
+            	if (cardholderName.value == '')
+            	{
+    				console.log("Field Card holder is empty");
+    				var displayError = document.getElementById('card-errors');
+    				displayError.textContent = '<?php print dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardOwner"))); ?>';
+            	}
+            	else
+            	{
+                  stripe.handleCardPayment(
+                    clientSecret, cardElement, {
+                    	payment_method_data: {
+        			        billing_details: {
+        			        	name: cardholderName.value
+        			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo GETPOST('email', 'alpha'); ?>'<?php } ?>
+        			        	<?php if (is_object($object) && is_object($object->thirdparty) && is_object($object->thirdparty->phone)) { ?>, phone: '<?php echo $object->thirdparty->phone; ?>'<?php } ?>
+        			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, address: {
+        			        	    city: '<?php echo $object->thirdparty->town; ?>',
+        			        	    country: '<?php echo $object->thirdparty->country_code; ?>',
+        			        	    line1: '<?php echo $object->thirdparty->address; ?>',
+        			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'}<?php } ?>
+        			        }	/* TODO Add all other known data like emails, ... to be SCA compliant */
+              			},
+              			save_payment_method: true	/* the card will be saved */
+                    }
+                  ).then(function(result) {
+                  	  console.log(result);
+        	          if (result.error) {
+        	    	      console.log("Error on result of handleCardPayment");
+                	      jQuery('#buttontopay').show();
+                	      jQuery('#hourglasstopay').hide();
+        		          // Inform the user if there was an error
+        		          var errorElement = document.getElementById('card-errors');
+        		          errorElement.textContent = result.error.message;
+        		      } else {
+        		      	  // The payment has succeeded. Display a success message.
+        	    	      console.log("No error on result of handleCardPayment, so we submit the form");
+            			  // Submit the form
+            		      jQuery('#buttontopay').hide();
+            		      jQuery('#hourglasstopay').show();
+            		      // Send form (action=charge that will do nothing)
+            		      jQuery('#payment-form').submit();
+        		      }
+                  });
+                }
+            });
+    
+    
+    		<?php
+    		}
+    		else
+    		{
+    		?>
+    		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off
+    
+    	    // Create a Stripe client.
+    	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+    
+    	    // Create an instance of Elements
+    	    var elements = stripe.elements();
+    
+    	    // Custom styling can be passed to options when creating an Element.
+    	    // (Note that this demo uses a wider set of styles than the guide below.)
+    	    var style = {
+    	      base: {
+    	        color: '#32325d',
+    	        lineHeight: '24px',
+    	        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+    	        fontSmoothing: 'antialiased',
+    	        fontSize: '16px',
+    	        '::placeholder': {
+    	          color: '#aab7c4'
+    	        }
+    	      },
+    	      invalid: {
+    	        color: '#fa755a',
+    	        iconColor: '#fa755a'
+    	      }
+    	    };
+    
+    	    // Create an instance of the card Element
+    	    var card = elements.create('card', {style: style});
+    
+    	    // Add an instance of the card Element into the `card-element` <div>
+    	    card.mount('#card-element');
+    
+    	    // Handle real-time validation errors from the card Element.
+    	    card.addEventListener('change', function(event) {
+    	      var displayError = document.getElementById('card-errors');
     	      if (event.error) {
-    	      	console.log("Show event error (like 'Incorrect card number', ...)");
     	        displayError.textContent = event.error.message;
     	      } else {
-    	      	console.log("Reset error message");
     	        displayError.textContent = '';
     	      }
-	    });
-
-		// Handle form submission
-        var cardholderName = document.getElementById('cardholder-name');
-        var cardButton = document.getElementById('buttontopay');
-        var clientSecret = cardButton.dataset.secret;
-
-        cardButton.addEventListener('click', function(event) {
-        	console.log("We click on buttontopay");
-        	event.preventDefault();
-
-        	if (cardholderName.value == '')
-        	{
-				console.log("Field Card holder is empty");
-				var displayError = document.getElementById('card-errors');
-				displayError.textContent = '<?php print dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardOwner"))); ?>';
-        	}
-        	else
-        	{
-              stripe.handleCardPayment(
-                clientSecret, cardElement, {
-                	payment_method_data: {
-    			        billing_details: {
-    			        	name: cardholderName.value
-    			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo GETPOST('email', 'alpha'); ?>'<?php } ?>
-    			        	<?php if (is_object($object) && is_object($object->thirdparty) && is_object($object->thirdparty->phone)) { ?>, phone: '<?php echo $object->thirdparty->phone; ?>'<?php } ?>
-    			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, address: {
-    			        	    city: '<?php echo $object->thirdparty->town; ?>',
-    			        	    country: '<?php echo $object->thirdparty->country_code; ?>',
-    			        	    line1: '<?php echo $object->thirdparty->address; ?>',
-    			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'}<?php } ?>
-    			        }	/* TODO Add all other known data like emails, ... to be SCA compliant */
-          			},
-          			save_payment_method: true	/* the card will be saved */
-                }
-              ).then(function(result) {
-              	  console.log(result);
-    	          if (result.error) {
-    	    	      console.log("Error on result of handleCardPayment");
-            	      jQuery('#buttontopay').show();
-            	      jQuery('#hourglasstopay').hide();
-    		          // Inform the user if there was an error
-    		          var errorElement = document.getElementById('card-errors');
-    		          errorElement.textContent = result.error.message;
-    		      } else {
-    		      	  // The payment has succeeded. Display a success message.
-    	    	      console.log("No error on result of handleCardPayment, so we submit the form");
-        			  // Submit the form
-        		      jQuery('#buttontopay').hide();
-        		      jQuery('#hourglasstopay').show();
-        		      // Send form (action=charge that will do nothing)
-        		      jQuery('#payment-form').submit();
-    		      }
-              });
-            }
-        });
-
-
-		<?php
+    	    });
+    
+    	    // Handle form submission
+    	    var form = document.getElementById('payment-form');
+    	    console.log(form);
+    	    form.addEventListener('submit', function(event) {
+    	      event.preventDefault();
+    			<?php
+    			if (empty($conf->global->STRIPE_USE_3DSECURE))	// Ask credit card directly, no 3DS test
+    			{
+    			?>
+    				/* Use token */
+    				stripe.createToken(card).then(function(result) {
+    			        if (result.error) {
+    			          // Inform the user if there was an error
+    			          var errorElement = document.getElementById('card-errors');
+    			          errorElement.textContent = result.error.message;
+    			        } else {
+    			          // Send the token to your server
+    			          stripeTokenHandler(result.token);
+    			        }
+    				});
+    			<?php
+    			}
+    			else											// Ask credit card with 3DS test
+    			{
+    			?>
+    				/* Use 3DS source */
+    				stripe.createSource(card).then(function(result) {
+    				    if (result.error) {
+    				      // Inform the user if there was an error
+    				      var errorElement = document.getElementById('card-errors');
+    				      errorElement.textContent = result.error.message;
+    				    } else {
+    				      // Send the source to your server
+    				      stripeSourceHandler(result.source);
+    				    }
+    				});
+    			<?php
+    			}
+    			?>
+    	    });
+    
+    
+    		/* Insert the Token into the form so it gets submitted to the server */
+    	    function stripeTokenHandler(token) {
+    	      // Insert the token ID into the form so it gets submitted to the server
+    	      var form = document.getElementById('payment-form');
+    	      var hiddenInput = document.createElement('input');
+    	      hiddenInput.setAttribute('type', 'hidden');
+    	      hiddenInput.setAttribute('name', 'stripeToken');
+    	      hiddenInput.setAttribute('value', token.id);
+    	      form.appendChild(hiddenInput);
+    
+    	      // Submit the form
+    	      jQuery('#buttontopay').hide();
+    	      jQuery('#hourglasstopay').show();
+    	      console.log("submit token");
+    	      form.submit();
+    	    }
+    
+    		/* Insert the Source into the form so it gets submitted to the server */
+    		function stripeSourceHandler(source) {
+    		  // Insert the source ID into the form so it gets submitted to the server
+    		  var form = document.getElementById('payment-form');
+    		  var hiddenInput = document.createElement('input');
+    		  hiddenInput.setAttribute('type', 'hidden');
+    		  hiddenInput.setAttribute('name', 'stripeSource');
+    		  hiddenInput.setAttribute('value', source.id);
+    		  form.appendChild(hiddenInput);
+    
+    		  // Submit the form
+    	      jQuery('#buttontopay').hide();
+    	      jQuery('#hourglasstopay').show();
+    	      console.log("submit source");
+    		  form.submit();
+    		}
+    
+    	    <?php
+    		}
+    
+    		print '</script>';
 		}
-		else
-		{
-		?>
-
-
-	    // Create a Stripe client.
-	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-	    // Create an instance of Elements
-	    var elements = stripe.elements();
-
-	    // Custom styling can be passed to options when creating an Element.
-	    // (Note that this demo uses a wider set of styles than the guide below.)
-	    var style = {
-	      base: {
-	        color: '#32325d',
-	        lineHeight: '24px',
-	        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-	        fontSmoothing: 'antialiased',
-	        fontSize: '16px',
-	        '::placeholder': {
-	          color: '#aab7c4'
-	        }
-	      },
-	      invalid: {
-	        color: '#fa755a',
-	        iconColor: '#fa755a'
-	      }
-	    };
-
-	    // Create an instance of the card Element
-	    var card = elements.create('card', {style: style});
-
-	    // Add an instance of the card Element into the `card-element` <div>
-	    card.mount('#card-element');
-
-	    // Handle real-time validation errors from the card Element.
-	    card.addEventListener('change', function(event) {
-	      var displayError = document.getElementById('card-errors');
-	      if (event.error) {
-	        displayError.textContent = event.error.message;
-	      } else {
-	        displayError.textContent = '';
-	      }
-	    });
-
-	    // Handle form submission
-	    var form = document.getElementById('payment-form');
-	    console.log(form);
-	    form.addEventListener('submit', function(event) {
-	      event.preventDefault();
-			<?php
-			if (empty($conf->global->STRIPE_USE_3DSECURE))	// Ask credit card directly, no 3DS test
-			{
-			?>
-				/* Use token */
-				stripe.createToken(card).then(function(result) {
-			        if (result.error) {
-			          // Inform the user if there was an error
-			          var errorElement = document.getElementById('card-errors');
-			          errorElement.textContent = result.error.message;
-			        } else {
-			          // Send the token to your server
-			          stripeTokenHandler(result.token);
-			        }
-				});
-			<?php
-			}
-			else											// Ask credit card with 3DS test
-			{
-			?>
-				/* Use 3DS source */
-				stripe.createSource(card).then(function(result) {
-				    if (result.error) {
-				      // Inform the user if there was an error
-				      var errorElement = document.getElementById('card-errors');
-				      errorElement.textContent = result.error.message;
-				    } else {
-				      // Send the source to your server
-				      stripeSourceHandler(result.source);
-				    }
-				});
-			<?php
-			}
-			?>
-	    });
-
-
-		/* Insert the Token into the form so it gets submitted to the server */
-	    function stripeTokenHandler(token) {
-	      // Insert the token ID into the form so it gets submitted to the server
-	      var form = document.getElementById('payment-form');
-	      var hiddenInput = document.createElement('input');
-	      hiddenInput.setAttribute('type', 'hidden');
-	      hiddenInput.setAttribute('name', 'stripeToken');
-	      hiddenInput.setAttribute('value', token.id);
-	      form.appendChild(hiddenInput);
-
-	      // Submit the form
-	      jQuery('#buttontopay').hide();
-	      jQuery('#hourglasstopay').show();
-	      console.log("submit token");
-	      form.submit();
-	    }
-
-		/* Insert the Source into the form so it gets submitted to the server */
-		function stripeSourceHandler(source) {
-		  // Insert the source ID into the form so it gets submitted to the server
-		  var form = document.getElementById('payment-form');
-		  var hiddenInput = document.createElement('input');
-		  hiddenInput.setAttribute('type', 'hidden');
-		  hiddenInput.setAttribute('name', 'stripeSource');
-		  hiddenInput.setAttribute('value', source.id);
-		  form.appendChild(hiddenInput);
-
-		  // Submit the form
-	      jQuery('#buttontopay').hide();
-	      jQuery('#hourglasstopay').show();
-	      console.log("submit source");
-		  form.submit();
-		}
-
-	    <?php
-		}
-
-		print '</script>';
 	}
 }
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 290d07ab857..591a57f59f3 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -408,6 +408,7 @@ class Dolresource extends CommonObject
     public function delete($rowid, $notrigger = 0)
 	{
 		global $user,$langs,$conf;
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 		$error=0;
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 992de6850db..2560ccc7f04 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -331,7 +331,9 @@ if ($result)
     				print '</td>';
     			}
     			print '<td></td>';
-    		}
+    		}else {
+			    print '<td></td><td></td>';
+		    }
     		print '<td></td>';
     		print '</tr>'."\n";
         }