mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-24 15:48:55 +01:00
Merged in patch that some fields wheren't being displayed
This commit is contained in:
parent
d600ceb2a8
commit
b0f3a9f137
@ -138,7 +138,7 @@
|
|||||||
if (isset($phpgw_info["apps"]["timetrack"]["enabled"]) &&
|
if (isset($phpgw_info["apps"]["timetrack"]["enabled"]) &&
|
||||||
$phpgw_info["apps"]["timetrack"]["enabled"]) {
|
$phpgw_info["apps"]["timetrack"]["enabled"]) {
|
||||||
$phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,"
|
$phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,"
|
||||||
. "a.ab_email,a.ab_wphone,c.company_name "
|
. "a.ab_email,a.ab_wphone,c.company_name,a.ab_hphone,a.ab_fax,a.ab_mphone "
|
||||||
. "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
|
. "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
|
||||||
. "AND $filtermethod AND (a.ab_lastname like '"
|
. "AND $filtermethod AND (a.ab_lastname like '"
|
||||||
. "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
|
. "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
|
||||||
@ -146,10 +146,7 @@
|
|||||||
. "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
|
. "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
|
||||||
. "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit",__LINE__,__FILE__);
|
. "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit",__LINE__,__FILE__);
|
||||||
} else {
|
} else {
|
||||||
$phpgw->db->query("SELECT ab_id,ab_owner,ab_firstname,ab_lastname,"
|
$phpgw->db->query("SELECT * from addressbook WHERE $filtermethod AND (ab_lastname like '"
|
||||||
. "ab_email,ab_wphone,ab_company "
|
|
||||||
. "from addressbook "
|
|
||||||
. "WHERE $filtermethod AND (ab_lastname like '"
|
|
||||||
. "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
|
. "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
|
||||||
. "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
|
. "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
|
||||||
. "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
|
. "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
|
||||||
|
Loading…
Reference in New Issue
Block a user