diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index a18259fefe4..284b80ea34a 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -108,8 +108,9 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			$object->dateh = dol_mktime(GETPOST('datesubhour', 'int'), GETPOST('datesubmin', 'int'), 0, GETPOST('datesubmonth', 'int'), GETPOST('datesubday', 'int'), GETPOST('datesubyear', 'int'));
 			$object->datef = dol_mktime(GETPOST('datesubendhour', 'int'), GETPOST('datesubendmin', 'int'), 0, GETPOST('datesubendmonth', 'int'), GETPOST('datesubendday', 'int'), GETPOST('datesubendyear', 'int'));
 			$object->fk_type = $typeid;
-			$object->note = $note;
+			$object->note_public = $note;
 			$object->note_private = $note;
+
 			$object->amount = $amount;
 
 			$result = $object->update($user);
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 48ef2f8a2cd..3883471ce4f 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -65,14 +65,16 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
 				if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
-					try {
-						dol_include_once($dirroot.$file.'.php');
-					} catch (Exception $e) {
-						dol_syslog($e->getMessage(), LOG_ERR);
-					}
+					if ($file == $conf->global->BARCODE_PRODUCT_ADDON_NUM) {
+						try {
+							dol_include_once($dirroot.$file.'.php');
+						} catch (Exception $e) {
+							dol_syslog($e->getMessage(), LOG_ERR);
+						}
 
-					$modBarCodeProduct = new $file();
-					break;
+						$modBarCodeProduct = new $file();
+						break;
+					}
 				}
 			}
 			closedir($handle);