diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 95f97de400ed92abc3d2490002c19ca34622b0b3..d807170f0b562cdba2775c80638cfa3da0f040bb 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -47,11 +47,12 @@ $eventstolog=array( array('id'=>'ORDER_SENTBYMAIL', 'test'=>$conf->commande->enabled), array('id'=>'BILL_VALIDATE', 'test'=>$conf->facture->enabled), array('id'=>'BILL_PAYED', 'test'=>$conf->facture->enabled), - array('id'=>'BILL_CANCELED', 'test'=>$conf->facture->enabled), + array('id'=>'BILL_CANCEL', 'test'=>$conf->facture->enabled), array('id'=>'BILL_SENTBYMAIL', 'test'=>$conf->facture->enabled), array('id'=>'FICHEINTER_VALIDATE', 'test'=>$conf->ficheinter->enabled), array('id'=>'ORDER_SUPPLIER_VALIDATE','test'=>$conf->fournisseur->enabled), array('id'=>'BILL_SUPPLIER_VALIDATE', 'test'=>$conf->fournisseur->enabled), + array('id'=>'BILL_SUPPLIER_PAYED', 'test'=>$conf->fournisseur->enabled), // array('id'=>'PAYMENT_CUSTOMER_CREATE','test'=>$conf->facture->enabled), // array('id'=>'PAYMENT_SUPPLIER_CREATE','test'=>$conf->fournisseur->enabled), array('id'=>'MEMBER_VALIDATE', 'test'=>$conf->adherent->enabled), diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index a350e0d97d73ecfb3c971fcbd8fddb9309c6f2cf..8b7724746940f6f525b86772f62c43c9f11d3f88 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -61,7 +61,7 @@ $eventstolog=array( array('id'=>'ORDER_SENTBYMAIL', 'test'=>$conf->commande->enabled), array('id'=>'BILL_VALIDATE', 'test'=>$conf->facture->enabled), array('id'=>'BILL_PAYED', 'test'=>$conf->facture->enabled), - array('id'=>'BILL_CANCELED', 'test'=>$conf->facture->enabled), + array('id'=>'BILL_CANCEL', 'test'=>$conf->facture->enabled), array('id'=>'BILL_SENTBYMAIL', 'test'=>$conf->facture->enabled), array('id'=>'PAYMENT_CUSTOMER_CREATE','test'=>$conf->facture->enabled), array('id'=>'PAYMENT_SUPPLIER_CREATE','test'=>$conf->fournisseur->enabled), diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index fb1ea3d21e0c7672fc740c77e5e76476f21b2217..b9f960e4b1a94d29d18c59d088a4ad7de764c4fe 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1232,7 +1232,7 @@ class Facture extends CommonObject /** - * \brief Tag la facture comme abandonnee, sans paiement dessus (exemple car facture de remplacement) + appel trigger BILL_CANCELED + * \brief Tag la facture comme abandonnee, sans paiement dessus (exemple car facture de remplacement) + appel trigger BILL_CANCEL * \param user Objet utilisateur qui modifie * \param close_code Code de fermeture * \param close_note Commentaire de fermeture