diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 347f5b8c4c2..97d94a42f00 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -495,7 +495,7 @@ if ($result) {
//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
@@ -703,13 +703,13 @@ if ($result) {
print '
'.$thirdpartystatic->getNomUrl(1, 'customer').' | ';
// Country
- print '';
$labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
- print $labelcountry;
+ print ' | ';
+ print dol_escape_htmltag($labelcountry);
print ' | ';
// VAT Num
- print ''.$objp->tva_intra.' | ';
+ print ''.dol_escape_htmltag($objp->tva_intra).' | ';
// Found accounts
print '';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 793ba453105..4fd16df2afe 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -482,7 +482,7 @@ if ($result) {
print ' | | ';
print ' | ';
print '';
- print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1);
+ print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1, null, 1);
//print '';
print ' | ';
print ' | ';
@@ -503,7 +503,7 @@ if ($result) {
//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
@@ -687,13 +687,13 @@ if ($result) {
print ''.$thirdpartystatic->getNomUrl(1, 'supplier').' | ';
// Country
- print '';
$labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
- print $labelcountry;
+ print ' | ';
+ print dol_escape_htmltag($labelcountry);
print ' | ';
// VAT Num
- print ''.$objp->tva_intra.' | ';
+ print ''.dol_escape_htmltag($objp->tva_intra).' | ';
// Found accounts
print '';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4fb48a8dbf1..c5b4266e814 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -957,7 +957,7 @@ class Form
if ($row['code_iso']) {
$labeltoshow .= ' ('.$row['code_iso'].')';
if (empty($hideflags)) {
- $tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
+ $tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"');
$labeltoshow = $tmpflag.' '.$labeltoshow;
}
}
@@ -978,7 +978,7 @@ class Form
// Make select dynamic
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
- $out .= ajax_combobox('select'.$htmlname);
+ $out .= ajax_combobox('select'.$htmlname, array(), 0, 0, 'resolve');
return $out;
}
|