From 345fb1f2af1f5bd6dd52da19bf3077948699d113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 13 Jun 2018 17:57:15 +0200 Subject: [PATCH] add fax to thirdparty list --- htdocs/societe/list.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 58043bc511c..0aaf9753453 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -70,6 +70,7 @@ $search_state=trim(GETPOST("search_state")); $search_region=trim(GETPOST("search_region")); $search_email=trim(GETPOST('search_email')); $search_phone=trim(GETPOST('search_phone')); +$search_fax=trim(GETPOST('search_fax')); $search_url=trim(GETPOST('search_url')); $search_idprof1=trim(GETPOST('search_idprof1')); $search_idprof2=trim(GETPOST('search_idprof2')); @@ -135,6 +136,7 @@ $fieldstosearchall = array( 's.siret'=>"ProfId2", 's.ape'=>"ProfId3", 's.phone'=>"Phone", + 's.fax'=>"Fax", ); if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4']='ProfId4'; if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5']='ProfId5'; @@ -178,6 +180,7 @@ $arrayfields=array( 's.email'=>array('label'=>"Email", 'checked'=>0), 's.url'=>array('label'=>"Url", 'checked'=>0), 's.phone'=>array('label'=>"Phone", 'checked'=>1), + 's.fax'=>array('label'=>"Fax", 'checked'=>0), 'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers), 's.siren'=>array('label'=>"ProfId1Short", 'checked'=>$checkedprofid1), 's.siret'=>array('label'=>"ProfId2Short", 'checked'=>$checkedprofid2), @@ -242,6 +245,7 @@ if (empty($reshook)) $search_country=''; $search_email=''; $search_phone=''; + $search_fax=''; $search_url=''; $search_idprof1=''; $search_idprof2=''; @@ -391,7 +395,7 @@ else dol_print_error($db); $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,"; $sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,"; -$sql.= " s.email, s.phone, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,"; +$sql.= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,"; $sql.= " s.tms as date_update, s.datec as date_creation,"; $sql.= " s.code_compta,s.code_compta_fournisseur,"; $sql.= " typent.code as typent_code,"; @@ -451,6 +455,7 @@ if ($search_region) $sql.= natural_search("region.nom",$search_region); if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')'; if ($search_email) $sql.= natural_search("s.email",$search_email); if (strlen($search_phone)) $sql.= natural_search("s.phone", $search_phone); +if (strlen($search_fax)) $sql.= natural_search("s.phone", $search_fax); if ($search_url) $sql.= natural_search("s.url",$search_url); if (strlen($search_idprof1)) $sql.= natural_search("s.siren",$search_idprof1); if (strlen($search_idprof2)) $sql.= natural_search("s.siret",$search_idprof2); @@ -541,6 +546,7 @@ if ($search_alias != '') $param.= "&search_alias=".urlencode($search_alias); if ($search_town != '') $param.= "&search_town=".urlencode($search_town); if ($search_zip != '') $param.= "&search_zip=".urlencode($search_zip); if ($search_phone != '') $param.= "&search_phone=".urlencode($search_phone); +if ($search_fax != '') $param.= "&search_fax=".urlencode($search_fax); if ($search_email != '') $param.= "&search_email=".urlencode($search_email); if ($search_url != '') $param.= "&search_url=".urlencode($search_url); if ($search_state != '') $param.= "&search_state=".urlencode($search_state); @@ -803,6 +809,13 @@ if (! empty($arrayfields['s.phone']['checked'])) print ''; print ''; } +if (! empty($arrayfields['s.fax']['checked'])) +{ + // Fax + print ''; + print ''; + print ''; +} if (! empty($arrayfields['s.url']['checked'])) { // Url @@ -971,6 +984,7 @@ if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titr if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder); if (! empty($arrayfields['s.email']['checked'])) print_liste_field_titre($arrayfields['s.email']['label'],$_SERVER["PHP_SELF"],"s.email","",$param,'',$sortfield,$sortorder); if (! empty($arrayfields['s.phone']['checked'])) print_liste_field_titre($arrayfields['s.phone']['label'],$_SERVER["PHP_SELF"],"s.phone","",$param,'',$sortfield,$sortorder); +if (! empty($arrayfields['s.fax']['checked'])) print_liste_field_titre($arrayfields['s.fax']['label'],$_SERVER["PHP_SELF"],"s.fax","",$param,'',$sortfield,$sortorder); if (! empty($arrayfields['s.url']['checked'])) print_liste_field_titre($arrayfields['s.url']['label'],$_SERVER["PHP_SELF"],"s.url","",$param,'',$sortfield,$sortorder); if (! empty($arrayfields['s.siren']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder); if (! empty($arrayfields['s.siret']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$param,'class="nowrap"',$sortfield,$sortorder); @@ -1123,7 +1137,12 @@ while ($i < min($num, $limit)) } if (! empty($arrayfields['s.phone']['checked'])) { - print "".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid)."\n"; + print "".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid)."\n"; + if (! $i) $totalarray['nbfield']++; + } + if (! empty($arrayfields['s.fax']['checked'])) + { + print "".dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid)."\n"; if (! $i) $totalarray['nbfield']++; } if (! empty($arrayfields['s.url']['checked']))