';
- print '| '.$langs->trans('DeliveryAddressLabel').' | |
';
- print '| '.$langs->trans('Name').' | |
';
+ print '| '.$langs->trans('AddressLabel').' | |
';
+ print '| '.$langs->trans('Name').' | |
';
- print '| '.$langs->trans('Address').' | |
';
- print '| '.$langs->trans('Zip').' | ';
+ print ' |
| '.$langs->trans('Zip').' | ';
if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' ';
print ' |
';
- print '| '.$langs->trans('Town').' | |
';
+ print '| '.$langs->trans('Town').' | |
';
print '| '.$langs->trans('Country').' | ';
- $form->select_pays($livraison->pays_id,'pays_id');
+ $form->select_pays($address->pays_id,'pays_id');
print ' |
';
- print '| '.$langs->trans('Phone').' | |
';
+ print '| '.$langs->trans('Phone').' | |
';
- print '| '.$langs->trans('Fax').' | |
';
+ print '| '.$langs->trans('Fax').' | |
';
print '| '.$langs->trans('Note').' | |
';
print ' |
';
@@ -372,58 +375,58 @@ else
/*
* Fiche societe en mode visu
*/
- $livraison = new AdresseLivraison($db);
- $result=$livraison->fetch($socid);
+ $address = new Address($db);
+ $result=$address->fetch($socid);
if ($result < 0)
{
- dol_print_error($db,$livraison->error);
+ dol_print_error($db,$address->error);
exit;
}
$societe=new Societe($db);
- $societe->fetch($livraison->socid);
+ $societe->fetch($address->socid);
$head = societe_prepare_head($societe);
dol_fiche_head($head, 'customer', $societe->nom);
- // Confirmation de la suppression de la facture
+ // Confirmation de la suppression de l'adresse
if ($_GET["action"] == 'delete')
{
$html = new Form($db);
- $ret=$html->form_confirm("adresse_livraison.php?socid=".$livraison->socid."&id=".$_GET["id"],$langs->trans("DeleteDeliveryAddress"),$langs->trans("ConfirmDeleteDeliveryAdress"),"confirm_delete");
+ $ret=$html->form_confirm($_SERVER['PHP_SELF']."?socid=".$address->socid."&id=".$_GET["id"],$langs->trans("DeleteAddress"),$langs->trans("ConfirmDeleteAddress"),"confirm_delete");
if ($ret == 'html') print '
';
}
- if ($livraison->error)
+ if ($address->error)
{
print '';
- print $livraison->error;
+ print $address->error;
print '
';
}
- $nblignes = sizeof($livraison->lignes);
- if ($nblignes)
+ $nblines = sizeof($address->lines);
+ if ($nblines)
{
- for ($i = 0 ; $i < $nblignes ; $i++)
+ for ($i = 0 ; $i < $nblines ; $i++)
{
print '';
- print '| '.$langs->trans('DeliveryAddressLabel').' | '.$livraison->lignes[$i]->label.' | ';
- print ''.$langs->trans('Note').' :
'.nl2br($livraison->lignes[$i]->note).' |
';
- print '| '.$langs->trans('Name').' | '.$livraison->lignes[$i]->nom.' |
';
+ print '| '.$langs->trans('AddressLabel').' | '.$address->lines[$i]->label.' | ';
+ print ''.$langs->trans('Note').' :
'.nl2br($address->lines[$i]->note).' |
';
+ print '| '.$langs->trans('Name').' | '.$address->lines[$i]->name.' |
';
- print "| ".$langs->trans('Address')." | ".nl2br($livraison->lignes[$i]->address)." |
";
+ print "| ".$langs->trans('Address')." | ".nl2br($address->lines[$i]->address)." |
";
- print '| '.$langs->trans('Zip').' | '.$livraison->lignes[$i]->cp." |
";
- print '| '.$langs->trans('Town').' | '.$livraison->lignes[$i]->ville." |
";
+ print '| '.$langs->trans('Zip').' | '.$address->lines[$i]->cp." |
";
+ print '| '.$langs->trans('Town').' | '.$address->lines[$i]->ville." |
";
- print '| '.$langs->trans('Country').' | '.$livraison->lignes[$i]->pays.' | ';
+ print '
| '.$langs->trans('Country').' | '.$address->lines[$i]->pays.' | ';
- print '
| '.$langs->trans('Phone').' | '.dol_print_phone($livraison->lignes[$i]->tel,$livraison->lignes[$i]->pays_code,0,$livraison->socid,'AC_TEL').' |
';
+ print '| '.$langs->trans('Phone').' | '.dol_print_phone($address->lines[$i]->tel,$address->lines[$i]->pays_code,0,$address->socid,'AC_TEL').' |
';
- print '| '.$langs->trans('Fax').' | '.dol_print_phone($livraison->lignes[$i]->fax,$livraison->lignes[$i]->pays_code,0,$livraison->socid,'AC_FAX').' |
';
+ print '| '.$langs->trans('Fax').' | '.dol_print_phone($address->lines[$i]->fax,$address->lines[$i]->pays_code,0,$address->socid,'AC_FAX').' |
';
print '';
@@ -438,12 +441,12 @@ else
if ($user->rights->societe->creer)
{
- print ''.$langs->trans("Modify").'';
+ print ''.$langs->trans("Modify").'';
}
if ($user->rights->societe->supprimer)
{
- print ''.$langs->trans("Delete").'';
+ print ''.$langs->trans("Delete").'';
}
@@ -468,7 +471,7 @@ else
if ($user->rights->societe->creer)
{
- print ''.$langs->trans("Add").'';
+ print ''.$langs->trans("Add").'';
}
print '';
}
diff --git a/htdocs/comm/class/adresse_livraison.class.php b/htdocs/comm/class/address.class.php
similarity index 60%
rename from htdocs/comm/class/adresse_livraison.class.php
rename to htdocs/comm/class/address.class.php
index ff1f0ab2ff9..283b3edb311 100644
--- a/htdocs/comm/class/adresse_livraison.class.php
+++ b/htdocs/comm/class/address.class.php
@@ -1,7 +1,7 @@
* Copyright (C) 2004-2006 Laurent Destailleur
- * Copyright (C) 2005-2006 Regis Houssin
+ * Copyright (C) 2005-2010 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,27 +19,27 @@
*/
/**
- \file htdocs/comm/adresse_livraison.class.php
- \ingroup societe, expedition
- \brief Fichier de la classe des adresses de livraison
- \version $Id$
+ * \file htdocs/comm/class/address.class.php
+ * \ingroup societe
+ * \brief Fichier de la classe des adresses des tiers
+ * \version $Id$
*/
/**
- \class AdresseLivraison
- \brief Classe permettant la gestion des adresses de livraison
+ * \class Address
+ * \brief Classe permettant la gestion des adresses des tiers
*/
-class AdresseLivraison
+class Address
{
var $db;
var $id;
+ var $type;
var $label;
var $socid;
- var $nom;
- var $adresse; // TODO obsolete
+ var $name;
var $address;
var $cp;
var $ville;
@@ -55,7 +55,7 @@ class AdresseLivraison
* \param DB handler acces base de donnees
* \param id id societe (0 par defaut)
*/
- function AdresseLivraison($DB, $id=0)
+ function Address($DB, $id=0)
{
global $conf;
@@ -67,7 +67,7 @@ class AdresseLivraison
}
/**
- * \brief Cree l'adresse de livraison de la societe en base
+ * \brief Cree l'adresse de la societe en base
* \param user Objet utilisateur qui demande la creation
* \return int 0 si ok, < 0 si erreur
*/
@@ -77,10 +77,10 @@ class AdresseLivraison
global $langs,$conf;
// Nettoyage parametres
- $this->nom=trim($this->nom);
- $this->label=trim($this->label);
+ $this->name = trim($this->name);
+ $this->label = trim($this->label);
- dol_syslog("AdresseLivraison::create label=".$this->label);
+ dol_syslog("Address::create label=".$this->label);
$this->db->begin();
@@ -88,25 +88,25 @@ class AdresseLivraison
if ($result >= 0)
{
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_adresse_livraison (label, fk_societe, nom, datec, fk_user_creat) ";
- $sql .= " VALUES ('".addslashes($this->label)."', '".$socid."', '".addslashes($this->nom)."', ".$this->db->idate(mktime()).", '".$user->id."')";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_address (label, fk_soc, name, datec, fk_user_creat) ";
+ $sql .= " VALUES ('".addslashes($this->label)."', '".$socid."', '".addslashes($this->name)."', ".$this->db->idate(mktime()).", '".$user->id."')";
$result=$this->db->query($sql);
if ($result)
{
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_adresse_livraison");
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_address");
$ret = $this->update($this->id, $socid, $user);
if ($ret >= 0)
{
- dol_syslog("AdresseLivraison::create success id=".$this->id);
+ dol_syslog("Address::create success id=".$this->id);
$this->db->commit();
return 0;
}
else
{
- dol_syslog("AdresseLivraison::create echec update");
+ dol_syslog("Address::create echec update");
$this->db->rollback();
return -3;
}
@@ -121,7 +121,7 @@ class AdresseLivraison
}
else
{
- dol_syslog("AdresseLivraison::create echec insert sql=$sql");
+ dol_syslog("Address::create echec insert sql=$sql");
}
$this->db->rollback();
return -2;
@@ -131,22 +131,22 @@ class AdresseLivraison
else
{
$this->db->rollback();
- dol_syslog("AdresseLivraison::create echec verify sql=$sql");
+ dol_syslog("Address::create echec verify sql=$sql");
return -1;
}
}
/**
- * \brief Verification lors de la modification de l'adresse de livraison
+ * \brief Verification lors de la modification de l'adresse
* \return 0 si ok, < 0 en cas d'erreur
*/
function verify()
{
- $this->label=trim($this->label);
- $this->nom=trim($this->nom);
+ $this->label = trim($this->label);
+ $this->name = trim($this->name);
$result = 0;
- if (!$this->nom || !$this->label)
+ if (!$this->name || !$this->label)
{
$this->error = "The name of company and the label can not be empty.\n";
$result = -2;
@@ -156,8 +156,8 @@ class AdresseLivraison
/**
- * \brief Mise a jour des parametres de l'adresse de livraison
- * \param id id adresse de livraison
+ * \brief Mise a jour des parametres de l'adresse
+ * \param id id address
* \param user Utilisateur qui demande la mise a jour
* \return int <0 si ko, >=0 si ok
*/
@@ -165,35 +165,34 @@ class AdresseLivraison
{
global $langs;
- dol_syslog("AdresseLivraison::Update");
+ dol_syslog("Address::Update");
// Nettoyage des parametres
- $this->fk_societe = $socid;
- $this->label = trim($this->label);
- $this->nom = trim($this->nom);
- $this->adresse = trim($this->adresse); // TODO obsolete
- $this->address = trim($this->address);
- $this->cp = trim($this->cp);
- $this->ville = trim($this->ville);
- $this->pays_id = trim($this->pays_id);
- $this->tel = trim($this->tel);
- $this->tel = preg_replace("/\s/","",$this->tel);
- $this->tel = preg_replace("/\./","",$this->tel);
- $this->fax = trim($this->fax);
- $this->fax = preg_replace("/\s/","",$this->fax);
- $this->fax = preg_replace("/\./","",$this->fax);
- $this->note = trim($this->note);
+ $this->fk_soc = $socid;
+ $this->label = trim($this->label);
+ $this->name = trim($this->name);
+ $this->address = trim($this->address);
+ $this->cp = trim($this->cp);
+ $this->ville = trim($this->ville);
+ $this->pays_id = trim($this->pays_id);
+ $this->tel = trim($this->tel);
+ $this->tel = preg_replace("/\s/","",$this->tel);
+ $this->tel = preg_replace("/\./","",$this->tel);
+ $this->fax = trim($this->fax);
+ $this->fax = preg_replace("/\s/","",$this->fax);
+ $this->fax = preg_replace("/\./","",$this->fax);
+ $this->note = trim($this->note);
$result = $this->verify(); // Verifie que nom et label obligatoire
if ($result >= 0)
{
- dol_syslog("AdresseLivraison::Update verify ok");
+ dol_syslog("Address::Update verify ok");
- $sql = "UPDATE ".MAIN_DB_PREFIX."societe_adresse_livraison";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."societe_address";
$sql.= " SET label = '" . addslashes($this->label) ."'"; // Champ obligatoire
- $sql.= ",nom = '" . addslashes($this->nom) ."'"; // Champ obligatoire
+ $sql.= ",name = '" . addslashes($this->name) ."'"; // Champ obligatoire
$sql.= ",address = '" . addslashes($this->address) ."'";
if ($this->cp)
@@ -212,7 +211,7 @@ class AdresseLivraison
{ $sql .= ",fax = '" . $this->fax ."'"; }
if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
- $sql .= " WHERE fk_societe = '" . $socid ."' AND rowid = '" . $id ."'";
+ $sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $id ."'";
$resql=$this->db->query($sql);
if ($resql)
@@ -231,7 +230,7 @@ class AdresseLivraison
{
$this->error = $langs->trans("Error sql=$sql");
- dol_syslog("AdresseLivraison::Update echec sql=$sql");
+ dol_syslog("Address::Update echec sql=$sql");
$result = -2;
}
}
@@ -242,7 +241,7 @@ class AdresseLivraison
}
/**
- * \brief Charge depuis la base toutes les adresses de livraison d'une societe
+ * \brief Charge depuis la base toutes les adresses d'une societe
* \param socid Id de la societe a charger en memoire
* \param user Objet de l'utilisateur
* \return int >0 si ok, <0 si ko
@@ -263,26 +262,26 @@ class AdresseLivraison
{
$obj = $this->db->fetch_object($resqlsoc);
- $this->nom_societe = $obj->nom;
- $this->socid = $obj->rowid;
- $this->id = $obj->rowid;
- $this->client = $obj->client;
- $this->fournisseur = $obj->fournisseur;
+ $this->socname = $obj->nom;
+ $this->socid = $obj->rowid;
+ $this->id = $obj->rowid;
+ $this->client = $obj->client;
+ $this->fournisseur = $obj->fournisseur;
}
$this->lignes = array();
$this->db->free($resqlsoc);
- // Adresses de livraison liees a la societe
+ // Adresses liees a la societe
if ($this->socid)
{
- $sql = 'SELECT a.rowid as id, a.label, a.nom, a.address, a.datec as dc';
- $sql .= ', a.tms as date_update, a.fk_societe';
+ $sql = 'SELECT a.rowid as id, a.label, a.name, a.address, a.datec as dc';
+ $sql .= ', a.tms as date_update, a.fk_soc';
$sql .= ', a.cp, a.ville, a.note, a.fk_pays, a.tel, a.fax';
$sql .= ', p.code as pays_code, p.libelle as pays';
- $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_adresse_livraison as a';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
- $sql .= ' WHERE a.fk_societe = '.$this->socid;
+ $sql .= ' WHERE a.fk_soc = '.$this->socid;
$resql=$this->db->query($sql);
if ($resql)
@@ -291,27 +290,26 @@ class AdresseLivraison
$i = 0;
while ($i < $num)
{
- $objp = $this->db->fetch_object($resql);
+ $objp = $this->db->fetch_object($resql);
- $ligne = new AdresseLivraisonLigne();
+ $line = new AddressLine();
- $ligne->id = $objp->id;
- $ligne->date_creation = $this->db->jdate($objp->dc);
- $ligne->date_update = $this->db->jdate($objp->date_update);
- $ligne->label = $objp->label;
- $ligne->nom = $objp->nom;
- $ligne->address = $objp->address;
- $ligne->adresse = $objp->address; // TODO obsolete
- $ligne->cp = $objp->cp;
- $ligne->ville = $objp->ville;
- $ligne->pays_id = $objp->fk_pays;
- $ligne->pays_code = $objp->fk_pays?$objp->pays_code:'';
- $ligne->pays = $objp->fk_pays?($langs->trans('Country'.$objp->pays_code)!='Country'.$objp->pays_code?strtoupper($langs->trans('Country'.$objp->pays_code)):$objp->pays):'';
- $ligne->tel = $objp->tel;
- $ligne->fax = $objp->fax;
- $ligne->note = $objp->note;
+ $line->id = $objp->id;
+ $line->date_creation = $this->db->jdate($objp->dc);
+ $line->date_update = $this->db->jdate($objp->date_update);
+ $line->label = $objp->label;
+ $line->name = $objp->name;
+ $line->address = $objp->address;
+ $line->cp = $objp->cp;
+ $line->ville = $objp->ville;
+ $line->pays_id = $objp->fk_pays;
+ $line->pays_code = $objp->fk_pays?$objp->pays_code:'';
+ $line->pays = $objp->fk_pays?($langs->trans('Country'.$objp->pays_code)!='Country'.$objp->pays_code?strtoupper($langs->trans('Country'.$objp->pays_code)):$objp->pays):'';
+ $line->tel = $objp->tel;
+ $line->fax = $objp->fax;
+ $line->note = $objp->note;
- $this->lignes[$i] = $ligne;
+ $this->lines[$i] = $line;
$i++;
}
$this->db->free($resql);
@@ -319,39 +317,39 @@ class AdresseLivraison
}
else
{
- dol_syslog('Erreur AdresseLivraison::Fetch aucune adresse dde livraison');
+ dol_syslog('Address::Fetch Erreur: aucune adresse');
return -1;
}
}
else
{
- dol_syslog('AdresseLivraison::Societe inconnue');
+ dol_syslog('Address::Fetch Erreur: societe inconnue');
return -2;
}
}
else
{
- dol_syslog('Erreur Societe::Fetch '.$this->db->error());
+ dol_syslog('Societe::Fetch '.$this->db->error());
$this->error=$this->db->error();
}
}
/**
- * \brief Charge depuis la base l'objet adresse de livraison
- * \param id Id de l'adresse de livraison a charger en memoire
+ * \brief Charge depuis la base l'objet adresse
+ * \param id Id de l'adresse a charger en memoire
* \param user Objet de l'utilisateur
* \return int >0 si ok, <0 si ko
*/
- function fetch_adresse($id, $user=0)
+ function fetch_address($id, $user=0)
{
global $langs;
global $conf;
- $sql = 'SELECT a.rowid, a.fk_societe, a.label, a.nom, a.address, a.datec as date_creation';
+ $sql = 'SELECT a.rowid, a.fk_soc, a.label, a.name, a.address, a.datec as date_creation';
$sql .= ', a.tms as date_update';
$sql .= ', a.cp,a.ville, a.note, a.fk_pays, a.tel, a.fax';
$sql .= ', p.code as pays_code, p.libelle as pays';
- $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_adresse_livraison as a';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
$sql .= ' WHERE a.rowid = '.$id;
$resql=$this->db->query($sql);
@@ -362,14 +360,13 @@ class AdresseLivraison
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
- $this->socid = $obj->fk_societe;
+ $this->socid = $obj->fk_soc;
$this->date_update = $this->db->jdate($obj->date_update);
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->label = $obj->label;
- $this->nom = $obj->nom;
- $this->adresse = $obj->address; // TODO obsolete
+ $this->name = $obj->name;
$this->address = $obj->address;
$this->cp = $obj->cp;
$this->ville = $obj->ville;
@@ -386,8 +383,8 @@ class AdresseLivraison
}
else
{
- dol_syslog('Erreur Societe::Fetch aucune adresse de livraison avec id='.$this->id.' - '.$sql);
- $this->error='Erreur Societe::Fetch aucune adresse de livraison avec id='.$this->id.' - '.$sql;
+ dol_syslog('Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql);
+ $this->error='Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql;
$result = -2;
}
@@ -406,15 +403,16 @@ class AdresseLivraison
/**
- * \brief Suppression d'une adresse de livraison
+ * \brief Suppression d'une adresse
* \param id id de la societe a supprimer
*/
function delete($id,$socid)
{
- dol_syslog("AdresseLivraison::Delete");
+ dol_syslog("Address::Delete");
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
- $sql .= " WHERE rowid=".$id." AND fk_societe = ".$socid;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_address";
+ $sql.= " WHERE rowid = ".$id;
+ $sql.= " AND fk_soc = ".$socid;
$result = $this->db->query($sql);
@@ -472,14 +470,14 @@ class AdresseLivraison
}
-class AdresseLivraisonLigne
+class AddressLine
{
var $id;
var $date_creation;
var $date_update;
var $label;
- var $nom;
+ var $name;
var $adresse;
var $cp;
var $ville;
@@ -490,7 +488,7 @@ class AdresseLivraisonLigne
var $fax;
var $note;
- function AdresseLivraisonLigne()
+ function AddressLine()
{
}
}
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 4b3818b5542..2fbac752fbf 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -334,14 +334,14 @@ if ($socid > 0)
print ' | ';
if ($user->rights->societe->creer)
{
- print ''.img_edit($langs->trans("Modify")).'';
+ print ''.img_edit($langs->trans("Modify")).'';
}
print ' |
';
print '';
$sql = "SELECT count(rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
- $sql.= " WHERE fk_societe =".$objsoc->id;
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe_address";
+ $sql.= " WHERE fk_soc =".$objsoc->id;
$resql = $db->query($sql);
if ($resql)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 2c813366a8b..836e02c62e6 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -209,7 +209,7 @@ if ($_POST['action'] == 'setdeliveryadress' && $user->rights->propale->creer)
{
$propal = new Propal($db);
$propal->fetch($_GET['propalid']);
- $result=$propal->set_adresse_livraison($user,$_POST['adresse_livraison_id']);
+ $result=$propal->set_adresse_livraison($user,$_POST['fk_address']);
if ($result < 0) dol_print_error($db,$propal->error);
}
@@ -240,7 +240,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
$propal->ref = $_POST['ref'];
$propal->datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$propal->date_livraison = dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']);
- $propal->fk_delivery_address = $_POST['adresse_livraison_id'];
+ $propal->fk_delivery_address = $_POST['fk_address'];
$propal->duree_validite = $_POST['duree_validite'];
$propal->cond_reglement_id = $_POST['cond_reglement_id'];
$propal->mode_reglement_id = $_POST['mode_reglement_id'];
@@ -267,7 +267,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
$propal->ref_client = $_POST['ref_client'];
$propal->datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$propal->date_livraison = dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']);
- $propal->fk_delivery_address = $_POST['fk_delivery_address'];
+ $propal->fk_delivery_address = $_POST['fk_address'];
$propal->duree_validite = $_POST['duree_validite'];
$propal->cond_reglement_id = $_POST['cond_reglement_id'];
$propal->mode_reglement_id = $_POST['mode_reglement_id'];
@@ -1227,11 +1227,11 @@ if ($id > 0 || ! empty($ref))
if ($_GET['action'] == 'editdelivery_adress')
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_delivery_address','propal',$propal->id);
+ $html->form_address($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_address','propal',$propal->id);
}
else
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'none','propal',$propal->id);
+ $html->form_address($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'none','propal',$propal->id);
}
print ' | ';
}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 20e3ae16177..84ebbb45e3c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1092,16 +1092,16 @@ class Propal extends CommonObject
* \param adresse_livraison Adresse de livraison
* \return int <0 si ko, >0 si ok
*/
- function set_adresse_livraison($user, $adresse_livraison)
+ function set_adresse_livraison($user, $address_id)
{
if ($user->rights->propale->creer)
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_adresse_livraison = '".$adresse_livraison."'";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_adresse_livraison = '".$address_id."'";
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
if ($this->db->query($sql) )
{
- $this->fk_delivery_address = $adresse_livraison;
+ $this->fk_delivery_address = $address_id;
return 1;
}
else
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 08bf971aeee..5dd053d9ea4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1613,16 +1613,16 @@ class Commande extends CommonObject
* \param adresse_livraison Adresse de livraison
* \return int <0 si ko, >0 si ok
*/
- function set_adresse_livraison($user, $fk_delivery_address)
+ function set_adresse_livraison($user, $fk_address)
{
if ($user->rights->commande->creer)
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."commande SET fk_adresse_livraison = '".$fk_delivery_address."'";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."commande SET fk_adresse_livraison = '".$fk_address."'";
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
if ($this->db->query($sql) )
{
- $this->fk_delivery_address = $fk_delivery_address;
+ $this->fk_delivery_address = $fk_address;
return 1;
}
else
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index a990dec1a2e..7ae856a9a41 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -196,7 +196,7 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer)
$commande->cond_reglement_id = $_POST['cond_reglement_id'];
$commande->mode_reglement_id = $_POST['mode_reglement_id'];
$commande->date_livraison = $datelivraison;
- $commande->fk_delivery_address = $_POST['fk_delivery_address'];
+ $commande->fk_delivery_address = $_POST['fk_address'];
$commande->contactid = $_POST['contactidp'];
$NBLINES=8;
@@ -231,7 +231,7 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer)
}
}
- $_GET['id'] = $commande->id;
+ $_GET['id'] = $commande_id;
$action = '';
}
@@ -315,7 +315,7 @@ if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer)
{
$commande = new Commande($db);
$commande->fetch($_GET['id']);
- $commande->set_adresse_livraison($user,$_POST['adresse_livraison_id']);
+ $commande->set_adresse_livraison($user,$_POST['fk_address']);
}
if ($_POST['action'] == 'setmode' && $user->rights->commande->creer)
@@ -1076,10 +1076,10 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
// Delivery address
if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS)
{
- // Link to edit: $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?action=create','',$soc->id,'adresse_livraison_id','commande','');
+ // Link to edit: $html->form_address($_SERVER['PHP_SELF'].'?action=create','',$soc->id,'adresse_livraison_id','commande','');
print '| '.$langs->trans('DeliveryAddress').' | ';
- $numaddress = $html->select_adresse_livraison($soc->fk_delivery_address, $_GET['socid'],'fk_delivery_address',1);
- print ' '.$langs->trans("AddAddress").'';
+ $numaddress = $html->select_address($soc->fk_delivery_address, $_GET['socid'],'fk_address',1);
+ print ' '.$langs->trans("AddAddress").'';
print ' |
';
}
@@ -1273,8 +1273,8 @@ else
/* *************************************************************************** */
$now=dol_now();
- $id = $_REQUEST['id'];
- $ref= $_REQUEST['ref'];
+ $id = $_GET['id'];
+ $ref= $_GET['ref'];
if ($id > 0 || ! empty($ref))
{
@@ -1531,11 +1531,11 @@ else
if ($_GET['action'] == 'editdelivery_adress')
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'fk_delivery_address','commande',$commande->id);
+ $html->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'fk_address','commande',$commande->id);
}
else
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'none','commande',$commande->id);
+ $html->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'none','commande',$commande->id);
}
print '';
}
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index e5d51e7e8aa..7ac54ca9eaf 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -282,11 +282,11 @@ if ($id > 0 || ! empty($ref))
if ($_GET['action'] == 'editdelivery_adress')
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'adresse_livraison_id','commande',$commande->id);
+ $html->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'adresse_livraison_id','commande',$commande->id);
}
else
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'none','commande',$commande->id);
+ $html->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'none','commande',$commande->id);
}
print '';
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 35f3198b5ff..023c623e0cd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1311,19 +1311,19 @@ class Form
}
/**
- * \brief Retourne la liste deroulante des adresses de livraison
+ * \brief Retourne la liste deroulante des adresses
* \param selected Id contact pre-selectionn
* \param htmlname Nom champ formulaire
*/
- function select_adresse_livraison($selected='', $socid, $htmlname='adresse_livraison_id',$showempty=0)
+ function select_address($selected='', $socid, $htmlname='address_id',$showempty=0)
{
// On recherche les utilisateurs
$sql = "SELECT a.rowid, a.label";
- $sql .= " FROM ".MAIN_DB_PREFIX ."societe_adresse_livraison as a";
- $sql .= " WHERE a.fk_societe = ".$socid;
+ $sql .= " FROM ".MAIN_DB_PREFIX ."societe_address as a";
+ $sql .= " WHERE a.fk_soc = ".$socid;
$sql .= " ORDER BY a.label ASC";
- dol_syslog("Form::select_adresse_livraison sql=".$sql);
+ dol_syslog("Form::select_address sql=".$sql);
if ($this->db->query($sql))
{
print '