diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index 2c3951b66..12584484c 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1335,7 +1335,7 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
             $fClient->get_by_qcode($e_client);
             $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
                             ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
-                            $fClient->strAttribut(ATTR_DEF_CP).' '.
+                            $fClient->strAttribut(ATTR_DEF_POSTCODE).' '.
                             $fClient->strAttribut(ATTR_DEF_CITY).' ';
 
 
@@ -1590,7 +1590,7 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
 
         $client_name=h($client->getName().
                        ' '.$client->strAttribut(ATTR_DEF_ADRESS).' '.
-                       $client->strAttribut(ATTR_DEF_CP).' '.
+                       $client->strAttribut(ATTR_DEF_POSTCODE).' '.
                        $client->strAttribut(ATTR_DEF_CITY));
         $lPeriode=new Periode($this->db);
         if ($this->check_periode() == true)
diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php
index ff21e3444..e013f960f 100644
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@ -893,7 +893,7 @@ class Acc_Ledger_Sale extends Acc_Ledger {
 
         $client_name = $client->getName() .
                 ' ' . $client->strAttribut(ATTR_DEF_ADRESS) . ' ' .
-                $client->strAttribut(ATTR_DEF_CP) . ' ' .
+                $client->strAttribut(ATTR_DEF_POSTCODE) . ' ' .
                 $client->strAttribut(ATTR_DEF_CITY);
         $lPeriode = new Periode($this->db);
         if ($this->check_periode() == true) {
@@ -1480,7 +1480,7 @@ EOF;
             $fClient->get_by_qcode($e_client);
             $e_client_label = $fClient->strAttribut(ATTR_DEF_NAME) . ' ' .
                     ' Adresse : ' . $fClient->strAttribut(ATTR_DEF_ADRESS) . ' ' .
-                    $fClient->strAttribut(ATTR_DEF_CP) . ' ' .
+                    $fClient->strAttribut(ATTR_DEF_POSTCODE) . ' ' .
                     $fClient->strAttribut(ATTR_DEF_CITY) . ' ';
         }
 
diff --git a/include/class/document.class.php b/include/class/document.class.php
index 0fa3efd61..7c195ba73 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -840,7 +840,7 @@ class Document
 
                 $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
                 $tiers->get_by_qcode($qcode, false);
-                $r=$tiers->strAttribut(ATTR_DEF_CP,0);
+                $r=$tiers->strAttribut(ATTR_DEF_POSTCODE,0);
 
                 break;
             case 'CUST_CITY':
@@ -857,7 +857,7 @@ class Document
 
                 $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
                 $tiers->get_by_qcode($qcode, false);
-                $r=$tiers->strAttribut(ATTR_DEF_PAYS,0);
+                $r=$tiers->strAttribut(ATTR_DEF_COUNTRY,0);
 
                 break;
             // Marchandise in $p_array['e_march*']
@@ -922,7 +922,7 @@ class Document
                     break;
                 }
                 $tiers->get_by_qcode($qcode, false);
-                $r=$tiers->strAttribut(ATTR_DEF_CP,0);
+                $r=$tiers->strAttribut(ATTR_DEF_POSTCODE,0);
 
                 break;
             case 'BENEF_CITY':
@@ -949,7 +949,7 @@ class Document
                     break;
                 }
                 $tiers->get_by_qcode($qcode, false);
-                $r=$tiers->strAttribut(ATTR_DEF_PAYS,0);
+                $r=$tiers->strAttribut(ATTR_DEF_COUNTRY,0);
 
                 break;
             // Marchandise in $p_array['e_march*']
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 27ce929ad..b57325d90 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -1414,8 +1414,8 @@ class Fiche
             $r.="<TD sorttable_customkey=\"text{$accounting}\"> $e".$accounting."</TD>";
             $r.="<TD>".h($tiers->strAttribut(ATTR_DEF_NAME))."</TD>";
             $r.="<TD>".h($tiers->strAttribut(ATTR_DEF_ADRESS,0).
-                         " ".$tiers->strAttribut(ATTR_DEF_CP,0).
-                         " ".$tiers->strAttribut(ATTR_DEF_PAYS,0)).
+                         " ".$tiers->strAttribut(ATTR_DEF_POSTCODE,0).
+                         " ".$tiers->strAttribut(ATTR_DEF_COUNTRY,0)).
                 "</TD>";
             $r.='<td>'.linkTo($tiers->strAttribut(ATTR_DEF_WEBSITE,0)).'</td>';
             $str_deb=(($amount['debit']==0)?0:nbm($amount['debit']));
diff --git a/include/class/pre_op_ach.class.php b/include/class/pre_op_ach.class.php
index 4a2c896f3..6e2091ff9 100644
--- a/include/class/pre_op_ach.class.php
+++ b/include/class/pre_op_ach.class.php
@@ -230,7 +230,7 @@ class Pre_op_ach extends Pre_operation_detail
            $fClient->get_by_qcode($e_client);
            $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
                ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
-               $fClient->strAttribut(ATTR_DEF_CP).' '.
+               $fClient->strAttribut(ATTR_DEF_POSTCODE).' '.
                $fClient->strAttribut(ATTR_DEF_CITY).' ';
 
 
diff --git a/include/class/pre_op_ven.class.php b/include/class/pre_op_ven.class.php
index 5e93ffa9f..c579b574f 100644
--- a/include/class/pre_op_ven.class.php
+++ b/include/class/pre_op_ven.class.php
@@ -217,7 +217,7 @@ class Pre_op_ven extends Pre_operation_detail
             $fClient->get_by_qcode($e_client);
             $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
                             ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
-                            $fClient->strAttribut(ATTR_DEF_CP).' '.
+                            $fClient->strAttribut(ATTR_DEF_POSTCODE).' '.
                             $fClient->strAttribut(ATTR_DEF_CITY).' ';
 
 
diff --git a/include/constant.php b/include/constant.php
index 2c221034d..0182e7858 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -223,8 +223,8 @@ define("ATTR_DEF_PRIX_VENTE", 6);
 define("ATTR_DEF_TVA", 2);
 define("ATTR_DEF_NUMTVA", 13);
 define("ATTR_DEF_ADRESS", 14);
-define("ATTR_DEF_CP", 15);
-define("ATTR_DEF_PAYS", 16);
+define("ATTR_DEF_POSTCODE", 15);
+define("ATTR_DEF_COUNTRY", 16);
 define("ATTR_DEF_STOCK", 19);
 define("ATTR_DEF_TEL", 17);
 define("ATTR_DEF_EMAIL", 18);
@@ -247,6 +247,7 @@ define('ATTR_DEF_ACCOUNT_ND', 53);
 define('ATTR_DEF_ACTIF', 54);
 define('ATTR_DEF_SIREN', 55);
 define('ATTR_DEF_SIRET', 56);
+define('ATTR_DEF_COUNTRY_CODE', 56);
 
 define("FICHE_TYPE_CLIENT", 9);
 define("FICHE_TYPE_VENTE", 1);