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

Qual: Clean properties

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-28 17:13:19 +01:00
parent 555038fbc3
commit 2daa5a516f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -42,7 +42,7 @@ abstract class ActionsCardCommon
var $error; var $error;
//! Error array //! Error array
var $errors=array(); var $errors=array();
/** /**
* Instantiation of DAO class * Instantiation of DAO class
@ -126,10 +126,11 @@ abstract class ActionsCardCommon
{ {
$this->object->particulier = GETPOST("private"); $this->object->particulier = GETPOST("private");
$this->object->nom = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]); $this->object->name = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]);
$this->object->nom_particulier = $_POST["nom"];
$this->object->prenom = $_POST["prenom"];
$this->object->civilite_id = $_POST["civilite_id"]; $this->object->civilite_id = $_POST["civilite_id"];
// Add non official properties
$this->object->name_bis = $_POST["nom"];
$this->object->firstname = $_POST["prenom"];
} }
else else
{ {
@ -224,8 +225,8 @@ abstract class ActionsCardCommon
$contact=new Contact($this->db); $contact=new Contact($this->db);
$contact->civilite_id = $this->object->civilite_id; $contact->civilite_id = $this->object->civilite_id;
$contact->name = $this->object->nom_particulier; $contact->name = $this->object->name_bis;
$contact->firstname = $this->object->prenom; $contact->firstname = $this->object->firstname;
$contact->address = $this->object->address; $contact->address = $this->object->address;
$contact->cp = $this->object->cp; $contact->cp = $this->object->cp;
$contact->ville = $this->object->ville; $contact->ville = $this->object->ville;

6
htdocs/societe/class/societe.class.php
View File

@ -43,10 +43,8 @@ class Societe extends CommonObject
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id; var $id;
var $name; // TODO obsolete var $name;
var $nom; var $nom; // TODO obsolete
var $nom_particulier;
var $prenom;
var $particulier; var $particulier;
var $address; var $address;
var $adresse; // TODO obsolete var $adresse; // TODO obsolete

9
htdocs/societe/soc.php
View File

@ -110,9 +110,10 @@ if (empty($reshook))
$object->particulier = GETPOST("private"); $object->particulier = GETPOST("private");
$object->name = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]); $object->name = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]);
$object->nom_particulier = $_POST["nom"];
$object->prenom = $_POST["prenom"];
$object->civilite_id = $_POST["civilite_id"]; $object->civilite_id = $_POST["civilite_id"];
// Add non official properties
$object->name_bis = $_POST["nom"];
$object->firstname = $_POST["prenom"];
} }
else else
{ {
@ -229,8 +230,8 @@ if (empty($reshook))
$contact=new Contact($db); $contact=new Contact($db);
$contact->civilite_id = $object->civilite_id; $contact->civilite_id = $object->civilite_id;
$contact->name = $object->nom_particulier; $contact->name = $object->name_bis;
$contact->firstname = $object->prenom; $contact->firstname = $object->firstname;
$contact->address = $object->address; $contact->address = $object->address;
$contact->zip = $object->zip; $contact->zip = $object->zip;
$contact->cp = $object->cp; // TODO obsolete $contact->cp = $object->cp; // TODO obsolete