diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index e7c07c23b4c..50a24ea907a 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -423,7 +423,6 @@ abstract class ActionsAdherentCardCommon
{
dol_print_error($this->db);
}
- $this->object->pays_code = $obj->code;
$this->object->pays = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
$this->object->country_code = $obj->code;
$this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index f88f646289c..c3be6de5ed8 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -63,8 +63,6 @@ class Adherent extends CommonObject
var $country_id;
var $country_code;
var $country;
- var $pays_id; // deprecated
- var $pays_code; // deprecated
var $pays; // deprecated
var $email;
@@ -421,7 +419,7 @@ class Adherent extends CommonObject
$sql.= ", societe=" .($this->societe?"'".$this->db->escape($this->societe)."'":"null");
$sql.= ", fk_soc=" .($this->fk_soc > 0?"'".$this->fk_soc."'":"null");
$sql.= ", address=" .($this->address?"'".$this->db->escape($this->address)."'":"null");
- $sql.= ", cp=" .($this->zip?"'".$this->db->escape($this->zip)."'":"null");
+ $sql.= ", zip=" .($this->zip?"'".$this->db->escape($this->zip)."'":"null");
$sql.= ", town=" .($this->town?"'".$this->db->escape($this->town)."'":"null");
$sql.= ", pays=" .($this->country_id>0?"'".$this->country_id."'":"null");
$sql.= ", fk_departement=".($this->state_id>0?"'".$this->state_id."'":"null");
@@ -563,7 +561,7 @@ class Adherent extends CommonObject
$lthirdparty->tel=$this->phone;
$lthirdparty->state_id=$this->state_id;
$lthirdparty->country_id=$this->country_id;
- $lthirdparty->pays_id=$this->country_id;
+ $lthirdparty->country_id=$this->country_id;
//$lthirdparty->phone_mobile=$this->phone_mobile;
$result=$lthirdparty->update($this->fk_soc,$user,0,1,1,'update'); // Use sync to 0 to avoid cyclic updates
@@ -1069,8 +1067,6 @@ class Adherent extends CommonObject
$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
else
$this->country=$obj->country;
- $this->pays_id = $obj->country_id; // deprecated
- $this->pays_code = $obj->country_code; // deprecated
$this->pays = $this->country; // deprecated
$this->phone = $obj->phone;
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 9734562016d..59b2a6e2402 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -263,7 +263,6 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
$object->state_id = $_POST["departement_id"];
$object->country_id = $_POST["country_id"];
$object->fk_departement = $_POST["departement_id"]; // deprecated
- $object->pays_id = $_POST["country_id"]; // deprecated
$object->phone = trim($_POST["phone"]);
$object->phone_perso = trim($_POST["phone_perso"]);
@@ -438,7 +437,6 @@ if ($action == 'add' && $user->rights->adherent->creer)
$object->town = $town;
$object->fk_departement = $state_id;
$object->state_id = $state_id;
- $object->pays_id = $country_id;
$object->country_id = $country_id;
$object->phone = $phone;
$object->phone_perso = $phone_perso;
@@ -730,7 +728,6 @@ else
if ($object->country_id)
{
$tmparray=getCountry($object->country_id,'all');
- $object->pays_code=$tmparray['code'];
$object->pays=$tmparray['code'];
$object->country_code=$tmparray['code'];
$object->country=$tmparray['label'];
@@ -959,8 +956,6 @@ else
{
dol_print_error($db);
}
- $object->pays_id=$obj->rowid;
- $object->pays_code=$obj->code;
$object->pays=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
$object->country_id=$obj->rowid;
$object->country_code=$obj->code;
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index eb7cb1f9d56..271318258ee 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -67,7 +67,7 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$_POST["nom"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS",$_POST["address"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN",$_POST["town"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_INFO_SOCIETE_CP",$_POST["cp"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP",$_POST["zipcode"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_DEPARTEMENT",$_POST["departement_id"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL",$_POST["tel"],'chaine',0,'',$conf->entity);
@@ -280,7 +280,7 @@ if ($action == 'edit' || $action == 'updateedit')
$var=!$var;
print ''.$langs->trans("CompanyZip").' ';
- print ' '.$langs->trans("CompanyTown").' ';
@@ -649,7 +649,7 @@ else
print ' '.$langs->trans("CompanyAddress").' ' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . ' '.$langs->trans("CompanyZip").' ' . (empty($conf->global->MAIN_INFO_SOCIETE_CP)?'':$conf->global->MAIN_INFO_SOCIETE_CP) . ' '.$langs->trans("CompanyZip").' ' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . ' '.$langs->trans("CompanyTown").' ' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . ' '; continue; } // For region page, we do not show the country input
print '';
- print $form->select_country((! empty($obj->pays_code)?$obj->pays_code:(! empty($obj->pays)?$obj->pays:'')), 'pays', '', 28);
+ print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->pays)?$obj->pays:'')), 'pays', '', 28);
print ' ';
}
- elseif ($fieldlist[$field] == 'pays_id') {
- $pays_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
- print '';
diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php
index 7168ba977ba..102d43085c2 100644
--- a/htdocs/boutique/commande/class/boutiquecommande.class.php
+++ b/htdocs/boutique/commande/class/boutiquecommande.class.php
@@ -65,7 +65,7 @@ class BoutiqueCommande
{
global $conf;
- $sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value";
+ $sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_zipcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_zipcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value";
$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders";
$sql.= " WHERE orders_id = ".$id;
@@ -84,13 +84,13 @@ class BoutiqueCommande
$this->delivery_adr->name = stripslashes($array["delivery_name"]);
$this->delivery_adr->street = stripslashes($array["delivery_street_address"]);
- $this->delivery_adr->cp = stripslashes($array["delivery_postcode"]);
+ $this->delivery_adr->zip = stripslashes($array["delivery_zipcode"]);
$this->delivery_adr->city = stripslashes($array["delivery_city"]);
$this->delivery_adr->country = stripslashes($array["delivery_country"]);
$this->billing_adr->name = stripslashes($array["billing_name"]);
$this->billing_adr->street = stripslashes($array["billing_street_address"]);
- $this->billing_adr->cp = stripslashes($array["billing_postcode"]);
+ $this->billing_adr->zip = stripslashes($array["billing_zipcode"]);
$this->billing_adr->city = stripslashes($array["billing_city"]);
$this->billing_adr->country = stripslashes($array["billing_country"]);
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
index 598e48d2000..e7f0e83537f 100644
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -55,8 +55,8 @@ if ($id > 0)
print " ".$langs->trans("Address")." ".$langs->trans("Delivery")." ".$langs->trans("Invoice")." ".$commande->delivery_adr->name." ";
- print "".$commande->billing_adr->name." ";
+ print " ".$commande->delivery_adr->name." ";
+ print "".$commande->billing_adr->name." ";
print "";
print "";
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 7482fbdb674..9da1d910c0f 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -243,7 +243,7 @@ if ($socid)
print ''.$langs->trans('Address').' '.nl2br($soc->address).' '.$langs->trans('Zip').' '.$soc->cp." ";
+ print ''.$langs->trans('Zip').' '.$soc->zip." ";
print ''.$langs->trans('Town').' '.$soc->town." ';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.cp","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","",$param,'align="left"',$sortfield,$sortorder);
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 9e0d61f5e2b..727932c0f40 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -172,7 +172,7 @@ if ($action == 'cstc')
$formother=new FormOther($db);
-$sql = "SELECT s.rowid, s.nom, s.cp as zip, s.town, s.datec, s.datea, s.status as status,";
+$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.datea, s.status as status,";
$sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
$sql.= " d.nom as departement";
// Updated by Matelli
@@ -193,7 +193,7 @@ if ($catid == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'";
-if ($search_zipcode) $sql .= " AND s.cp LIKE '".$db->escape(strtolower($search_zipcode))."%'";
+if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape(strtolower($search_zipcode))."%'";
if ($search_town) $sql .= " AND s.town LIKE '%".$db->escape(strtolower($search_town))."%'";
if ($search_departement) $sql .= " AND d.nom LIKE '%".$db->escape(strtolower($search_departement))."%'";
if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
@@ -293,7 +293,7 @@ if ($resql)
print ' ';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.cp","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("State"),$_SERVER["PHP_SELF"],"s.fk_departement","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center"',$sortfield,$sortorder);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 9d4f3573b6c..fa6b412c457 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -71,7 +71,6 @@ class Account extends CommonObject
var $state;
var $fk_pays; // deprecated
- var $pays_code; // deprecated
var $pays; // deprecated
var $country_id;
var $country_code;
@@ -661,7 +660,6 @@ class Account extends CommonObject
$this->state = $obj->state;
$this->fk_pays = $obj->country_id; // deprecated
- $this->pays_code = $obj->country_code; // deprecated
$this->pays = $obj->country; // deprecated
$this->country_id = $obj->country_id;
$this->country_code = $obj->country_code;
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 4abf60b7cf5..a03f2cd8f5e 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -43,7 +43,7 @@ class Don extends CommonObject
var $lastname;
var $societe;
var $address;
- var $cp;
+ var $zip;
var $town;
var $pays;
var $email;
@@ -189,7 +189,7 @@ class Don extends CommonObject
$this->public = 1;
$this->societe = 'The Company';
$this->address = 'Twist road';
- $this->cp = '99999';
+ $this->zip = '99999';
$this->town = 'Town';
$this->note_public='SPECIMEN';
$this->email='email@email.com';
@@ -223,7 +223,7 @@ class Don extends CommonObject
$err++;
}
- if (dol_strlen(trim($this->cp)) == 0)
+ if (dol_strlen(trim($this->zip)) == 0)
{
$error_string[$err] = "Le code postal saisi est invalide";
$err++;
@@ -298,7 +298,7 @@ class Don extends CommonObject
// Clean parameters
$this->address=($this->address>0?$this->address:$this->address);
- $this->zip=($this->zip>0?$this->zip:$this->cp);
+ $this->zip=($this->zip>0?$this->zip:$this->zip);
$this->town=($this->town>0?$this->town:$this->town);
$this->country_id=($this->country_id>0?$this->country_id:$this->fk_pays);
$this->country=($this->country?$this->country:$this->pays);
@@ -314,7 +314,7 @@ class Don extends CommonObject
$sql.= ", lastname";
$sql.= ", societe";
$sql.= ", address";
- $sql.= ", cp";
+ $sql.= ", zip";
$sql.= ", town";
$sql.= ", pays";
$sql.= ", public";
@@ -383,7 +383,7 @@ class Don extends CommonObject
{
// Clean parameters
$this->address=($this->address>0?$this->address:$this->address);
- $this->zip=($this->zip>0?$this->zip:$this->cp);
+ $this->zip=($this->zip>0?$this->zip:$this->zip);
$this->town=($this->town>0?$this->town:$this->town);
$this->country_id=($this->country_id>0?$this->country_id:$this->fk_pays);
$this->country=($this->country?$this->country:$this->pays);
@@ -395,7 +395,7 @@ class Don extends CommonObject
$sql .= ",lastname='".$this->db->escape($this->lastname)."'";
$sql .= ",societe='".$this->db->escape($this->societe)."'";
$sql .= ",address='".$this->db->escape($this->address)."'";
- $sql .= ",cp='".$this->db->escape($this->zip)."'";
+ $sql .= ",zip='".$this->db->escape($this->zip)."'";
$sql .= ",town='".$this->db->escape($this->town)."'";
$sql .= ",pays='".$this->db->escape($this->country)."'"; // TODO use country_id
$sql .= ",public=".$this->public;
@@ -463,7 +463,7 @@ class Don extends CommonObject
global $conf;
$sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,";
- $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.cp, d.town, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
+ $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
$sql.= " p.title as project_label";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet";
@@ -488,9 +488,8 @@ class Don extends CommonObject
$this->societe = $obj->societe;
$this->statut = $obj->fk_statut;
$this->address = $obj->address;
- $this->cp = $obj->cp;
$this->town = $obj->town;
- $this->zip = $obj->cp;
+ $this->zip = $obj->zip;
$this->town = $obj->town;
$this->email = $obj->email;
$this->phone = $obj->phone;
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 3ffa3847ba3..9c4715cc406 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -90,7 +90,6 @@ if ($action == 'update')
$don->societe = $_POST["societe"];
$don->address = $_POST["address"];
$don->amount = price2num($_POST["amount"]);
- $don->cp = $_POST["zipcode"];
$don->town = $_POST["town"];
$don->zip = $_POST["zipcode"];
$don->town = $_POST["town"];
@@ -142,7 +141,6 @@ if ($action == 'add')
$don->societe = $_POST["societe"];
$don->address = $_POST["address"];
$don->amount = price2num($_POST["amount"]);
- $don->cp = $_POST["zipcode"];
$don->town = $_POST["town"];
$don->zip = $_POST["zipcode"];
$don->town = $_POST["town"];
@@ -488,7 +486,7 @@ if (! empty($id) && $action != 'edit')
print " ".''.$langs->trans("Address").' '.dol_nl2br($don->address).' ';
// Zip / Town
- print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").' '.$don->cp.($don->cp && $don->town?' / ':'').$don->town.' ';
+ print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").' '.$don->zip.($don->zip && $don->town?' / ':'').$don->town.' ';
// Country
print "".''.$langs->trans("Country").' '.$don->pays.' ';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 2d6f804d3d0..74b65ed6512 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2124,12 +2124,12 @@ if ($action == 'create')
print ''.$langs->trans('TotalVAT').' '.price($objectsrc->total_tva)." '.$langs->transcountry("AmountLT1",$mysoc->pays_code).' '.price($objectsrc->total_localtax1)." '.$langs->transcountry("AmountLT1",$mysoc->country_code).' '.price($objectsrc->total_localtax1)." '.$langs->transcountry("AmountLT2",$mysoc->pays_code).' '.price($objectsrc->total_localtax2)." '.$langs->transcountry("AmountLT2",$mysoc->country_code).' '.price($objectsrc->total_localtax2)." '.$langs->trans('TotalTTC').' '.price($objectsrc->total_ttc)." '.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
+ print ''.$langs->transcountry("AmountLT1",$mysoc->country_code).' ';
print ''.price($object->total_localtax1).' ';
print ''.$langs->trans("Currency".$conf->currency).' '.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
+ print ''.$langs->transcountry("AmountLT2",$mysoc->country_code).' ';
print ''.price($object->total_localtax2).' ';
print ''.$langs->trans("Currency".$conf->currency).' ".img_previous()." ";
$textnextyear=" ".img_next()." ";
-print_fiche_titre($langs->transcountry("LT2",$mysoc->pays_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
+print_fiche_titre($langs->transcountry("LT2",$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
print $langs->trans("VATReportBuildWithOptionDefinedInModule").'';
print '';
-print_titre($langs->transcountry("LT2Summary",$mysoc->pays_code));
+print_titre($langs->transcountry("LT2Summary",$mysoc->country_code));
print ' ';
-print_titre($langs->transcountry("LT2Paid",$mysoc->pays_code));
+print_titre($langs->transcountry("LT2Paid",$mysoc->country_code));
print ' ';
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index af621b7a53a..bc918816dc6 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -459,7 +459,6 @@ abstract class ActionsContactCardCommon
{
dol_print_error($this->db);
}
- $this->object->pays_code = $obj->code;
$this->object->pays = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
$this->object->country_code = $obj->code;
$this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 9c5ff1a2a6f..7b605130995 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -43,7 +43,6 @@ class Contact extends CommonObject
var $nom; // TODO deprecated
var $firstname;
var $address;
- var $cp; // TODO deprecated
var $zip;
var $town;
@@ -55,7 +54,6 @@ class Contact extends CommonObject
var $state; // Label of department
var $fk_pays; // deprecated
- var $pays_code; // deprecated
var $pays; // deprecated
var $country_id; // Id of country
var $country_code; // Code of country
@@ -222,7 +220,7 @@ class Contact extends CommonObject
$this->phone_perso=trim($this->phone_perso);
$this->phone_mobile=trim($this->phone_mobile);
$this->fax=trim($this->fax);
- $this->zip=($this->zip?$this->zip:$this->cp);
+ $this->zip=($this->zip?$this->zip:$this->zip);
$this->town=($this->town?$this->town:$this->town);
$this->country_id=($this->country_id > 0?$this->country_id:$this->fk_pays);
$this->state_id=($this->state_id > 0?$this->state_id:$this->fk_departement);
@@ -236,7 +234,7 @@ class Contact extends CommonObject
$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
$sql .= ", address='".$this->db->escape($this->address)."'";
- $sql .= ", cp='".$this->db->escape($this->zip)."'";
+ $sql .= ", zip='".$this->db->escape($this->zip)."'";
$sql .= ", town='".$this->db->escape($this->town)."'";
$sql .= ", fk_pays=".($this->country_id>0?$this->country_id:'NULL');
$sql .= ", fk_departement=".($this->state_id>0?$this->state_id:'NULL');
@@ -364,7 +362,7 @@ class Contact extends CommonObject
if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
}
if ($this->address && ! empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
- if ($this->cp && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->cp;
+ if ($this->zip && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
if ($this->town && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
if ($this->country_code && ! empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
if ($this->phone_pro && ! empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
@@ -482,7 +480,7 @@ class Contact extends CommonObject
$langs->load("companies");
$sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.lastname, c.firstname,";
- $sql.= " c.address, c.cp as zip, c.town as town,";
+ $sql.= " c.address, c.zip, c.town,";
$sql.= " c.fk_pays as country_id,";
$sql.= " c.fk_departement,";
$sql.= " c.birthday,";
@@ -514,7 +512,6 @@ class Contact extends CommonObject
$this->lastname = $obj->lastname;
$this->firstname = $obj->firstname;
$this->address = $obj->address;
- $this->cp = $obj->zip; // TODO deprecated
$this->zip = $obj->zip;
$this->town = $obj->town;
@@ -527,7 +524,6 @@ class Contact extends CommonObject
$this->fk_pays = $obj->country_id;
$this->country_id = $obj->country_id;
- $this->pays_code = $obj->country_id?$obj->country_code:'';
$this->country_code = $obj->country_id?$obj->country_code:'';
$this->pays = ($obj->country_id > 0)?$langs->transnoentitiesnoconv("Country".$obj->country_code):'';
$this->country = ($obj->country_id > 0)?$langs->transnoentitiesnoconv("Country".$obj->country_code):'';
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index b48236acf03..1bd291b5f25 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -585,7 +585,6 @@ else
if (isset($_POST["country_id"]) || $object->country_id)
{
$tmparray=getCountry($object->country_id,'all');
- $object->pays_code = $tmparray['code'];
$object->pays = $tmparray['label'];
$object->country_code = $tmparray['code'];
$object->country = $tmparray['label'];
@@ -881,10 +880,10 @@ else
dol_print_address($object->address,'gmap','contact',$object->id);
print ' '.$langs->trans("Zip").' / '.$langs->trans("Town").' ';
- print $object->cp;
- if ($object->cp) print ' ';
+ print $object->zip;
+ if ($object->zip) print ' ';
print $object->town.' '.dol_print_phone($obj->phone,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
+ print ''.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
// Phone mobile
- print ''.dol_print_phone($obj->phone_mobile,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
+ print ''.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
// Fax
- print ''.dol_print_phone($obj->fax,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
+ print ''.dol_print_phone($obj->fax,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
}
else
{
// Phone
- print ''.dol_print_phone($obj->phone,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
+ print ''.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').' ';
// EMail
print ''.dol_print_email($obj->email,$obj->cidp,$obj->socid,'AC_EMAIL',18).' ';
}
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 9638c5ff188..be1b820cb60 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -54,8 +54,8 @@ $v->setPhoneNumber($contact->phone_pro, "PREF;WORK;VOICE");
$v->setPhoneNumber($contact->phone_mobile, "CELL;VOICE");
$v->setPhoneNumber($contact->fax, "WORK;FAX");
-$v->setAddress("", "", $contact->address, $contact->town, "", $contact->cp, ($contact->pays_code?$contact->pays:''), "WORK;POSTAL");
-$v->setLabel("", "", $contact->address, $contact->town, "", $contact->cp, ($contact->pays_code?$contact->pays:''), "WORK");
+$v->setAddress("", "", $contact->address, $contact->town, "", $contact->zip, ($contact->country_code?$contact->pays:''), "WORK;POSTAL");
+$v->setLabel("", "", $contact->address, $contact->town, "", $contact->zip, ($contact->country_code?$contact->pays:''), "WORK");
$v->setEmail($contact->email,'internet,pref');
$v->setNote($contact->note);
@@ -67,7 +67,7 @@ if ($company->id)
$v->setURL($company->url, "WORK");
if (! $contact->phone_pro) $v->setPhoneNumber($company->tel, "WORK;VOICE");
if (! $contact->fax) $v->setPhoneNumber($company->fax, "WORK;FAX");
- if (! $contact->cp) $v->setAddress("", "", $company->address, $company->town, "", $company->cp, $company->pays_code, "WORK;POSTAL");
+ if (! $contact->zip) $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country_code, "WORK;POSTAL");
if ($company->email != $contact->email) $v->setEmail($company->email,'internet');
// Si contact lie a un tiers non de type "particulier"
if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->nom);
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 90ece7f36e4..1f4b6acb6fb 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -77,16 +77,16 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
}
else // Use table of third parties
{
- $sql = "SELECT DISTINCT s.cp as zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
+ $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
$sql.= ", p.code as country_code, p.libelle as country";
$sql.= ", d.code_departement as county_code , d.nom as county";
$sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON fk_departement = d.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_pays as p ON fk_pays = p.rowid';
$sql.= " WHERE";
- if ($zipcode) $sql.= " s.cp LIKE '".$db->escape($zipcode)."%'";
+ if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
if ($town) $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
- $sql.= " ORDER BY s.fk_pays, s.cp, s.town";
+ $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
$sql.= $db->plimit(50); // Avoid pb with bad criteria
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 72ae2f8a1af..268a5d712d3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -444,7 +444,7 @@ class Form
* @param string $htmloption Options html on select object
* @return void
*/
- function select_pays($selected='',$htmlname='pays_id',$htmloption='')
+ function select_pays($selected='',$htmlname='country_id',$htmloption='')
{
print $this->select_country($selected,$htmlname,$htmloption);
}
@@ -458,7 +458,7 @@ class Form
* @param string $maxlength Max length for labels (0=no limit)
* @return string HTML string with select
*/
- function select_country($selected='',$htmlname='pays_id',$htmloption='',$maxlength=0)
+ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxlength=0)
{
global $conf,$langs;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index eb42e4714b0..8ba3a161712 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1161,7 +1161,7 @@ function show_subsidiaries($conf,$langs,$db,$object)
$i=-1;
- $sql = "SELECT s.rowid, s.nom as name, s.address, s.cp as zip, s.town, s.code_client, s.canvas";
+ $sql = "SELECT s.rowid, s.nom as name, s.address, s.zip, s.town, s.code_client, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE s.parent = ".$object->id;
$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index b2360bb15bb..351b3fed386 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -909,7 +909,7 @@ function dol_meta_create($object)
if (is_dir($dir))
{
$nblignes = count($object->lines);
- $client = $object->client->nom . " " . $object->client->address . " " . $object->client->cp . " " . $object->client->town;
+ $client = $object->client->nom . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town;
$meta = "REFERENCE=\"" . $object->ref . "\"
DATE=\"" . dol_print_date($object->date,'') . "\"
NB_ITEMS=\"" . $nblignes . "\"
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 72bcfc58acb..596e8320671 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -293,7 +293,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact))."\n";
// Country
- if ($targetcontact->country_code && $targetcontact->country_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->pays_code))."\n";
+ if ($targetcontact->country_code && $targetcontact->country_code != $sourcecompany->country_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->pays_code))."\n";
if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS))
{
@@ -311,7 +311,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
{
$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
// Country
- if ($targetcompany->country_code && $targetcompany->country_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->pays_code))."\n";
+ if ($targetcompany->country_code && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->pays_code))."\n";
if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS))
{
diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
index c2023f10924..bc190ab0f5b 100644
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -67,7 +67,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
// Recupere emmetteur
$this->emetteur=$mysoc;
- if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2); // Par defaut, si n'�tait pas d�fini
+ if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default if not defined
// Defini position des colonnes
$this->line_height = 5;
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index fff62466958..4ba2a560f5d 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -82,7 +82,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
// Recupere emetteur
$this->emetteur=$mysoc;
- if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2); // Par defaut, si n'etait pas defini
+ if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default if not defined
}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 386179fe16d..4475f3ad8db 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -541,7 +541,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetFont('','', $default_font_size - 1);
// If France, show VAT mention if not applicable
- if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
+ if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
{
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
@@ -740,7 +740,7 @@ class pdf_einstein extends ModelePDFCommandes
$tvakey=str_replace('*','',$tvakey);
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
- $totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+ $totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->country_code).' ';
$totalvat.=vatrate($tvakey,1).$tvacompl;
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -774,7 +774,7 @@ class pdf_einstein extends ModelePDFCommandes
$tvakey=str_replace('*','',$tvakey);
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
- $totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+ $totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
$totalvat.=vatrate($tvakey,1).$tvacompl;
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -832,7 +832,7 @@ class pdf_einstein extends ModelePDFCommandes
$tvakey=str_replace('*','',$tvakey);
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
- $totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+ $totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->country_code).' ';
if ($localtax_type == '7') { // amount on order
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -872,7 +872,7 @@ class pdf_einstein extends ModelePDFCommandes
$tvakey=str_replace('*','',$tvakey);
$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
}
- $totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+ $totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
if ($localtax_type == '7') { // amount on order
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html
index 2a1d1cb16d7..5e6bcd510e4 100644
--- a/htdocs/core/modules/dons/html_cerfafr.html
+++ b/htdocs/core/modules/dons/html_cerfafr.html
@@ -66,7 +66,7 @@
__MAIN_INFO_SOCIETE_NOM____Address__ : __Zip__ : __MAIN_INFO_SOCIETE_CP____Zip__ : __MAIN_INFO_SOCIETE_ZIP____Town__ : __MAIN_INFO_SOCIETE_TOWN__';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'valign="middle"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.cp","",$param,'valign="middle"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,'valign="middle"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,'valign="middle"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
index 0fe65d30590..90ec1908a7d 100755
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -32,6 +32,7 @@ UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_backoff
UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_frontoffice.php';
UPDATE llx_const set value='MAIN_INFO_SOCIETE_ADDRESS' where value='MAIN_INFO_SOCIETE_ADRESSE';
UPDATE llx_const set value='MAIN_INFO_SOCIETE_TOWN' where value='MAIN_INFO_SOCIETE_VILLE';
+UPDATE llx_const set value='MAIN_INFO_SOCIETE_ZIP' where value='MAIN_INFO_SOCIETE_CP';
ALTER TABLE llx_user add COLUMN fk_user integer;
@@ -49,6 +50,7 @@ alter table llx_don CHANGE COLUMN adresse address text;
alter table llx_don CHANGE COLUMN ville town text;
alter table llx_don CHANGE COLUMN prenom firstname varchar(50);
alter table llx_don CHANGE COLUMN nom lastname varchar(50);
+alter table llx_don CHANGE COLUMN cp zip varchar(10);
alter table llx_adherent CHANGE COLUMN adresse address text;
alter table llx_adherent CHANGE COLUMN nom lastname varchar(50);
alter table llx_adherent CHANGE COLUMN prenom firstname varchar(50);
@@ -58,16 +60,16 @@ alter table llx_mailing_cibles CHANGE COLUMN nom lastname varchar(50);
alter table llx_mailing_cibles CHANGE COLUMN prenom firstname varchar(50);
alter table llx_user CHANGE COLUMN name lastname varchar(50);
alter table llx_entrepot CHANGE COLUMN ville town text;
+alter table llx_entrepot CHANGE COLUMN cp zip varchar(10);
alter table llx_societe CHANGE COLUMN ville town text;
+alter table llx_societe CHANGE COLUMN cp zip varchar(10);
alter table llx_socpeople CHANGE COLUMN name lastname varchar(50);
alter table llx_socpeople CHANGE COLUMN ville town text;
+alter table llx_socpeople CHANGE COLUMN cp zip varchar(10);
alter table llx_bank_account CHANGE COLUMN adresse_proprio owner_address text;
alter table llx_societe_rib CHANGE COLUMN adresse_proprio owner_address text;
+alter table llx_societe_address CHANGE COLUMN ville town text;
+alter table llx_societe_address CHANGE COLUMN cp zip varchar(10);
ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(256) NOT NULL AFTER description;
ALTER TABLE llx_c_shipment_mode MODIFY COLUMN rowid INT(11) NOT NULL AUTO_INCREMENT;
-
-INSERT INTO llx_c_shipment_mode (code,libelle,description,tracking,active) VALUES ('UPS','UPS','United Parcel Service','http://wwwapps.ups.com/etracking/tracking.cgi?InquiryNumber2=&InquiryNumber3=&tracknums_displayed=3&loc=fr_FR&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber22=&InquiryNumber32=&track=Track&Suivi.x=64&Suivi.y=7&Suivi=Valider&InquiryNumber1={TRACKID}',0);
-INSERT INTO llx_c_shipment_mode (code,libelle,description,tracking,active) VALUES ('KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}',0);
-INSERT INTO llx_c_shipment_mode (code,libelle,description,tracking,active) VALUES ('GLS','GLS','General Logistics Systems','http://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/FR01/FR/5004.htm?txtAction=71000&txtRefNo={TRACKID}',0);
-INSERT INTO llx_c_shipment_mode (code,libelle,description,tracking,active) VALUES ('CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}',0);
diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql
index d77707da347..6714a0644b2 100644
--- a/htdocs/install/mysql/tables/llx_c_pays.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql
@@ -17,6 +17,6 @@
-- ========================================================================
-ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_code (code);
-ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_code_iso (code_iso);
+ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_country_code (code);
+ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_country_code_iso (code_iso);
ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_libelle (libelle);
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 372122940f4..9d799128c4b 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -116,7 +116,7 @@ function html_print_paypal_footer($fromcompany,$langs)
$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
}
// Prof Id 1
- if ($fromcompany->idprof1 && ($fromcompany->pays_code != 'FR' || ! $fromcompany->idprof2))
+ if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
{
$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 3f597aae505..d26d20059fc 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -43,14 +43,12 @@ class Entrepot extends CommonObject
var $lieu;
var $address;
//! Code Postal
- var $cp; // deprecated
var $zip;
var $town;
var $country;
var $country_id;
var $country_code;
- var $pays_id; // deprecated
/**
@@ -143,9 +141,9 @@ class Entrepot extends CommonObject
$this->lieu=$this->db->escape(trim($this->lieu));
$this->address=$this->db->escape(trim($this->address));
- $this->zip=$this->zip?trim($this->zip):trim($this->cp);
- $this->town=$this->town?trim($this->town):trim($this->ville);
- $this->country_id=($this->country_id > 0 ? $this->country_id : $this->pays_id);
+ $this->zip=$this->zip?trim($this->zip):trim($this->zip);
+ $this->town=$this->town?trim($this->town):trim($this->town);
+ $this->country_id=($this->country_id > 0 ? $this->country_id : $this->country_id);
$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot ";
$sql .= " SET label = '" . $this->db->escape($this->libelle) ."'";
@@ -153,7 +151,7 @@ class Entrepot extends CommonObject
$sql .= ", statut = " . $this->statut;
$sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'";
$sql .= ", address = '" . $this->db->escape($this->address) ."'";
- $sql .= ", cp = '" . $this->db->escape($this->zip) ."'";
+ $sql .= ", zip = '" . $this->db->escape($this->zip) ."'";
$sql .= ", town = '" . $this->db->escape($this->town) ."'";
$sql .= ", fk_pays = " . $this->country_id;
$sql .= " WHERE rowid = " . $id;
@@ -246,7 +244,7 @@ class Entrepot extends CommonObject
{
global $conf;
- $sql = "SELECT rowid, label, description, statut, lieu, address, cp as zip, town, fk_pays as country_id";
+ $sql = "SELECT rowid, label, description, statut, lieu, address, zip, town, fk_pays as country_id";
$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
if ($id)
@@ -275,8 +273,6 @@ class Entrepot extends CommonObject
$this->statut = $obj->statut;
$this->lieu = $obj->lieu;
$this->address = $obj->address;
- $this->cp = $obj->zip; // deprecated
- $this->pays_id = $obj->country_id; // deprecated
$this->zip = $obj->zip;
$this->town = $obj->town;
$this->country_id = $obj->country_id;
@@ -284,7 +280,6 @@ class Entrepot extends CommonObject
include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
$tmp=getCountry($this->country_id,'all');
$this->pays=$tmp['label']; // deprecated
- $this->pays_code=$tmp['code']; // deprecated
$this->country=$tmp['label'];
$this->country_code=$tmp['code'];
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 07b01bb7d34..db8dbc6de1b 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -64,8 +64,6 @@ if ($action == 'add' && $user->rights->stock->creer)
$object->statut = $_POST["statut"];
$object->lieu = $_POST["lieu"];
$object->address = $_POST["address"];
- $object->cp = $_POST["zipcode"];
- $object->pays_id = $_POST["country_id"];
$object->zip = $_POST["zipcode"];
$object->town = $_POST["town"];
$object->country_id = $_POST["country_id"];
@@ -116,8 +114,6 @@ if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
$object->statut = $_POST["statut"];
$object->lieu = $_POST["lieu"];
$object->address = $_POST["address"];
- $object->cp = $_POST["zipcode"];
- $object->pays_id = $_POST["country_id"];
$object->zip = $_POST["zipcode"];
$object->town = $_POST["town"];
$object->country_id = $_POST["country_id"];
diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php
index e9ab3819d33..bde0c3e1858 100644
--- a/htdocs/product/stock/liste.php
+++ b/htdocs/product/stock/liste.php
@@ -45,7 +45,7 @@ $limit = $conf->liste_limit;
$offset = $limit * $page;
-$sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.cp, e.town, e.fk_pays";
+$sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
$sql.= " WHERE e.entity = ".$conf->entity;
if ($sref)
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 00d09e67112..6f32d9e4715 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -101,14 +101,14 @@ if (! $sortfield) { $sortfield="nom"; }
llxHeaderVierge($langs->trans("ListOfValidatedPublicMembers"));
-$sql = "SELECT rowid, firstname, lastname, societe, cp as zip, town, email, naiss, photo";
+$sql = "SELECT rowid, firstname, lastname, societe, zip, town, email, naiss, photo";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent";
$sql.= " WHERE entity = ".$entity;
$sql.= " AND statut = 1";
$sql.= " AND public = 1";
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($conf->liste_limit+1, $offset);
-//$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, cp, town, d.email, t.libelle as type, d.morphy, d.statut, t.cotisation";
+//$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, zip, town, d.email, t.libelle as type, d.morphy, d.statut, t.cotisation";
//$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
//$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = $statut";
//$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
@@ -129,7 +129,7 @@ if ($result)
print ' / '.$langs->trans("Company").' '."\n";
//print_liste_field_titre($langs->trans("DateToBirth"),"public_list.php","naiss",'',$param,$sortfield,$sortorder); // est-ce nécessaire ??
print_liste_field_titre($langs->trans("EMail"),"public_list.php","email",'',$param,$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Zip"),"public_list.php","cp","",$param,$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Zip"),"public_list.php","zip","",$param,$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Town"),"public_list.php","town","",$param,$sortfield,$sortorder);
print "".$langs->trans("Photo")." \n";
print " \n";
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 6ed4562a54d..85cae53fa2c 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -775,7 +775,7 @@ if (GETPOST("source") == 'contractline' && $valid)
$shipToStreet=$contract->thirdparty->address;
$shipToCity=$contract->thirdparty->town;
$shipToState=$contract->thirdparty->state_code;
- $shipToCountryCode=$contract->thirdparty->pays_code;
+ $shipToCountryCode=$contract->thirdparty->country_code;
$shipToZip=$contract->thirdparty->zip;
$shipToStreet2='';
$phoneNum=$contract->thirdparty->tel;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index abe85206fca..fc275858e94 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -119,7 +119,7 @@ if ($socid)
print "";
// Zip / Town
- print ''.$langs->trans('Zip').' '.$soc->cp." ";
+ print ''.$langs->trans('Zip').' '.$soc->zip." ";
print ''.$langs->trans('Town').' '.$soc->town."
trans('Zip'); ?>
- trans('Town'); ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 30794b2a604..7c99adc360b 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -82,7 +82,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
trans('Zip'); ?>
- control->tpl['cp']; ?>
+ control->tpl['zip']; ?>
trans('Town'); ?>
control->tpl['town']; ?>
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 7a8ba22dd41..911a69c710c 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -38,12 +38,9 @@ class Address
var $socid;
var $name;
var $address;
- var $cp; // deprecated
var $zip;
var $town;
- var $pays_id; // deprecated
var $country_id;
- var $pays_code; // deprecated
var $country_code;
var $tel; // deprecated
var $phone;
@@ -194,8 +191,8 @@ class Address
$sql.= " SET label = '" . $this->db->escape($this->label) ."'"; // Champ obligatoire
$sql.= ", name = '" . $this->db->escape($this->name) ."'"; // Champ obligatoire
$sql.= ", address = ".($this->address?"'".$this->db->escape($this->address)."'":"null");
- $sql.= ", cp = ".($this->zip?"'".$this->db->escape($this->zip)."'":"null");
- $sql.= ", ville = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
+ $sql.= ", zip = ".($this->zip?"'".$this->db->escape($this->zip)."'":"null");
+ $sql.= ", town = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
$sql.= ", fk_pays = '" . ($this->country_id?$this->country_id:'0') ."'";
$sql.= ", note = ".($this->note?"'".$this->db->escape($this->note)."'":"null");
$sql.= ", tel = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
@@ -270,7 +267,7 @@ class Address
{
$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 as zip, a.town, a.note, a.fk_pays as country_id, a.tel, a.fax';
+ $sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.tel, a.fax';
$sql .= ', p.code as country_code, p.libelle as country';
$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';
@@ -303,9 +300,6 @@ class Address
$line->note = $objp->note;
// deprecated
- $line->cp = $line->zip;
- $line->pays_id = $line->country_id;
- $line->pays_code = $line->country_code;
$line->pays = $line->country;
$line->tel = $line->phone;
@@ -348,7 +342,7 @@ class Address
$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 as zip, a.town, a.note, a.fk_pays as country_id, a.tel, a.fax';
+ $sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.tel, a.fax';
$sql .= ', p.code as country_code, p.libelle as country';
$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';
@@ -381,8 +375,6 @@ class Address
$this->note = $obj->note;
// deprecated
- $this->cp = $this->zip;
- $this->pays_id = $this->country_id;
$this->pays_code = $this->country_code;
$this->pays = $this->country;
$this->tel = $this->phone;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9125b950995..73395fdec1e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -49,7 +49,6 @@ class Societe extends CommonObject
var $particulier;
var $civility_id;
var $address;
- var $cp; // TODO obsolete
var $zip;
var $town;
var $status; // 0=activity ceased, 1= in activity
@@ -61,8 +60,6 @@ class Societe extends CommonObject
var $departement_code; // deprecated
var $departement; // deprecated
- var $pays_id; // deprecated
- var $pays_code; // deprecated
var $pays; // deprecated
var $country_id;
var $country_code;
@@ -394,12 +391,10 @@ class Societe extends CommonObject
$this->nom = trim($this->nom); // TODO obsolete
$this->ref_ext = trim($this->ref_ext);
$this->address = $this->address?trim($this->address):trim($this->address);
- $this->zip = $this->zip?trim($this->zip):trim($this->cp);
- $this->cp = $this->zip; // TODO obsolete
+ $this->zip = $this->zip?trim($this->zip):trim($this->zip);
$this->town = $this->town?trim($this->town):trim($this->town);
$this->state_id = trim($this->state_id);
- $this->country_id = ($this->country_id > 0)?$this->country_id:$this->pays_id;
- $this->pays_id = $this->country_id; // TODO obsolete
+ $this->country_id = ($this->country_id > 0)?$this->country_id:$this->country_id;
$this->phone = trim($this->phone?$this->phone:$this->tel);
$this->phone = preg_replace("/\s/","",$this->phone);
$this->phone = preg_replace("/\./","",$this->phone);
@@ -497,7 +492,7 @@ class Societe extends CommonObject
$sql .= ",datea = '".$this->db->idate($now)."'";
$sql .= ",address = '" . $this->db->escape($this->address) ."'";
- $sql .= ",cp = ".(! empty($this->zip)?"'".$this->zip."'":"null");
+ $sql .= ",zip = ".(! empty($this->zip)?"'".$this->zip."'":"null");
$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
@@ -696,7 +691,7 @@ class Societe extends CommonObject
$sql .= ', s.status';
$sql .= ', s.price_level';
$sql .= ', s.tms as date_update';
- $sql .= ', s.tel as phone, s.fax, s.email, s.url, s.cp as zip, s.town, s.note, s.client, s.fournisseur';
+ $sql .= ', s.tel as phone, s.fax, s.email, s.url, s.zip, s.town, s.note, s.client, s.fournisseur';
$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
$sql .= ', s.capital, s.tva_intra';
$sql .= ', s.fk_typent as typent_id';
@@ -758,12 +753,9 @@ class Societe extends CommonObject
$this->address = $obj->address;
$this->zip = $obj->zip;
- $this->cp = $obj->zip; // TODO obsolete
$this->town = $obj->town;
- $this->pays_id = $obj->country_id; // TODO obsolete
$this->country_id = $obj->country_id;
- $this->pays_code = $obj->country_id?$obj->country_code:''; // TODO obsolete
$this->country_code = $obj->country_id?$obj->country_code:'';
$this->pays = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->trans('Country'.$obj->country_code):$obj->country):''; // TODO obsolete
$this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->trans('Country'.$obj->country_code):$obj->country):'';
@@ -2438,12 +2430,9 @@ class Societe extends CommonObject
$this->nom=$name; // TODO obsolete
$this->name=$name;
$this->address=$member->address;
- $this->cp=$member->cp; // TODO obsolete
- $this->zip=$member->cp;
+ $this->zip=$member->zip;
$this->town=$member->town;
- $this->pays_code=$member->country_code; // TODO obsolete
$this->country_code=$member->country_code;
- $this->pays_id=$member->country_id; // TODO obsolete
$this->country_id=$member->country_id;
$this->tel=$member->phone; // deprecated
$this->phone=$member->phone; // Prof phone
@@ -2502,13 +2491,12 @@ class Societe extends CommonObject
$this->id=0;
$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
- $this->zip=empty($conf->global->MAIN_INFO_SOCIETE_CP)?'':$conf->global->MAIN_INFO_SOCIETE_CP;
+ $this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT)?'':$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;
$this->note=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
$this->nom=$this->name; // deprecated
- $this->cp=$this->zip; // deprecated
// We define country_id, country_code and country
$country_id=$country_code=$country_label='';
@@ -2529,9 +2517,7 @@ class Societe extends CommonObject
$country_label=getCountry($country_id,0,$db); // This need a SQL request, but it's the old feature
}
}
- $this->pays_id=$country_id; // TODO deprecated
$this->country_id=$country_id;
- $this->pays_code=$country_code; // TODO deprecated
$this->country_code=$country_code;
$this->country=$country_label;
if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 7156d7e8cd9..ca21354e8e3 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -125,7 +125,7 @@ if ($_GET["socid"])
print "".$langs->trans('Address')." ".nl2br($soc->address)." '.$langs->trans('Zip').' '.$soc->cp." ";
+ print ''.$langs->trans('Zip').' '.$soc->zip." ";
print ''.$langs->trans('Town').' '.$soc->town." '.$langs->trans('Country').' '.$soc->pays.' ';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 6140ccf4261..6ddb35b270b 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -583,7 +583,7 @@ else
if (! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; }
$object->name = GETPOST('nom');
- $object->firstname = GETPOST('prenom');
+ $object->firstname = GETPOST('firstname');
$object->particulier = $private;
$object->prefix_comm = GETPOST('prefix_comm');
$object->client = GETPOST('client')?GETPOST('client'):$object->client;
@@ -1114,7 +1114,7 @@ else
$object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = GETPOST('localtax2assuj_value');
- // We set country_id, and pays_code label of the chosen country
+ // We set country_id, and country_code label of the chosen country
// TODO move to DAO class
if ($object->country_id)
{
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 4434777be74..fefb218114b 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -485,8 +485,8 @@ function getContactsForThirdParty($authentication,$idthirdparty)
{
$linesinvoice=array();
- $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civility_id, c.name as lastname, c.firstname,";
- $sql.= " c.address, c.cp as zip, c.ville as town,";
+ $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civility_id, c.lastname, c.firstname,";
+ $sql.= " c.address, c.zip, c.town,";
$sql.= " c.fk_pays as country_id,";
$sql.= " c.fk_departement,";
$sql.= " c.birthday,";
@@ -495,7 +495,7 @@ function getContactsForThirdParty($authentication,$idthirdparty)
$sql.= " p.libelle as country, p.code as country_code,";
$sql.= " d.nom as state, d.code_departement as state_code,";
$sql.= " u.rowid as user_id, u.login as user_login,";
- $sql.= " s.nom as socname, s.address as socaddress, s.cp as soccp, s.ville as soccity, s.default_lang as socdefault_lang";
+ $sql.= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
@@ -535,7 +535,6 @@ function getContactsForThirdParty($authentication,$idthirdparty)
'fk_pays' => $contact->fk_pays?$contact->fk_pays:'',
'country_id' => $contact->country_id?$contact->country_id:'',
- 'pays_code' => $contact->pays_code?$contact->pays_code:'',
'country_code' => $contact->country_code?$contact->country_code:'',
'pays' => $contact->pays?$contact->pays:'',
'country' => $contact->country?$contact->country:'',
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index d2e26aa2527..91feba6bddf 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -194,14 +194,11 @@ if ($result >= 0)
//$member->societe;
$member->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
- $member->cp=$ldapuser[$conf->global->LDAP_FIELD_ZIP]; // deprecated
$member->zip=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
$member->town=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
$member->pays=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY]; // deprecated
$member->country=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];
- $member->pays_id=$countries[$hashlib2rowid[strtolower($member->country)]]['rowid']; // deprecated
$member->country_id=$countries[$hashlib2rowid[strtolower($member->country)]]['rowid'];
- $member->pays_code=$countries[$hashlib2rowid[strtolower($member->country)]]['code']; // deprecated
$member->country_code=$countries[$hashlib2rowid[strtolower($member->country)]]['code'];
$member->phone=$ldapuser[$conf->global->LDAP_FIELD_PHONE];
diff --git a/test/selenium/test_thirdparty.xml b/test/selenium/test_thirdparty.xml
index b6c70be2e79..704796cd4c2 100644
--- a/test/selenium/test_thirdparty.xml
+++ b/test/selenium/test_thirdparty.xml
@@ -33,7 +33,7 @@
selectAndWait
- pays_id
+ country_id
label=FR - France