This commit is contained in:
Laurent Destailleur 2024-10-25 16:37:24 +02:00
parent b2d7a13519
commit 1739acf715
8 changed files with 58 additions and 58 deletions

View File

@ -200,26 +200,26 @@ foreach ($fulltree as $key => $val) {
$entry = '<table class="nobordernopadding centpercent">';
$entry .= '<tr>';
$entry .= '<td>';
$entry .= '<th>';
$entry .= '<span class="noborderoncategories" '.$color.'>'.$li.'</span>';
$entry .= '</td>';
$entry .= '</th>';
// Add column counter
$entry .= $counter;
$entry .= '<td class="right" width="20px;">';
$entry .= '<th class="right" width="20px;">';
$entry .= '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.urlencode($type).$moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.urlencode($type)).'">'.img_view().'</a>';
$entry .= '</td>';
$entry .= '<td class="right" width="20px;">';
$entry .= '</th>';
$entry .= '<th class="right" width="20px;">';
if ($user->hasRight('categorie', 'creer')) {
$entry .= '<a class="editfielda" href="' . DOL_URL_ROOT . '/categories/edit.php?id=' . $val['id'] . '&type=' . urlencode($type) . $moreparam . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type)) . '">' . img_edit() . '</a>';
}
$entry .= '</td>';
$entry .= '<td class="right" width="20px;">';
$entry .= '</th>';
$entry .= '<th class="right" width="20px;">';
if ($user->hasRight('categorie', 'supprimer')) {
$entry .= '<a class="deletefilelink" href="' . DOL_URL_ROOT . '/categories/viewcat.php?action=delete&token=' . newToken() . '&id=' . $val['id'] . '&type=' . urlencode($type) . $moreparam . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type) . $moreparam) . '&backtolist=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type) . $moreparam) . '">' . img_delete() . '</a>';
}
$entry .= '</td>';
$entry .= '</th>';
$entry .= '</tr>';
$entry .= '</table>';
@ -238,7 +238,7 @@ foreach ($data as $record) {
}
print '<table class="liste nohover centpercent">';
print '<table class="liste nohover centpercent noborder">';
print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td class="right">';
if ($morethan1level && !empty($conf->use_javascript_ajax)) {
print '<div id="iddivjstreecontrol">';

View File

@ -475,7 +475,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

View File

@ -154,9 +154,7 @@ if ($socid > 0) {
$object = new Societe($db);
$object->fetch($socid);
/*
* Affichage onglets
*/
// Show tabs
$head = societe_prepare_head($object);
@ -169,7 +167,7 @@ if ($socid > 0) {
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield" width="100%">';
print '<table class="border tableforfield centpercent">';
// Type Prospect/Customer/Supplier
print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
@ -298,67 +296,67 @@ if ($socid > 0) {
$i = 0;
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print "<table class=\"noborder\" width=\"100%\">";
print '<table class="noborder centpercent">';
// Fields title search
// --------------------------------------------------------------------
print '<tr class="liste_titre_filter">';
print '<tr class="liste_titre liste_titre_filter">';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '<td class="liste_titre center maxwidthsearch">';
print '<th class="liste_titre center maxwidthsearch">';
$searchpicto = $form->showFilterButtons('left');
print $searchpicto;
print '</td>';
print '</th>';
}
// invoice ref
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
// invoice date
print '<td class="liste_titre center">';
print '<th class="liste_titre center">';
print '<div class="nowrapfordate">';
print $form->selectDate($search_invoice_date_start ?: -1, 'search_invoice_date_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '</div>';
print '<div class="nowrapfordate">';
print $form->selectDate($search_invoice_date_end ?: -1, 'search_invoice_date_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '</div>';
print '</td>';
print '</th>';
// selling price
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
// buying price
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
// margin
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
// margin rate
if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
}
// mark rate
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
}
// status
print '<td class="liste_titre">';
print '</td>';
print '<th class="liste_titre">';
print '</th>';
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '<td class="liste_titre center maxwidthsearch">';
print '<th class="liste_titre center maxwidthsearch">';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
print '</td>';
print '</th>';
}
print '</tr>'."\n";

View File

@ -595,7 +595,7 @@ $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search
// --------------------------------------------------------------------

View File

@ -612,7 +612,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

View File

@ -451,12 +451,12 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search
// --------------------------------------------------------------------
print '<tr class="liste_titre">';
print '<tr class="liste_titre_filter">';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '<td class="liste_titre maxwidthsearch">';

View File

@ -480,34 +480,34 @@ if ($sql_select) {
print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
print '<div class="div-table-responsive-no-min">';
print '<table class="liste centpercent">'."\n";
print '<table class="liste centpercent noborder">'."\n";
// Filters
print '<tr class="liste_titre">';
print '<td class="liste_titre left">';
print '<th class="liste_titre">';
print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
print '</td>';
print '<td class="liste_titre nowrap center valignmiddle">'; // date
print '</th>';
print '<th class="liste_titre nowrap center valignmiddle">'; // date
print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
print $formother->selectyear($year ? $year : -1, 'year', 1, 20, 1, 0, 0, '', 'valignmiddle maxwidth75imp marginleftonly');
print '</td>';
print '</th>';
// delivery planned date
if ($type_element == 'order' || $type_element == 'supplier_order' || $type_element == 'shipment') {
print '<td class="liste_titre center"></td>';
}
print '<td class="liste_titre center">';
print '</td>';
print '<td class="liste_titre left">';
print '<th class="liste_titre center">';
print '</th>';
print '<th class="liste_titre left">';
print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
print '</td>';
print '<td class="liste_titre center">';
print '</td>';
print '<td class="liste_titre center">';
print '</td>';
print '<td class="liste_titre maxwidthsearch">';
print '</th>';
print '<th class="liste_titre center">';
print '</th>';
print '<th class="liste_titre center">';
print '</th>';
print '<th class="liste_titre maxwidthsearch">';
$searchpicto = $form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
print '</th>';
print '</tr>';
// Titles with sort buttons
@ -749,7 +749,7 @@ if ($sql_select) {
} elseif (empty($type_element) || $type_element == -1) {
print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', (!empty($num) ? $num : 0), '', '');
print '<table class="liste centpercent">'."\n";
print '<table class="liste centpercent noborder">'."\n";
// Titles with sort buttons
print '<tr class="liste_titre">';
print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');

View File

@ -4274,11 +4274,13 @@ table.liste {
border-bottom-right-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:first-child,
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:first-child {
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:first-child,
table.tagtable.liste:not(.paymenttable, .margintable) tr.liste_titre:first-child td:first-child {
border-top-left-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:last-child,
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child {
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child,
table.tagtable.liste:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child {
border-top-right-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr:last-child td:first-child,