diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 5a9d17e217d..51479f24399 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -129,10 +129,10 @@ else {
if ($user->rights->margins->creer)
{
if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
- echo '
% | ';
+ echo '% | ';
}
if (! empty($conf->global->DISPLAY_MARK_RATES)) {
- echo '% | ';
+ echo '% | ';
}
}
else
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 2a3844061a3..8afc2d4fe28 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -140,9 +140,9 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
$margin_rate = (isset($_POST["marginRate"])?$_POST["marginRate"]:(($line->pa_ht == 0)?'':price($line->marge_tx)));
// if credit note, dont allow to modify margin
if ($line->subprice < 0)
- echo ''.$margin_rate.'% | ';
+ echo ''.$margin_rate.'% | ';
else
- echo '% | ';
+ echo '% | ';
$coldisplay++;
}
elseif (! empty($conf->global->DISPLAY_MARK_RATES))
@@ -150,9 +150,9 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
$mark_rate = (isset($_POST["markRate"])?$_POST["markRate"]:price($line->marque_tx));
// if credit note, dont allow to modify margin
if ($line->subprice < 0)
- echo ''.$mark_rate.'% | ';
+ echo ''.$mark_rate.'% | ';
else
- echo '% | ';
+ echo '% | ';
$coldisplay++;
}
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 072fde58d20..5c641aaadbd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2690,6 +2690,10 @@ div.dolEventError h1, div.dolEventError h2 {
.sorting_desc_disabled { background: url('') no-repeat center right; }
+/* For jquery plugin combobox */
+.ui-corner-all { white-space: nowrap; }
+
+
/* ============================================================================== */
/* JMobile */
/* ============================================================================== */