From 6a658499e736432506d476ebb365bcbbbe4b536d Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 17 Dec 2022 21:16:03 +0100
Subject: [PATCH 1/4] Fix #23077 - Cannot update subscription note

---
 htdocs/adherents/subscription/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 5967d670856..37d0f2a9b5b 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -108,7 +108,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
 			$object->fk_type = $typeid;
-			$object->note = $note;
+			$object->note_public = $note;
 			$object->amount = $amount;
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 

From a08c468a5e7f247e80d0a145333704aa04c65e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ili=C3=A8s=20BENYAHIA?= <ilies@pop-os.localdomain>
Date: Tue, 20 Dec 2022 11:00:41 +0100
Subject: [PATCH 2/4] When no language selected, value is 0 so it enters in the
 condition filter_lang != '' anyway

---
 htdocs/core/modules/mailings/contacts1.modules.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index decbc81716b..38a82907124 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -408,7 +408,7 @@ class mailing_contacts1 extends MailingTargets
 		}
 
 		// Filter on language
-		if ($filter_lang != '') {
+		if (!empty($filter_lang)) {
 			$sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'";
 		}
 
@@ -439,7 +439,6 @@ class mailing_contacts1 extends MailingTargets
 
 		$sql .= " ORDER BY sp.email";
 		// print "wwwwwwx".$sql;
-
 		// Stocke destinataires dans cibles
 		$result = $this->db->query($sql);
 		if ($result) {

From a4d5a7ed1f14ef383515c5f206436464f2f672ca Mon Sep 17 00:00:00 2001
From: Mathieu <mathieu@inovea-conseil.com>
Date: Tue, 20 Dec 2022 12:36:50 +0100
Subject: [PATCH 3/4] FIX#23072

---
 htdocs/core/tpl/card_presend.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 2f6acb67ece..60e794ba7ca 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -70,7 +70,7 @@ if ($action == 'presend') {
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
 		// Load traductions files required by page
-		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions'));
+		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions', 'sendings'));
 	}
 
 	$topicmail = '';

From f6149903dc2d93bd3b9225414a1a3a275300b9c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Dec 2022 15:08:51 +0100
Subject: [PATCH 4/4] FIX bad selection of barcode numbering module

---
 htdocs/barcode/codeinit.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index f35547523c9..2293f7d9c27 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -64,14 +64,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);