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

Implmentation de la suppression de ligne

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-01-31 12:06:35 +00:00
parent e4b1298f2e
commit d032c70736
2 changed files with 115 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/telephonie/ligne/fiche.php
View File

@ -58,6 +58,17 @@ if ($_POST["action"] == 'add')
}
}
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
{
$ligne = new LigneTel($db);
$ligne->fetch_by_id($_GET["id"]);
if ( $ligne->delete($user) == 0)
{
Header("Location: index.php");
}
}
if ($_POST["action"] == 'updateremise')
{
$ligne = new LigneTel($db);
@ -129,7 +140,6 @@ if ($_GET["action"] == 'refuse')
{
Header("Location: fiche.php?id=".$ligne->id);
}
}
if ($_GET["action"] == 'resilier')
@ -522,7 +532,22 @@ else
dolibarr_fiche_head($head, $hselected, 'Ligne : '.$ligne->numero);
print_fiche_titre('Fiche Ligne', $mesg);
/*
*
*/
if ($_GET["action"] == 'delete' && $ligne->statut == -1)
{
$html = new Form($db);
$html->form_confirm("fiche.php"."?id=".$_GET["id"],"Suppression de ligne","Etes-vous sûr de vouloir supprimer la ligne : ".dolibarr_print_phone($ligne->numero)." ?","confirm_delete");
print '<br />';
}
/*
*
*/
print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
if ($ligne->contrat)
@ -554,8 +579,6 @@ else
print $client->cp . " " .$client->ville;
print '</td></tr>';
$client_facture = new Societe($db);
$client_facture->fetch($ligne->client_facture_id);
@ -698,7 +721,6 @@ else
}
/*
* Edition
@ -862,10 +884,7 @@ else
*
*
*/
print '<tr><td width="20%">Remise LMN</td><td>'.$ligne->remise.'&nbsp;%</td></tr>';
print '<tr><td width="20%" valign="top">Note</td><td>';
print '<textarea name="note" rows="4" cols="50">';
@ -1099,7 +1118,12 @@ if ($_GET["action"] == '')
{
print "<a class=\"tabAction\" href=\"fiche.php?action=edit&amp;id=$ligne->id\">".$langs->trans("Edit")."</a>";
}
if ( $user->rights->telephonie->ligne->creer && $ligne->statut == -1)
{
print "<a class=\"butDelete\" href=\"fiche.php?action=delete&amp;id=$ligne->id\">".$langs->trans("Delete")."</a>";
}
}
print "</div>";

92
htdocs/telephonie/lignetel.class.php
View File

@ -52,12 +52,8 @@ class LigneTel {
$sql = "UPDATE ".MAIN_DB_PREFIX."telephonie_societe_ligne";
$sql .= " SET ";
$sql .= " fk_client_comm = $this->client_comm, ";
$sql .= " fk_soc = $this->client, ";
$sql .= " ligne = '$this->numero', ";
$sql .= " fk_soc_facture = $this->client_facture, ";
$sql .= " fk_fournisseur = $this->fournisseur, ";
$sql .= " fk_commercial = $this->commercial, ";
$sql .= " fk_concurrent = $this->concurrent, ";
$sql .= " note = '$this->note'";
$sql .= " WHERE rowid = $this->id";
@ -168,10 +164,16 @@ class LigneTel {
{
if (strlen(trim($this->numero)) == 10)
{
/*
* fk_commercial est encore définit pour supporter la migration en douceur
* à terme cette colonne sera supprimé
*
*/
$sql = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_societe_ligne";
$sql .= " (datec,fk_soc, fk_client_comm, ligne, fk_soc_facture, fk_fournisseur, note, remise, fk_commercial, statut, fk_user_creat, fk_concurrent, fk_contrat)";
$sql .= " (datec,fk_soc, fk_client_comm, ligne, fk_soc_facture, fk_fournisseur, note, remise, fk_commercial, fk_commercial_sign, fk_commercial_suiv, statut, fk_user_creat, fk_concurrent, fk_contrat)";
$sql .= " VALUES (";
$sql .= "now(),$this->client,$this->client_comm,'$this->numero',$this->client_facture,$this->fournisseur, '$this->note','$this->remise',$this->commercial, -1,$user->id, $this->concurrent, $this->contrat)";
$sql .= "now(),$this->client,$this->client_comm,'$this->numero',$this->client_facture,$this->fournisseur, '$this->note','$this->remise',$this->commercial_sign, $this->commercial_sign, $this->commercial_suiv, -1,$user->id, $this->concurrent, $this->contrat)";
if ( $this->db->query($sql) )
{
@ -194,6 +196,8 @@ class LigneTel {
{
$this->error_message = "Echec de la création de la ligne";
dolibarr_syslog("LigneTel::Create Error -1");
dolibarr_syslog("LigneTel::Create ".$this->db->error());
dolibarr_syslog("LigneTel::Create $sql");
return -1;
}
}
@ -223,7 +227,7 @@ class LigneTel {
$sql .= " , mode_paiement, fk_concurrent, code_analytique";
$sql .= " , fk_user_creat, fk_user_commande";
$sql .= " , fk_contrat ";
$sql .= " , fk_commercial, fk_commercial_suiv";
$sql .= " , fk_commercial_suiv, fk_commercial_sign";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_societe_ligne as tl";
if ($id > 0)
@ -250,7 +254,8 @@ class LigneTel {
$this->client_id = $obj->fk_soc;
$this->client_facture_id = $obj->fk_soc_facture;
$this->fournisseur_id = $obj->fk_fournisseur;
$this->commercial_id = $obj->fk_commercial;
$this->commercial_id = $obj->fk_commercial_suiv;
$this->commercial_sign_id = $obj->fk_commercial_sign;
$this->commercial_suiv_id = $obj->fk_commercial_suiv;
$this->concurrent_id = $obj->fk_concurrent;
$this->statut = $obj->statut;
@ -262,13 +267,15 @@ class LigneTel {
if ($obj->isfacturable == 'oui')
{
$this->facturable = 1;
$this->facturable = 1;
}
else
{
$this->facturable = 0;
$this->facturable = 0;
}
$this->note = stripslashes($obj->note);
$result = 1;
}
else
@ -498,6 +505,71 @@ class LigneTel {
$this->db->query($sql);
}
/*
*
*
*
*/
function delete($user)
{
$erro = 0;
if ($this->statut == -1)
{
if ($this->db->begin())
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_societe_ligne_remise";
$sql .= " WHERE fk_ligne=".$this->id;
if (!$this->db->query($sql))
{
dolibarr_syslog("LigneTel::Delete Error -5");
$error++;
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_societe_ligne_statut";
$sql .= " WHERE fk_ligne=".$this->id;
if (!$this->db->query($sql))
{
dolibarr_syslog("LigneTel::Delete Error -4");
$error++;
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_contact_facture";
$sql .= " WHERE fk_ligne=".$this->id;
if (!$this->db->query($sql))
{
dolibarr_syslog("LigneTel::Delete Error -3");
$error++;
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_societe_ligne";
$sql .= " WHERE rowid =".$this->id;
if (!$this->db->query($sql))
{
dolibarr_syslog("LigneTel::Delete Error -2");
$error++;
}
/*****/
if (!$error)
{
$this->db->commit();
return 0;
}
else
{
$this->db->rollback();
return -1;
}
}
}
}
/*
*
*