lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into fix/warnings

Browse Source
This commit is contained in:
Frédéric FRANCE 2022-10-13 20:28:00 +02:00
commit c001fd9ba4
7 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/ajax/ajaxdirtree.php
View File

@ -412,15 +412,15 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) { if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) {
$collapsedorexpanded = 'expanded'; $collapsedorexpanded = 'expanded';
} }
print '<li class="directory '.$collapsedorexpanded.'">'; // collapsed is opposite if expanded print '<li class="directory '.$collapsedorexpanded.' lidirecm">'; // collapsed is opposite if expanded
print "<a class=\"fmdirlia jqft ecmjqft\" href=\""; print '<div class="divfmdirlia inline-block"><a class="fmdirlia jqft ecmjqft" href="';
print "#"; print "#";
print "\" rel=\"".dol_escape_htmltag($val['fullrelativename'].'/')."\" id=\"fmdirlia_id_".$val['id']."\""; print "\" rel=\"".dol_escape_htmltag($val['fullrelativename'].'/')."\" id=\"fmdirlia_id_".$val['id']."\"";
print " onClick=\"loadandshowpreview('".dol_escape_js($val['fullrelativename'])."',".$val['id'].")"; print " onClick=\"loadandshowpreview('".dol_escape_js($val['fullrelativename'])."',".$val['id'].")";
print "\">"; print "\">";
print dol_escape_htmltag($file); print dol_escape_htmltag($file);
print "</a>"; print "</a></div>";
print '<div class="ecmjqft">'; print '<div class="ecmjqft">';

29
htdocs/core/class/html.form.class.php
View File

