lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: On contact list can set filter on both active and not active (no

Browse Source 
more exclusive select).
This commit is contained in:
Laurent Destailleur 2014-08-19 14:40:20 +02:00
parent 68aca6f2bb
commit 7437eb8088
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.7 compared to 3.6.* ***** ***** ChangeLog for 3.7 compared to 3.6.* *****
For users: For users:
- New: On contact list can set filter on both active and not active (no more exclusive select).
- New: Each user can include its own external ics calendar into dolibarr agenda view. - New: Each user can include its own external ics calendar into dolibarr agenda view.
- New: Intervention documents are now available in ECM module. - New: Intervention documents are now available in ECM module.
- New: Can attach supplier order to a customer order. - New: Can attach supplier order to a customer order.

4
htdocs/core/lib/company.lib.php
View File

@ -634,7 +634,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
// Status // Status
print '<td class="liste_titre maxwidthonsmartphone">'; print '<td class="liste_titre maxwidthonsmartphone">';
print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); print $form->selectarray('search_status', array('-1'=>'','0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
print '</td>'; print '</td>';
// Copy to clipboard // Copy to clipboard
@ -659,7 +659,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
$sql .= ", p.civilite as civility_id, p.address, p.zip, p.town"; $sql .= ", p.civilite as civility_id, p.address, p.zip, p.town";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p"; $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$object->id; $sql .= " WHERE p.fk_soc = ".$object->id;
if ($search_status!='') $sql .= " AND p.statut = ".$db->escape($search_status); if ($search_status!='' && $search_status != '-1') $sql .= " AND p.statut = ".$db->escape($search_status);
if ($search_name) $sql .= " AND (p.lastname LIKE '%".$db->escape($search_name)."%' OR p.firstname LIKE '%".$db->escape($search_name)."%')"; if ($search_name) $sql .= " AND (p.lastname LIKE '%".$db->escape($search_name)."%' OR p.firstname LIKE '%".$db->escape($search_name)."%')";
$sql.= " ORDER BY $sortfield $sortorder"; $sql.= " ORDER BY $sortfield $sortorder";