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

Merge remote-tracking branch 'upstream/develop' into use_ismodenabled

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-04-18 23:40:57 +02:00
commit 1d634557ce
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/commande/list.php
View File

@ -2045,7 +2045,9 @@ if ($resql) {
// Ref customer // Ref customer
if (!empty($arrayfields['c.ref_client']['checked'])) { if (!empty($arrayfields['c.ref_client']['checked'])) {
print '<td class="nowrap tdoverflowmax200">'.$obj->ref_client.'</td>'; print '<td class="nowrap tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_client).'">';
print dol_escape_htmltag($obj->ref_client);
print '</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
@ -2350,7 +2352,7 @@ if ($resql) {
// Author // Author
if (!empty($arrayfields['u.login']['checked'])) { if (!empty($arrayfields['u.login']['checked'])) {
print '<td class="tdoverflowmax200">'; print '<td class="tdoverflowmax150">';
if ($userstatic->id) { if ($userstatic->id) {
print $userstatic->getNomUrl(-1); print $userstatic->getNomUrl(-1);
} else { } else {

4
htdocs/mrp/class/api_mos.class.php
View File

@ -345,10 +345,10 @@ class Mos extends DolibarrApi
} }
if (empty($labelmovement)) { if (empty($labelmovement)) {
throw new RestException(500, "Field inventorylabel not prodivded"); throw new RestException(500, "Field inventorylabel not provided");
} }
if (empty($codemovement)) { if (empty($codemovement)) {
throw new RestException(500, "Field inventorycode not prodivded"); throw new RestException(500, "Field inventorycode not provided");
} }
// Code for consume and produce... // Code for consume and produce...

8
htdocs/societe/list.php
View File

@ -1355,15 +1355,15 @@ $totalarray['nbfield'] = 0;
// -------------------------------------------------------------------- // --------------------------------------------------------------------
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); print_liste_field_titre(($mode != 'kanban' ? $selectedfields : ''), $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
if (!empty($arrayfields['s.rowid']['checked'])) { if (!empty($arrayfields['s.rowid']['checked'])) {
print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, 'actioncolumn '); print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, '');
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
if (!empty($arrayfields['s.nom']['checked'])) { if (!empty($arrayfields['s.nom']['checked'])) {
print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, ' data-key="ref"', $sortfield, $sortorder, 'actioncolumn '); print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, ' data-key="ref"', $sortfield, $sortorder, ' ');
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
if (!empty($arrayfields['s.name_alias']['checked'])) { if (!empty($arrayfields['s.name_alias']['checked'])) {
@ -1510,7 +1510,7 @@ if (!empty($arrayfields['s.import_key']['checked'])) {
} }
// Action column // Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); print_liste_field_titre(($mode != 'kanban' ? $selectedfields : ''), $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
$totalarray['nbfield']++; // For the column action $totalarray['nbfield']++; // For the column action
} }
print '</tr>'."\n"; print '</tr>'."\n";