From 722b1de2b7fb9914e23599929a686a97ff7e53da Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 25 Feb 2022 15:10:10 +0000
Subject: [PATCH 1/3] Fixing style errors.

---
 htdocs/accountancy/bookkeeping/card.php         | 4 ++--
 htdocs/core/class/html.formaccounting.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ce284598820..5b645796a32 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -663,7 +663,7 @@ if ($action == 'create') {
 						// Also, it is not possible to use a value that is not in the list.
 						// Also, the label is not automatically filled when a value is selected.
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1,'maxwidth250','','subledger_label');
+							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
 						} else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 						}
@@ -746,7 +746,7 @@ if ($action == 'create') {
 						// Also, it is not possible to use a value that is not in the list.
 						// Also, the label is not automatically filled when a value is selected.
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-							print $formaccounting->select_auxaccount('', 'subledger_account', 1,'maxwidth250','','subledger_label');
+							print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
 						} else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
 						}
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 44a52ae7721..3dc81333e7f 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -518,7 +518,7 @@ class FormAccounting extends Form
 
 			</script>';
 		}
-		
+
 		return $out;
 	}
 

From 50602b1fbe5ef6ebec127313037347c2edf9b4a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Feb 2022 21:53:05 +0100
Subject: [PATCH 2/3] Update html.formaccounting.class.php

---
 htdocs/core/class/html.formaccounting.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 3dc81333e7f..f658cb7c39f 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -506,7 +506,7 @@ class FormAccounting extends Form
 		// Build select
 		$out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty): 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 		//automatic filling if we give the name of the subledger_label input
-		if (!empty($labelhtmlname)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			$out .= '<script>
 				jQuery(document).ready(() => {
 					$("#'.$htmlname.'").on("select2:select", function(e) {

From 8e1fd877f2d457a11d22d4da86fe527154b4934e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Feb 2022 21:55:30 +0100
Subject: [PATCH 3/3] Update html.formaccounting.class.php

---
 htdocs/core/class/html.formaccounting.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index f658cb7c39f..9234fa057bd 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -506,13 +506,13 @@ class FormAccounting extends Form
 		// Build select
 		$out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty): 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 		//automatic filling if we give the name of the subledger_label input
-		if (!empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax) && !empty($labelhtmlname)) {
 			$out .= '<script>
 				jQuery(document).ready(() => {
 					$("#'.$htmlname.'").on("select2:select", function(e) {
 						var regExp = /\(([^)]+)\)/;
 						const match = regExp.exec(e.params.data.text);
-						$(\'input[name="'.$labelhtmlname.'"]\').val(match[1]);
+						$(\'input[name="'.dol_escape_js($labelhtmlname).'"]\').val(match[1]);
 					});
 				});