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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop
This commit is contained in:
Laurent Destailleur 2022-10-13 18:33:24 +02:00
commit 03e1af0aa3
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 $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 '<form method="POST" action="'.$page.'">';
print '<input type="hidden" name="action" value="setmode">';
print '<input type="hidden" name="token" value="'.newToken().'">';
$out .= '<form method="POST" action="'.$page.'">';
$out .= '<input type="hidden" name="action" value="setmode">';
$out .= '<input type="hidden" name="token" value="'.newToken().'">';
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);
print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
print '</form>';
$out .= $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active, '', 1);
$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
$out .= '</form>';
} else {
if ($selected) {
$this->load_cache_types_paiements();
print $this->cache_types_paiements[$selected]['label'];
$out .= $this->cache_types_paiements[$selected]['label'];
} else {
print "&nbsp;";
$out .= "&nbsp;";
}
}
if ($nooutput) {
return $out;
} else {
print $out;
}
}
/**

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

@ -3330,8 +3330,8 @@ if ($action == 'create') {
print $paymentstatic->getNomUrl(1);
print '</td>';
print '<td>'.dol_print_date($db->jdate($objp->dp), 'day').'</td>';
$s = $form->form_modes_reglement(null, $objp->paiement_type, 'none').' '.$objp->num_payment;
print '<td class="tdoverflow125" title="'.dol_escape_htmltag($s).'">';
$s = $form->form_modes_reglement(null, $objp->paiement_type, 'none', '', 1, 0, '', 1).' '.$objp->num_payment;
print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($s).'">';
print $s;
print '</td>';
if (isModEnabled("banque")) {

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">';
// Ref
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>';
// 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
print '<td class="liste_titre center">';
@ -435,13 +435,13 @@ print '</td>';
// Type
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>';
// Bank account
if (isModEnabled("banque")) {
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>';
}
@ -546,7 +546,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
// 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) {
$totalarray['nbfield']++;
}
@ -564,7 +564,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
// Employee
print "<td>".$userstatic->getNomUrl(1)."</td>\n";
print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(1)."</td>\n";
if (!$i) {
$totalarray['nbfield']++;
}