diff --git a/.gitignore b/.gitignore
index c01d2a6a788..8c639a26540 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,4 +64,6 @@ doc/install.lock
 .idea/modules.xml
 .idea/workspace.xml
 .idea/inspectionProfiles/Project_Default.xml
-.idea/jsLinters/jshint.xml
\ No newline at end of file
+.idea/jsLinters/jshint.xml
+/composer.json
+/composer.lock
diff --git a/composer.json.disabled b/composer.json.disabled
index a38347122cd..d3a6ededce4 100644
--- a/composer.json.disabled
+++ b/composer.json.disabled
@@ -28,20 +28,20 @@
 		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "3.0",
 		"mobiledetect/mobiledetectlib" : "2.8.41",
-		"phpoffice/phpspreadsheet" : "1.12",
+		"phpoffice/phpspreadsheet" : ">=1.12",
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "6.3.2",
 		"nnnick/chartjs" : "^3.7.1",
 		"stripe/stripe-php" : "10.7.0",
 		"maximebf/debugbar" : "1.18.2",
-		"symfony/var-dumper" : "3.2"
+		"symfony/var-dumper" : ">=3.2"
 	},
 	"require-dev" : {
 		"php-parallel-lint/php-parallel-lint" : "^0",
 		"php-parallel-lint/php-console-highlighter" : "^0",
 		"phpunit/phpunit" : "^4",
 		"squizlabs/php_codesniffer" : "^2",
-		"phpunit/phpunit-selenium" : "^2"
+		"phpunit/phpunit-selenium" : "^2",
 		"rector/rector" : "^0.16.0"
 	},
 	"suggest" : {
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index d853ac19089..8c5dc04dc03 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required because used in classes that inherit
 
+// For the experimental feature using swiss QR invoice generated by composer lib sparin/swiss-qr-bill
 use Sprain\SwissQrBill;
 
 /**
@@ -105,7 +106,12 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 			return false;
 		}
 
-		require_once DOL_DOCUMENT_ROOT.'/includes/sprain/swiss-qr-bill/autoload.php';
+		// Load the autoload file generated by composer
+		if (file_exists(DOL_DOCUMENT_ROOT.'/includes/sprain/swiss-qr-bill/autoload.php')) {
+			require_once DOL_DOCUMENT_ROOT.'/includes/sprain/swiss-qr-bill/autoload.php';
+		} elseif (file_exists(DOL_DOCUMENT_ROOT.'/includes/autoload.php')) {
+			require_once DOL_DOCUMENT_ROOT.'/includes/autoload.php';
+		}
 
 		// Create a new instance of SwissQrBill, containing default headers with fixed values
 		$qrBill = SwissQrBill\QrBill::create();