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

Fix: Duplicate automatic contact add when adding a third party.

Browse Source
This commit is contained in:
Laurent Destailleur 2008-04-21 12:47:23 +00:00
parent 9fd78b04a7
commit e3922a23f1
3 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contact.class.php
View File

@ -159,8 +159,8 @@ class Contact extends CommonObject
} }
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
if ($this->socid > 0) $sql .= " fk_soc='".addslashes($this->socid)."',"; if ($this->socid > 0) $sql .= " fk_soc='".addslashes($this->socid)."',";
if ($this->socid == -1) $sql .= " fk_soc=null,"; if ($this->socid == -1) $sql .= " fk_soc=null,";
$sql .= " civilite='".addslashes($this->civilite_id)."'"; $sql .= " civilite='".addslashes($this->civilite_id)."'";
$sql .= ", name='".addslashes($this->name)."'"; $sql .= ", name='".addslashes($this->name)."'";
$sql .= ", firstname='".addslashes($this->firstname)."'"; $sql .= ", firstname='".addslashes($this->firstname)."'";

6
htdocs/soc.php
View File

@ -158,9 +158,9 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
$contact=new Contact($db); $contact=new Contact($db);
$contact->civilite_id = $soc->civilite_id; $contact->civilite_id = $soc->civilite_id;
$contact->name=$soc->name; $contact->name=$soc->nom_particulier;
$contact->firstname=$soc->firstname; $contact->firstname=$soc->prenom;
$contact->address=$soc->address; $contact->address=$soc->adresse;
$contact->cp=$soc->cp; $contact->cp=$soc->cp;
$contact->ville=$soc->ville; $contact->ville=$soc->ville;
$contact->fk_pays=$soc->fk_pays; $contact->fk_pays=$soc->fk_pays;

30
htdocs/societe.class.php
View File

@ -421,34 +421,8 @@ class Societe extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
// Si le fournisseur est classe on l'ajoute
//Si c'est un particulier on cr<63>e la fiche contact $this->AddFournisseurInCategory($this->fournisseur_categorie);
if ($this->particulier == 1)
{
require_once (DOL_DOCUMENT_ROOT."/contact.class.php");
$contact = new Contact($this->db);
$contact->socid = $id;
$contact->name = $this->nom_particulier;
$contact->firstname = $this->prenom;
//$contact->civilite_id = $_POST["civilite_id"];
//$contact->poste = $_POST["poste"];
$contact->address = $this->adresse;
$contact->cp = $this->cp;
$contact->ville = $this->ville;
$contact->fk_pays = $this->pays_id;
$contact->email = $this->email;
$contact->phone_pro = $this->tel;
//$contact->phone_perso = $_POST["phone_perso"];
//$contact->phone_mobile = $_POST["phone_mobile"];
$contact->fax = $this->fax;
$id = $contact->create($user);
}
// si le fournisseur est classe on l'ajoute
$this->AddFournisseurInCategory($this->fournisseur_categorie);
if ($call_trigger) if ($call_trigger)
{ {