diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
index 73fb5e06c76..7f461282359 100755
--- a/htdocs/comm/list.php
+++ b/htdocs/comm/list.php
@@ -47,6 +47,7 @@ if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="s.nom";
$search_nom=GETPOST("search_nom");
+$search_zipcode=GETPOST("search_zipcode");
$search_ville=GETPOST("search_ville");
$search_code=GETPOST("search_code");
$search_compta=GETPOST("search_compta");
@@ -77,6 +78,7 @@ if (GETPOST("button_removefilter_x"))
$search_sale='';
$socname="";
$search_nom="";
+ $search_zipcode="";
$search_ville="";
$search_idprof1='';
$search_idprof2='';
@@ -96,7 +98,7 @@ $thirdpartystatic=new Societe($db);
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
-$sql = "SELECT s.rowid, s.nom as name, s.client, s.ville, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.cp as zip, s.ville, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,";
$sql.= " s.datec, s.datea, s.canvas";
// We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
@@ -116,6 +118,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_ville) $sql.= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'";
if ($search_code) $sql.= " AND s.code_client LIKE '%".$db->escape(strtolower($search_code))."%'";
if ($search_compta) $sql.= " AND s.code_compta LIKE '%".$db->escape($search_compta)."%'";
@@ -176,6 +179,7 @@ if ($result)
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("Town"),$_SERVER["PHP_SELF"],"s.ville","",$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);
@@ -193,6 +197,10 @@ if ($result)
print ' ';
print '';
+ print '';
+ print ' ';
+ print ' ';
+
print '';
print ' ';
print ' ';
@@ -234,6 +242,7 @@ if ($result)
$thirdpartystatic->status=$obj->status;
print $thirdpartystatic->getNomUrl(1);
print '';
+ print ''.$obj->zip.' ';
print ''.$obj->ville.' ';
print ''.$obj->code_client.' ';
print ''.$obj->code_compta.' ';
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index f30fdcc943d..45efe02addd 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -40,6 +40,7 @@ $action = GETPOST('action','alpha');
$socname = GETPOST("socname",'alpha');
$stcomm = GETPOST("stcomm",'int');
$search_nom = GETPOST("search_nom");
+$search_zipcode = GETPOST("search_zipcode");
$search_ville = GETPOST("search_ville");
$search_departement = GETPOST("search_departement");
$search_datec = GETPOST("search_datec");
@@ -173,7 +174,7 @@ if ($action == 'cstc')
$formother=new FormOther($db);
-$sql = "SELECT s.rowid, s.nom, s.ville, s.datec, s.datea, s.status as status,";
+$sql = "SELECT s.rowid, s.nom, s.cp as zip, s.ville, 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
@@ -194,6 +195,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_ville) $sql .= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'";
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,6 +295,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("Town"),$_SERVER["PHP_SELF"],"s.ville","",$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);
@@ -309,7 +312,11 @@ if ($resql)
print ' ';
print '';
print ' ';
- print ' ';
+ print ' ';
+ print '';
+ print ' ';
+ print ' ';
+ print '';
print ' ';
print ' ';
print '';
@@ -386,6 +393,7 @@ if ($resql)
$prospectstatic->status=$obj->status;
print $prospectstatic->getNomUrl(1,'prospect');
print ' ';
+ print "".$obj->zip." ";
print "".$obj->ville." ";
print ''.$obj->departement.' ';
// Creation date
diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php
index f371931c374..6ed18f2392c 100644
--- a/htdocs/fourn/liste.php
+++ b/htdocs/fourn/liste.php
@@ -33,6 +33,7 @@ $langs->load("companies");
$socname = GETPOST("socname");
$search_nom = GETPOST("search_nom");
+$search_zipcode = GETPOST("search_zipcode");
$search_ville = GETPOST("search_ville");
$search_code_fournisseur = GETPOST("search_code_fournisseur");
$search_compta_fournisseur = GETPOST("search_compta_fournisseur");
@@ -78,7 +79,7 @@ $thirdpartystatic=new Societe($db);
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
-$sql = "SELECT s.rowid as socid, s.nom, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
+$sql = "SELECT s.rowid as socid, s.nom, s.cp as zip, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
$sql.= "code_fournisseur, code_compta_fournisseur";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -96,6 +97,7 @@ if ($socname)
$sortorder = "ASC";
}
if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape($search_nom)."%'";
+if ($search_zipcode) $sql .= " AND s.cp LIKE '%".$db->escape($search_zipcode)."%'";
if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape($search_ville)."%'";
if ($search_code_fournisseur) $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_code_fournisseur)."%'";
if ($search_compta_fournisseur) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_compta_fournisseur)."%'";
@@ -146,6 +148,7 @@ if ($resql)
print ' ';
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("Town"),$_SERVER["PHP_SELF"],"s.ville","",$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);
@@ -161,6 +164,8 @@ if ($resql)
print ' ';
+ print ' ';
+
print ' ';
print '';
@@ -197,7 +202,8 @@ if ($resql)
print ' ';
print $thirdpartystatic->getNomUrl(1,'supplier');
print " \n";
- print "".$obj->ville." \n";
+ print ''.$obj->zip.' '."\n";
+ print ''.$obj->ville.' '."\n";
print ''.$obj->code_fournisseur.' ';
print ''.$obj->code_compta_fournisseur.' ';
print '';