From 881b3bc9361f825de0328fa044b1ec76af54beac Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 1 Mar 2013 18:11:34 +0100 Subject: [PATCH 1/3] Bug fix on contact list due to name column renamed --- htdocs/contact/list.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 950244c5b45..99c55c3fe65 100755 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -58,7 +58,7 @@ $userid=GETPOST('userid','int'); $begin=GETPOST('begin'); if (! $sortorder) $sortorder="ASC"; -if (! $sortfield) $sortfield="p.name"; +if (! $sortfield) $sortfield="p.lastname"; if ($page < 0) { $page = 0; } $limit = $conf->liste_limit; $offset = $limit * $page; @@ -114,7 +114,7 @@ llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Em $form=new Form($db); $sql = "SELECT s.rowid as socid, s.nom as name,"; -$sql.= " p.rowid as cidp, p.name as lastname, p.firstname, p.poste, p.email,"; +$sql.= " p.rowid as cidp, p.lastname as lastname, p.firstname, p.poste, p.email,"; $sql.= " p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv, p.tms,"; $sql.= " cp.code as country_code"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p"; @@ -144,7 +144,7 @@ else if ($search_lastname) // filtre sur le nom { - $sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'"; + $sql .= " AND p.lastname LIKE '%".$db->escape($search_lastname)."%'"; } if ($search_firstname) // filtre sur le prenom { @@ -200,7 +200,7 @@ else if ($type == "p") // filtre sur type } if ($sall) { - $sql .= " AND (p.name LIKE '%".$db->escape($sall)."%' OR p.firstname LIKE '%".$db->escape($sall)."%' OR p.email LIKE '%".$db->escape($sall)."%')"; + $sql .= " AND (p.lastname LIKE '%".$db->escape($sall)."%' OR p.firstname LIKE '%".$db->escape($sall)."%' OR p.email LIKE '%".$db->escape($sall)."%')"; } if (! empty($socid)) { @@ -256,7 +256,7 @@ if ($result) // Ligne des titres print ''; - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, $param, '', $sortfield,$sortorder); + print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder); if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder); From 803bee076c638e42a8d27883d526836f51bb0159 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 1 Mar 2013 18:20:42 +0100 Subject: [PATCH 2/3] Engish standardization correction + search by idprof1 possible --- htdocs/societe/soc.php | 2 +- htdocs/societe/societe.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1908e145b2e..b45bf5a8e59 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1253,7 +1253,7 @@ else print ''; // Address - print ''.$langs->trans('Address').''; diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index 9147d550242..5792661dd5e 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -85,6 +85,7 @@ if ($mode == 'search') $sql.= " OR s.code_client LIKE '%".$db->escape($socname)."%'"; $sql.= " OR s.email LIKE '%".$db->escape($socname)."%'"; $sql.= " OR s.url LIKE '%".$db->escape($socname)."%'"; + $sql.= " OR s.siren LIKE '%".$db->escape($socname)."%'"; if (!empty($conf->barcode->enabled)) { From da878282007e8b5cefe4240c0879e5bc6a2a42d3 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 1 Mar 2013 18:41:41 +0100 Subject: [PATCH 3/3] Fix bug # 740 : address copy --- htdocs/contact/fiche.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 80277c904ad..ac8ab1d2e58 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -605,11 +605,11 @@ else }); $("#copyaddressfromsoc").click(function() { - $(\'textarea[name="address"]\').text("'.addslashes($objsoc->address).'"); - $(\'input[name="zipcode"]\').val("'.addslashes($objsoc->zip).'"); - $(\'input[name="town"]\').val("'.addslashes($objsoc->town).'"); - $(\'select[name="country_id"]\').val("'.addslashes($objsoc->country_id).'"); - $(\'select[name="state_id"]\').val("'.addslashes($objsoc->state_id).'"); + $(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'"); + $(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'"); + $(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'"); + $(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'"); + $(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'"); }); })'."\n"; print ''."\n";