diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 7b0d7fcf869..8a2b5b150e4 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4118,17 +4118,13 @@ if ($action == 'create') print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) + if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) print ''; print '
'; print $langs->trans('DateInvoice'); print 'id.'">'.img_edit($langs->trans('SetDate'), 1).'
'; print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE) { - if ($action == 'editinvoicedate') { - $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate'); - } else { - print dol_print_date($object->date, 'day'); - } + if ($action == 'editinvoicedate') { + $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate'); } else { print dol_print_date($object->date, 'day'); } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 026aeae32d9..f6bb28edd56 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -729,7 +729,7 @@ foreach ($listofreferent as $key => $value) || !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now() || empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee ) { - $total_ht_by_line = -$loanSchedule->amount_capital; + $total_ht_by_line -= $loanSchedule->amount_capital; } } }