diff --git a/htdocs/don.class.php b/htdocs/don.class.php index 106db08b060..b197aee1b22 100644 --- a/htdocs/don.class.php +++ b/htdocs/don.class.php @@ -72,8 +72,7 @@ class Don $langs->load("donations"); $this->labelstatut[0]=$langs->trans("DonationStatusPromessNotValidated"); $this->labelstatut[1]=$langs->trans("DonationStatusPromessValidated"); - $this->labelstatut[2]=$langs->trans("DonationStatusValidated"); - $this->labelstatut[3]=$langs->trans("DonationStatusPayed"); + $this->labelstatut[2]=$langs->trans("DonationStatusPayed"); } /** @@ -364,39 +363,38 @@ class Don } } - /* - * \brief Classe le don comme payé, le don a été recu - * \param rowid id du don à modifier - * \param modepaiementd mode de paiement - * - */ - function set_paye($rowid, $modepaiement='') - { - $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; - - if ($modepaiement) - { - $sql .= ", fk_paiement=$modepaiement"; - } - $sql .= " WHERE rowid = $rowid AND fk_statut = 1;"; - - if ( $this->db->query( $sql) ) - { - if ( $this->db->affected_rows() ) - { - return 1; - } - else - { - return 0; - } - } - else - { - dolibarr_print_error($this->db); - return 0; - } - } + /* + * \brief Classe le don comme payé, le don a été recu + * \param rowid id du don à modifier + * \param modepaiementd mode de paiement + */ + function set_paye($rowid, $modepaiement='') + { + $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; + + if ($modepaiement) + { + $sql .= ", fk_paiement=$modepaiement"; + } + $sql .= " WHERE rowid = $rowid AND fk_statut = 1;"; + + if ( $this->db->query( $sql) ) + { + if ( $this->db->affected_rows() ) + { + return 1; + } + else + { + return 0; + } + } + else + { + dolibarr_print_error($this->db); + return 0; + } + } /* * \brief Défini le commentaire diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 554ed296286..beea15d6691 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -10,4 +10,7 @@ DonationsPayed=Donations payed DonationsReceived=Donations received PublicDonation=Public donation DonationsNumber=Donation number -DonationsArea=Donations area \ No newline at end of file +DonationsArea=Donations area +DonationStatusPromessNotValidated=Draft promess +DonationStatusPromessNotValidated=Validated promess +DonationStatusPayed=Donation received \ No newline at end of file diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index fbd4f7c8d7d..2488668e907 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -11,3 +11,6 @@ DonationsReceived=Dons encaiss PublicDonation=Don public DonationsNumber=Nombre de dons DonationsArea=Espace Dons +DonationStatusPromessNotValidated=Promesse non validée +DonationStatusPromessNotValidated=Promesse validée +DonationStatusPayed=Don payé \ No newline at end of file