';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1479717b411..041f6902040 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5612,30 +5612,39 @@ class Form
* @param int $active Active or not, -1 = all
* @param int $addempty 1=Add empty entry
* @param string $type Type ('direct-debit' or 'bank-transfer')
+ * @param int $nooutput 1=Return string, no output
* @return void
*/
- public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0, $type = '')
+ public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0, $type = '', $nooutput = 0)
{
// phpcs:enable
global $langs;
+
+ $out = '';
if ($htmlname != "none") {
- print '
';
+ $out .= $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active, '', 1);
+ $out .= '
';
+ $out .= '';
} else {
if ($selected) {
$this->load_cache_types_paiements();
- print $this->cache_types_paiements[$selected]['label'];
+ $out .= $this->cache_types_paiements[$selected]['label'];
} else {
- print " ";
+ $out .= " ";
}
}
+
+ if ($nooutput) {
+ return $out;
+ } else {
+ print $out;
+ }
}
/**
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index b6ec08da434..850ccd34c1c 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -193,6 +193,8 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
$script .= '
$("#'.$htmlnamejquery.'").val(ui.item.id).trigger("change"); // Select new value
+ // Complementary actions
+
// Disable an element
if (options.option_disabled) {
console.log("Make action option_disabled on #"+options.option_disabled+" with disabled="+ui.item.disabled)
@@ -224,7 +226,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
// Update an input
if (ui.item.update) {
- console.log("Make action update on each ui.item.update")
+ console.log("Make action update on each ui.item.update (if there is)")
// loop on each "update" fields
$.each(ui.item.update, function(key, value) {
console.log("Set value "+value+" into #"+key);
@@ -232,7 +234,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
});
}
if (ui.item.textarea) {
- console.log("Make action textarea on each ui.item.textarea")
+ console.log("Make action textarea on each ui.item.textarea (if there is)")
$.each(ui.item.textarea, function(key, value) {
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
CKEDITOR.instances[key].setData(value);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 54ee8157e13..42b5d34f880 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2919,7 +2919,7 @@ if ($action == 'create') {
print '
';
print '
';
- print '
';
+ print '';
// Type
print '| '.$langs->trans('Type').' | ';
@@ -3015,7 +3015,7 @@ if ($action == 'create') {
// Default terms of the settlement
$langs->load('bills');
print ' |
';
- print '';
+ print '| ';
print $langs->trans('PaymentConditions');
print ' | ';
if ($action != 'editconditions' && $form_permission) {
@@ -3044,7 +3044,7 @@ if ($action == 'create') {
// Mode of payment
$langs->load('bills');
print ' | ';
- print '';
+ print '| ';
print $langs->trans('PaymentMode');
print ' | ';
if ($action != 'editmode' && $form_permission2) {
@@ -3326,12 +3326,13 @@ if ($action == 'create') {
$paymentstatic->type_label = $objp->payment_type;
print ' ';
- print '| ';
+ print ' | ';
print $paymentstatic->getNomUrl(1);
print ' | ';
print ''.dol_print_date($db->jdate($objp->dp), 'day').' | ';
- print '';
- print $form->form_modes_reglement(null, $objp->paiement_type, 'none').' '.$objp->num_payment;
+ $s = $form->form_modes_reglement(null, $objp->paiement_type, 'none', '', 1, 0, '', 1).' '.$objp->num_payment;
+ print ' | ';
+ print $s;
print ' | ';
if (isModEnabled("banque")) {
$bankaccountstatic->id = $objp->baid;
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 639879f8e17..e0efb53915b 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -403,10 +403,10 @@ print '';
// Ref
print '| ';
-print '';
+print '';
print ' | ';
// Label
-print ' | ';
+print ' | ';
// Date start
print '';
@@ -435,13 +435,13 @@ print ' | ';
// Type
print '';
-print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, '', 1);
+print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth125', 1);
print ' | ';
// Bank account
if (isModEnabled("banque")) {
print '';
- $form->select_comptes($search_account, 'search_account', 0, '', 1);
+ print $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth125', 1);
print ' | ';
}
@@ -546,7 +546,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
// Label payment
- print "".dol_trunc($obj->label, 40)." | \n";
+ print ''.dol_escape_htmltag($obj->label)." | \n";
if (!$i) {
$totalarray['nbfield']++;
}
@@ -564,7 +564,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
// Employee
- print "".$userstatic->getNomUrl(1)." | \n";
+ print ''.$userstatic->getNomUrl(1)." | \n";
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index da006de3616..4b1ccc36bc0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3318,7 +3318,14 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
font-weight: bold !important;
}
+.divfmdirlia {
+ width: calc(100% - 100px);
+}
+a.fmdirlia {
+ white-space: break-spaces;
+ word-break: break-all;
+}
/* ============================================================================== */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 874e77985a2..687242d2451 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3303,6 +3303,11 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
font-weight: bold !important;
}
+a.fmdirlia {
+ white-space: break-spaces;
+ word-break: break-all;
+}
+
/* ============================================================================== */
/* Onglets */
|
|
|
|