forked from Wavyzz/dolibarr
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
This commit is contained in:
@@ -5685,7 +5685,7 @@ if ($action == 'create') {
|
||||
print '</div>';
|
||||
print '</div>';
|
||||
|
||||
print '<div class="clearboth"></div><br><br>';
|
||||
print '<div class="clearboth"></div><br>';
|
||||
|
||||
if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
|
||||
$blocname = 'contacts';
|
||||
|
||||
@@ -743,7 +743,7 @@ while ($i < $imaxinloop) {
|
||||
|
||||
// Payment type
|
||||
if (!empty($arrayfields['c.libelle']['checked'])) {
|
||||
print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
|
||||
print '<td class="tdoverflowmax100" title="'.dolPrintHTMLForAttribute($langs->trans("PaymentTypeShort".$objp->paiement_code)).'">'.dolPrintHTML($langs->trans("PaymentTypeShort".$objp->paiement_code)).'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ if (isModEnabled('category')) {
|
||||
if (GETPOSTISARRAY('search_status') || GETPOST('search_status_multiselect')) {
|
||||
$search_status = implode(',', GETPOST('search_status', 'array:intcomma'));
|
||||
} else {
|
||||
$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : '0,1');
|
||||
$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : (GETPOSTISSET('search_all') ? '' : '0,1'));
|
||||
}
|
||||
|
||||
$search_option = GETPOST('search_option', 'alpha');
|
||||
|
||||
Reference in New Issue
Block a user