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

This commit is contained in:
Laurent Destailleur 2024-09-11 14:03:35 +02:00
commit 26a199a877
5 changed files with 10 additions and 10 deletions

View file

@ -4673,7 +4673,7 @@ if ($action == 'create') {
print '<table class="border centpercent tableforfield">';
// Type
print '<tr><td class="titlefield fieldname_type">'.$langs->trans('Type').'</td><td class="valuefield fieldname_type">';
print '<tr><td class="fieldname_type">'.$langs->trans('Type').'</td><td class="valuefield fieldname_type">';
print $object->getLibType(2);
if ($object->subtype > 0) {
print ' '.$object->getSubtypeLabel('facture');

View file

@ -130,7 +130,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
}
print '>';
$extrafields_collapse_num_old = $extrafields_collapse_num;
print '<td class="titlefield">';
print '<td>';
print '<table class="nobordernopadding centpercent">';
print '<tr>';

View file

@ -2657,7 +2657,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if (isModEnabled('accounting')) {
// Accountancy_code_sell
print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
print '<td>';
print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
print '</td></tr>';
@ -2669,7 +2669,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '</td></tr>';
} else { // For external software
// Accountancy_code_sell
print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
print '</td></tr>';
@ -3003,7 +3003,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
// Customer
if ($object->prospect || $object->client || getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT')) {
print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
print '<tr><td class="titlefieldmiddle">'.$langs->trans("CustomersCategoriesShort").'</td>';
print '<td>';
print $form->showCategories($object->id, Categorie::TYPE_CUSTOMER, 1);
print "</td></tr>";
@ -3011,7 +3011,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Supplier
if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
print '<tr><td class="titlefieldmiddle">'.$langs->trans("SuppliersCategoriesShort").'</td>';
print '<td>';
print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
print "</td></tr>";
@ -3020,7 +3020,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Third-Party Type
print '<tr><td>';
print '<tr><td class="titlefieldmiddle">';
print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ThirdPartyType').'</td>';
if ($action != 'editthirdpartytype' && $user->hasRight('societe', 'creer')) {
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
@ -3037,7 +3037,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Legal
print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td>'.dolPrintHTML($object->forme_juridique).'</td></tr>';
// Capital
print '<tr><td>'.$langs->trans('Capital').'</td><td>';

View file

@ -34,7 +34,7 @@ if ($action != 'editsalesrepresentatives' && $user->hasRight('societe', 'creer')
print '</td>';
}
print '</tr></table>';
print '</td><td colspan="3">';
print '</td><td>';
if ($action == 'editsalesrepresentatives') {
print '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';

View file

@ -4251,7 +4251,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor
padding: 6px 10px 6px 12px; /* t r b l */
}
table.tableforfield td, .tagtr.table-border-row .tagtd {
padding: 2px 6px 2px 10px; /* t r b l */
padding: 2px 4px 2px 10px; /* t r b l */
}
table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
padding: 6px 10px 6px 12px; /* t r b l */