lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction sur confirmation suppression charge

Browse Source
This commit is contained in:
Laurent Destailleur 2006-08-20 21:42:54 +00:00
parent a845739612
commit 973f822b2d
3 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/chargesociales.class.php
View File

@ -31,7 +31,8 @@
/** \class PaiementCharge /** \class PaiementCharge
\brief Classe permettant la gestion des paiements des charges \brief Classe permettant la gestion des paiements des charges
*/ */
class PaiementCharge { class PaiementCharge
{
var $db; var $db;
var $id; var $id;
@ -125,7 +126,8 @@ class PaiementCharge {
\brief Classe permettant la gestion des paiements des charges \brief Classe permettant la gestion des paiements des charges
La tva collectée n'est calculée que sur les factures payées. La tva collectée n'est calculée que sur les factures payées.
*/ */
class ChargeSociales { class ChargeSociales
{
var $db; var $db;
var $id; var $id;
@ -150,7 +152,8 @@ class ChargeSociales {
* \brief Retrouve et charge une charge sociale * \brief Retrouve et charge une charge sociale
* \return int 1 si trouve, 0 sinon * \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 = "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 .=", 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"; $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 = "SELECT sum(f.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f WHERE paye = 0"; $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 * \brief Tag la charge comme payée complètement
* \param rowid id de la ligne a modifier * \param rowid id de la ligne a modifier
*/ */
function set_payed($rowid) function set_payed($rowid)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales set paye=1 WHERE rowid = $rowid ;"; $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales set paye=1 WHERE rowid = $rowid ;";
$return = $this->db->query( $sql); $return = $this->db->query( $sql);

1
htdocs/compta/sociales/charges.php
View File

@ -89,6 +89,7 @@ if ($chid > 0)
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
{ {
$html->form_confirm("index.php?id=$cha->id&amp;action=del","Supprimer la charge sociale","Etes-vous sûr de vouloir supprimer cette charge sociale ?","confirm_delete"); $html->form_confirm("index.php?id=$cha->id&amp;action=del","Supprimer la charge sociale","Etes-vous sûr de vouloir supprimer cette charge sociale ?","confirm_delete");
print '<br>';
} }
print "<form action=\"charges.php?id=$cha->id&amp;action=update\" method=\"post\">"; print "<form action=\"charges.php?id=$cha->id&amp;action=update\" method=\"post\">";

11
htdocs/compta/sociales/index.php
View File

@ -82,14 +82,11 @@ if ($_POST["action"] == 'add')
* Suppression d'une charge sociale * 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"]."'"; $chargesociales=new ChargeSociales($db);
$chargesociales->id=$_GET["id"];
if (! $db->query($sql) ) $result=$chargesociales->delete($user);
{
dolibarr_print_error($db);
}
} }