@ -5612,30 +5612,39 @@ class Form
* @param int $active Active or not, -1 = all * @param int $active Active or not, -1 = all
* @param int $addempty 1=Add empty entry * @param int $addempty 1=Add empty entry
* @param string $type Type ('direct-debit' or 'bank-transfer') * @param string $type Type ('direct-debit' or 'bank-transfer')
* @param int $nooutput 1=Return string, no output
* @return void * @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 // phpcs:enable
global $langs; global $langs;
$out = '';
if ($htmlname != "none") { if ($htmlname != "none") {
print '<form method="POST" action="'.$page.'">'; $out .= '<form method="POST" action="'.$page.'">';
print '<input type="hidden" name="action" value="setmode">'; $out .= '<input type="hidden" name="action" value="setmode">';
print '<input type="hidden" name="token" value="'.newToken().'">'; $out .= '<input type="hidden" name="token" value="'.newToken().'">';
if ($type) { if ($type) {
print '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">'; $out .= '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">';
} }
print $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active, '', 1); $out .= $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active, '', 1);
print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">'; $out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
print '</form>'; $out .= '</form>';
} else { } else {
if ($selected) { if ($selected) {
$this->load_cache_types_paiements(); $this->load_cache_types_paiements();
print $this->cache_types_paiements[$selected]['label']; $out .= $this->cache_types_paiements[$selected]['label'];
} else { } else {
print "&nbsp;"; $out .= "&nbsp;";
} }
} }
if ($nooutput) {
return $out;
} else {
print $out;
}
} }
/** /**

6
htdocs/core/lib/ajax.lib.php
View File

@ -193,6 +193,8 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
$script .= ' $script .= '
$("#'.$htmlnamejquery.'").val(ui.item.id).trigger("change"); // Select new value $("#'.$htmlnamejquery.'").val(ui.item.id).trigger("change"); // Select new value
// Complementary actions
// Disable an element // Disable an element
if (options.option_disabled) { if (options.option_disabled) {
console.log("Make action option_disabled on #"+options.option_disabled+" with disabled="+ui.item.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 // Update an input
if (ui.item.update) { 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 // loop on each "update" fields
$.each(ui.item.update, function(key, value) { $.each(ui.item.update, function(key, value) {
console.log("Set value "+value+" into #"+key); console.log("Set value "+value+" into #"+key);
@ -232,7 +234,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
}); });
} }
if (ui.item.textarea) { 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) { $.each(ui.item.textarea, function(key, value) {
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") { if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
CKEDITOR.instances[key].setData(value); CKEDITOR.instances[key].setData(value);

13
htdocs/fourn/facture/card.php
View File

@ -2919,7 +2919,7 @@ if ($action == 'create') {
print '<div class="fichehalfleft">'; print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield" width="100%">'; print '<table class="border tableforfield centpercent">';
// Type // Type
print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
@ -3015,7 +3015,7 @@ if ($action == 'create') {
// Default terms of the settlement // Default terms of the settlement
$langs->load('bills'); $langs->load('bills');
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
print $langs->trans('PaymentConditions'); print $langs->trans('PaymentConditions');
print '<td>'; print '<td>';
if ($action != 'editconditions' && $form_permission) { if ($action != 'editconditions' && $form_permission) {
@ -3044,7 +3044,7 @@ if ($action == 'create') {
// Mode of payment // Mode of payment
$langs->load('bills'); $langs->load('bills');
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
print $langs->trans('PaymentMode'); print $langs->trans('PaymentMode');
print '</td>'; print '</td>';
if ($action != 'editmode' && $form_permission2) { if ($action != 'editmode' && $form_permission2) {
@ -3326,12 +3326,13 @@ if ($action == 'create') {
$paymentstatic->type_label = $objp->payment_type; $paymentstatic->type_label = $objp->payment_type;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'; print '<td class="nowrap">';
print $paymentstatic->getNomUrl(1); print $paymentstatic->getNomUrl(1);
print '</td>'; print '</td>';
print '<td>'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; print '<td>'.dol_print_date($db->jdate($objp->dp), 'day').'</td>';
print '<td>'; $s = $form->form_modes_reglement(null, $objp->paiement_type, 'none', '', 1, 0, '', 1).' '.$objp->num_payment;
print $form->form_modes_reglement(null, $objp->paiement_type, 'none').' '.$objp->num_payment; print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($s).'">';
print $s;
print '</td>'; print '</td>';
if (isModEnabled("banque")) { if (isModEnabled("banque")) {
$bankaccountstatic->id = $objp->baid; $bankaccountstatic->id = $objp->baid;

12
htdocs/salaries/list.php
View File

@ -403,10 +403,10 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
print '<tr class="liste_titre_filter">'; print '<tr class="liste_titre_filter">';
// Ref // Ref
print '<td class="liste_titre left">'; print '<td class="liste_titre left">';
print '<input class="flat" type="text" size="3" name="search_ref" value="'.$db->escape($search_ref).'">'; print '<input class="flat width50" type="text" name="search_ref" value="'.$db->escape($search_ref).'">';
print '</td>'; print '</td>';
// Label // Label
print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$db->escape($search_label).'"></td>'; print '<td class="liste_titre"><input type="text" class="flat width100" name="search_label" value="'.$db->escape($search_label).'"></td>';
// Date start // Date start
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
@ -435,13 +435,13 @@ print '</td>';
// Type // Type
print '<td class="liste_titre left">'; print '<td class="liste_titre left">';
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 '</td>'; print '</td>';
// Bank account // Bank account
if (isModEnabled("banque")) { if (isModEnabled("banque")) {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
$form->select_comptes($search_account, 'search_account', 0, '', 1); print $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth125', 1);
print '</td>'; print '</td>';
} }
@ -546,7 +546,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
} }
// Label payment // Label payment
print "<td>".dol_trunc($obj->label, 40)."</td>\n"; print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->label).'">'.dol_escape_htmltag($obj->label)."</td>\n";
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
@ -564,7 +564,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
} }
// Employee // Employee
print "<td>".$userstatic->getNomUrl(1)."</td>\n"; print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(1)."</td>\n";
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }

7
htdocs/theme/eldy/global.inc.php
View File

@ -3318,7 +3318,14 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
font-weight: bold !important; font-weight: bold !important;
} }
.divfmdirlia {
width: calc(100% - 100px);
}
a.fmdirlia {
white-space: break-spaces;
word-break: break-all;
}
/* ============================================================================== */ /* ============================================================================== */

5
htdocs/theme/md/style.css.php
View File

@ -3303,6 +3303,11 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
font-weight: bold !important; font-weight: bold !important;
} }
a.fmdirlia {
white-space: break-spaces;
word-break: break-all;
}
/* ============================================================================== */ /* ============================================================================== */
/* Onglets */ /* Onglets */