diff --git a/htdocs/chargesociales.class.php b/htdocs/chargesociales.class.php index 504ed568598..c145a95fae8 100644 --- a/htdocs/chargesociales.class.php +++ b/htdocs/chargesociales.class.php @@ -31,7 +31,8 @@ /** \class PaiementCharge \brief Classe permettant la gestion des paiements des charges */ -class PaiementCharge { +class PaiementCharge +{ var $db; var $id; @@ -125,7 +126,8 @@ class PaiementCharge { \brief Classe permettant la gestion des paiements des charges La tva collectée n'est calculée que sur les factures payées. */ -class ChargeSociales { +class ChargeSociales +{ var $db; var $id; @@ -150,7 +152,8 @@ class ChargeSociales { * \brief Retrouve et charge une charge sociale * \return int 1 si trouve, 0 sinon */ - function fetch($id) { + function fetch($id) + { $sql = "SELECT cs.rowid,".$this->db->pdate("cs.date_ech")." as date_ech,".$this->db->pdate("cs.date_pai")." as date_pai"; $sql .=", cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, ".$this->db->pdate("cs.periode")." as periode, c.libelle"; $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs, ".MAIN_DB_PREFIX."c_chargesociales as c"; @@ -188,8 +191,22 @@ class ChargeSociales { } } - function solde($year = 0) { - + /** + * \brief Efface un charge sociale + * \param user Utilisateur qui crée le paiement + * \return int <0 si erreur, >0 si ok + */ + function delete($user) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'"; + if (! $this->db->query($sql)) + { + dolibarr_print_error($this->db); + } + } + + function solde($year = 0) + { $sql = "SELECT sum(f.amount) as amount"; $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f WHERE paye = 0"; @@ -215,11 +232,11 @@ class ChargeSociales { } } - /** - * \brief Tag la charge comme payée complètement - * \param rowid id de la ligne a modifier - */ - function set_payed($rowid) + /** + * \brief Tag la charge comme payée complètement + * \param rowid id de la ligne a modifier + */ + function set_payed($rowid) { $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales set paye=1 WHERE rowid = $rowid ;"; $return = $this->db->query( $sql); diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index e313d7816f6..6f8560ba5c4 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -89,6 +89,7 @@ if ($chid > 0) if ($_GET["action"] == 'delete') { $html->form_confirm("index.php?id=$cha->id&action=del","Supprimer la charge sociale","Etes-vous sûr de vouloir supprimer cette charge sociale ?","confirm_delete"); + print '
'; } print "
id&action=update\" method=\"post\">"; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index d361b2e4e78..0e1e13a0884 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -82,14 +82,11 @@ if ($_POST["action"] == 'add') * Suppression d'une charge sociale */ -if ($_GET["action"] == 'del') +if ($_GET["action"] == 'del' && $_POST["confirm"] == 'yes') { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$_GET["id"]."'"; - - if (! $db->query($sql) ) - { - dolibarr_print_error($db); - } + $chargesociales=new ChargeSociales($db); + $chargesociales->id=$_GET["id"]; + $result=$chargesociales->delete($user); }