diff --git a/ChangeLog b/ChangeLog index d2d26bf6fc8..2b8a3f8da52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,9 +74,9 @@ For users: - Fix: [ bug #1506, #1507 ] ECM trigger error problem - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. +- New: Direct invoice creation from predefined invoice - New: Add dunning into accountancy report - -New experimental module: +For users, new experimental module: - New: Module Accounting Expert to manage accountancy Special Thanks to developpers : Olivier Geffroy @@ -125,7 +125,8 @@ Dolibarr better: - Table llx_c_pays were renamed into llx_c_country. - Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead. - +- A lot of pages called fiche.php were renamed into card.php +- A lot of pages called liste.php were renamed into list.php ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 7ae2e6aeb96..c7514e96fbb 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -522,9 +522,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 '
'; @@ -584,23 +589,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++; } }