diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 4d8c4f8fadd..525e588810d 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -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. diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index f56b77ae139..1593f25e08c 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1755,7 +1755,7 @@ if ($action == 'create') { // Payment mode print ''.$langs->trans('PaymentMode').''; 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 ''; // Planned delivery date diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 8c1d12569e4..2ef4256a946 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -1149,6 +1149,11 @@ foreach ($listofreferent as $key => $value) { print ''; // Ref print ''.$langs->trans("Ref").''; + // Product and qty on stock_movement + if ('MouvementStock' == $classname) { + print ''.$langs->trans("Product").''; + print ''.$langs->trans("Qty").''; + } // Date print ''; if (in_array($tablename, array('projet_task'))) { @@ -1335,7 +1340,13 @@ foreach ($listofreferent as $key => $value) { } } print "\n"; - + // Product and qty on stock movement + if ('MouvementStock' == $classname) { + $mvsProd = new Product($element->db); + $mvsProd->fetch($element->product_id); + print ''.$mvsProd->getNomUrl(1).''; + print ''.$element->qty.''; + } // Date or TimeSpent $date = ''; $total_time_by_line = null;