From d6766af35d3e83c4d5132b8791b54c1801b2af02 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Tue, 21 Jan 2020 14:17:53 +0100
Subject: [PATCH 1/2] Fix dom and missing param

---
 htdocs/core/class/commonobject.class.php | 3 ++-
 htdocs/core/class/html.form.class.php    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bf39cc1e94d..d4735e4ba8d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5932,7 +5932,8 @@ abstract class CommonObject
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam);
+
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
             			list($class,$classfile)=explode(':', $param_list[0]);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3f9a6827e49..cb46be383db 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5044,11 +5044,11 @@ class Form
 		{
 			if ($societe_vendeuse->id == $mysoc->id)
 			{
-				$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
+				$return.= '<div class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
 			}
 			else
 			{
-				$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
+				$return.= '<div class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
 			}
 			return $return;
 		}

From 443e4e22230f4c069c58d5da73e5f70076aecfa3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Jan 2020 13:44:42 +0100
Subject: [PATCH 2/2] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cb46be383db..acbd15712e5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5044,11 +5044,11 @@ class Form
 		{
 			if ($societe_vendeuse->id == $mysoc->id)
 			{
-				$return.= '<div class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
+				$return.= '<span class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</span>';
 			}
 			else
 			{
-				$return.= '<div class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
+				$return.= '<span class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</span>';
 			}
 			return $return;
 		}