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

This commit is contained in:
Laurent Destailleur 2024-04-09 20:35:07 +02:00
commit 690d156e5b
3 changed files with 22 additions and 2 deletions

View file

@ -304,6 +304,15 @@ $dolibarr_main_prod='1';
//
$dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump';
// dolibarr_main_disabled_modules
// ==================================
// To restrict the activation and use of certain potentially security-sensitive modules.
// Default value: array('dav')
// Examples:
// $dolibarr_main_disabled_modules = array('dav');
//
// $dolibarr_main_disabled_modules = array('dav');
// dolibarr_main_restrict_ip
// =========================
// To restrict access to backoffice to some ip addresses only. Use a comma to separate values.

View file

@ -1755,7 +1755,7 @@ if ($action == 'create') {
// Payment mode
print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
print img_picto('', 'bank', 'class="pictofixedwidth"');
$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOSTINT('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
print '</td></tr>';
// Planned delivery date

View file

@ -1149,6 +1149,11 @@ foreach ($listofreferent as $key => $value) {
print '<td style="width: 24px"></td>';
// Ref
print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '').'>'.$langs->trans("Ref").'</td>';
// Product and qty on stock_movement
if ('MouvementStock' == $classname) {
print '<td style="width: 200px">'.$langs->trans("Product").'</td>';
print '<td style="width: 50px">'.$langs->trans("Qty").'</td>';
}
// Date
print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '').' class="center">';
if (in_array($tablename, array('projet_task'))) {
@ -1335,7 +1340,13 @@ foreach ($listofreferent as $key => $value) {
}
}
print "</td>\n";
// Product and qty on stock movement
if ('MouvementStock' == $classname) {
$mvsProd = new Product($element->db);
$mvsProd->fetch($element->product_id);
print '<td>'.$mvsProd->getNomUrl(1).'</td>';
print '<td>'.$element->qty.'</td>';
}
// Date or TimeSpent
$date = '';
$total_time_by_line = null;