diff --git a/ChangeLog b/ChangeLog index 0f7bee20186..2d07bcb5114 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ For users: - Fix: Iban was used instead of Bic into SEPA file. - Fix: Must unaccent strings into SEPA file. - Fix: Extrafield feature select from table should try to translate multiple column when not needed +- New: Direct invoice creation from predefined invoice ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 1929a8a3721..dc794a394c4 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -507,9 +507,14 @@ else */ print '
'; + if ($object->statut == 0 && $user->rights->facture->creer) + { + echo '
'.$langs->trans("CreateBill").'
'; + } + if ($object->statut == 0 && $user->rights->facture->supprimer) { - print ''.$langs->trans('Delete').''; + print '
'.$langs->trans('Delete').'
'; } print '
'; @@ -569,23 +574,18 @@ else print ''.price($objp->total).''."\n"; - if (! $objp->paye) + echo ''; + + if ($user->rights->facture->creer) { - if ($objp->fk_statut == 0) - { - print ''.$langs->trans("Draft").''; - } - else - { - print ''.$langs->trans("Validated").''; - } + echo ''; + echo $langs->trans("CreateBill"),''; } else { - print ' '; + echo " "; } - - print "\n"; + echo "\n"; $i++; } }