diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 9c5ddf44229..428a1163df9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -371,7 +371,7 @@ if ($nolinesbefore) {
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') { // We must have same test in printObjectLines
$coldisplay++;
?>
-
">
+ ">
';
$coldisplay++;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index b07ea5042f0..c59949d5fb7 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -90,7 +90,7 @@ $coldisplay = 0;
$coldisplay++;
?>
-
+
@@ -196,7 +196,7 @@ $coldisplay++;
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') { // We must have same test in printObjectLines
$coldisplay++;
?>
-
+
-
+
info_bits & 2) != 2) {
print ' '.$langs->trans('AmountHT').' '.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).' ';
- print ''.$langs->trans('AmountVAT').' '.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).' ';
+ print '
'.$langs->trans('AmountVAT').' '.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
if (GETPOST('calculationrule')) {
$calculationrule = GETPOST('calculationrule', 'alpha');
} else {
@@ -3177,13 +3177,16 @@ if ($action == 'create') {
}
// Show link for "recalculate"
if ($object->getVentilExportCompta() == 0) {
- $s = $langs->trans("ReCalculate").' ';
+ $s = ''.$langs->trans("ReCalculate").' ';
$s .= 'id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").' ';
$s .= ' / ';
$s .= 'id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").' ';
- print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).' '.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'));
+ print '';
+ print ' ';
+ print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).' '.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'), '', 3, '', 0, 'recalculate');
+ print '
';
}
- print ' ';
+ print '
';
// Amount Local Taxes
//TODO: Place into a function to control showing by country or study better option
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 65b8bdcf542..4ce28a34cf2 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1555,6 +1555,11 @@ table[summary="list_of_modules"] .fa-cog {
.maxwidth1000 { max-width: 1000px; }
.maxwidth50imp { max-width: 50px !important; }
.maxwidth75imp { max-width: 75px !important; }
+
+.minwidth100onall { min-width: 100px !important; }
+.minwidth200onall { min-width: 200px !important; }
+.minwidth250onall { min-width: 250px !important; }
+
.minheight20 { min-height: 20px; }
.minheight30 { min-height: 30px; }
.minheight40 { min-height: 40px; }
@@ -1763,6 +1768,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
.maxwidth50onsmartphone { max-width: 40px; }
.maxwidth75onsmartphone { max-width: 50px; }
.maxwidth100onsmartphone { max-width: 70px; }
+ .maxwidth125onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 120px; }
.maxwidth150onsmartphoneimp { max-width: 120px !important; }
.maxwidth200onsmartphone { max-width: 200px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8fbe02beba9..15095b3b3e8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1643,6 +1643,11 @@ tr.nobottom td {
.maxwidth500 { max-width: 500px; }
.maxwidth50imp { max-width: 50px !important; }
.maxwidth75imp { max-width: 75px !important; }
+
+.minwidth100onall { min-width: 100px !important; }
+.minwidth200onall { min-width: 200px !important; }
+.minwidth250onall { min-width: 250px !important; }
+
.minheight20 { min-height: 20px; }
.minheight30 { min-height: 30px; }
.minheight40 { min-height: 40px; }
@@ -1835,6 +1840,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
.maxwidth50onsmartphone { max-width: 40px; }
.maxwidth75onsmartphone { max-width: 50px; }
.maxwidth100onsmartphone { max-width: 70px; }
+ .maxwidth125onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 120px; }
.maxwidth150onsmartphoneimp { max-width: 120px !important; }
.maxwidth200onsmartphone { max-width: 200px; }