';
- print '| ';
- print '';
- print ' | ';
- print '';
- print '';
- print ' | ';
- print '';
- print '';
- print ' | ';
+ if (! empty($arrayfields['p.ref']['checked']))
+ {
+ print '';
+ print '';
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.title']['checked']))
+ {
+ print '';
+ print '';
+ print ' | ';
+ }
+ if (! empty($arrayfields['s.nom']['checked']))
+ {
+ print '';
+ print '';
+ print ' | ';
+ }
// Sale representative
- print ' | ';
+ if (! empty($arrayfields['commercial']['checked']))
+ {
+ print ' | ';
+ }
// Start date
- if (empty($conf->global->PROJECT_LIST_HIDE_STARTDATE))
+ if (! empty($arrayfields['p.dateo']['checked']))
{
print '';
if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
@@ -382,48 +416,78 @@ if ($resql)
print ' | ';
}
// End date
- print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
- print '';
- $formother->select_year($year?$year:-1,'year',1, 20, 5);
- print ' | ';
-
- print '';
- $array=array(''=>'',0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
- print $form->selectarray('search_public',$array,$search_public);
- print ' | ';
-
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
-
- if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
- {
+ if (! empty($arrayfields['p.datee']['checked']))
+ {
+ print '';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($year?$year:-1,'year',1, 20, 5);
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.public']['checked']))
+ {
+ print '';
+ $array=array(''=>'',0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
+ print $form->selectarray('search_public',$array,$search_public);
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.opp_amount']['checked']))
+ {
print '';
print ' | ';
+ }
+ if (! empty($arrayfields['p.fk_opp_status']['checked']))
+ {
print '';
print $formproject->selectOpportunityStatus('search_opp_status',$search_opp_status,1,1,1);
print ' | ';
}
-
- print '';
- print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('Draft'),'1'=>$langs->trans('Opened'),'2'=>$langs->trans('Closed')),$search_status);
- print ' | ';
- print '';
- print '';
- print '';
- print ' | ';
+ // Extra fields
+ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+ {
+ foreach($extrafields->attribute_label as $key => $val)
+ {
+ if (! empty($arrayfields["ef.".$key]['checked'])) print ' | ';
+ }
+ }
+ // Fields from hook
+ $parameters=array('arrayfields'=>$arrayfields);
+ $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ if (! empty($arrayfields['p.datec']['checked']))
+ {
+ // Date creation
+ print '';
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.tms']['checked']))
+ {
+ // Date modification
+ print '';
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.statut']['checked']))
+ {
+ print '';
+ print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('Draft'),'1'=>$langs->trans('Opened'),'2'=>$langs->trans('Closed')),$search_status);
+ print ' | ';
+ }
+ // Action column
+ print '';
+ print '';
+ print '';
+ print ' | ';
print '
'."\n";
while ($i < $num)
{
- $objp = $db->fetch_object($resql);
+ $obj = $db->fetch_object($resql);
- $projectstatic->id = $objp->projectid;
- $projectstatic->user_author_id = $objp->fk_user_creat;
- $projectstatic->public = $objp->public;
+ $projectstatic->id = $obj->projectid;
+ $projectstatic->user_author_id = $obj->fk_user_creat;
+ $projectstatic->public = $obj->public;
$userAccess = $projectstatic->restrictedProjectArea($user);
@@ -433,104 +497,151 @@ if ($resql)
print "";
// Project url
- print '| ';
- $projectstatic->ref = $objp->ref;
- print $projectstatic->getNomUrl(1);
- print ' | ';
-
+ if (! empty($arrayfields['p.ref']['checked']))
+ {
+ print '';
+ $projectstatic->ref = $obj->ref;
+ print $projectstatic->getNomUrl(1);
+ print ' | ';
+ }
// Title
- print '';
- print dol_trunc($objp->title,80);
- print ' | ';
-
+ if (! empty($arrayfields['p.title']['checked']))
+ {
+ print '';
+ print dol_trunc($obj->title,80);
+ print ' | ';
+ }
// Company
- print '';
- if ($objp->socid)
- {
- $socstatic->id=$objp->socid;
- $socstatic->name=$objp->name;
- print $socstatic->getNomUrl(1);
- }
- else
- {
- print ' ';
- }
- print ' | ';
-
-
+ if (! empty($arrayfields['s.nom']['checked']))
+ {
+ print '';
+ if ($obj->socid)
+ {
+ $socstatic->id=$obj->socid;
+ $socstatic->name=$obj->name;
+ print $socstatic->getNomUrl(1);
+ }
+ else
+ {
+ print ' ';
+ }
+ print ' | ';
+ }
// Sales Rapresentatives
- print '';
- if($objp->socid)
- {
- $listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
- $nbofsalesrepresentative=count($listsalesrepresentatives);
- if ($nbofsalesrepresentative > 3) // We print only number
- {
- print '';
- print $nbofsalesrepresentative;
- print '';
- }
- else if ($nbofsalesrepresentative > 0)
- {
- $userstatic=new User($db);
- $j=0;
- foreach($listsalesrepresentatives as $val)
- {
- $userstatic->id=$val['id'];
- $userstatic->lastname=$val['lastname'];
- $userstatic->firstname=$val['firstname'];
- $userstatic->email=$val['email'];
- print $userstatic->getNomUrl(1);
- $j++;
- if ($j < $nbofsalesrepresentative) print ', ';
- }
- }
- //else print $langs->trans("NoSalesRepresentativeAffected");
- }
- else
- {
- print ' ';
- }
- print ' | ';
-
+ if (! empty($arrayfields['commercial']['checked']))
+ {
+ print '';
+ if ($obj->socid)
+ {
+ $socstatic->id=$obj->socid;
+ $socstatic->name=$obj->name;
+ $listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
+ $nbofsalesrepresentative=count($listsalesrepresentatives);
+ if ($nbofsalesrepresentative > 3) // We print only number
+ {
+ print '';
+ print $nbofsalesrepresentative;
+ print '';
+ }
+ else if ($nbofsalesrepresentative > 0)
+ {
+ $userstatic=new User($db);
+ $j=0;
+ foreach($listsalesrepresentatives as $val)
+ {
+ $userstatic->id=$val['id'];
+ $userstatic->lastname=$val['lastname'];
+ $userstatic->firstname=$val['firstname'];
+ $userstatic->email=$val['email'];
+ print $userstatic->getNomUrl(1);
+ $j++;
+ if ($j < $nbofsalesrepresentative) print ', ';
+ }
+ }
+ //else print $langs->trans("NoSalesRepresentativeAffected");
+ }
+ else
+ {
+ print ' ';
+ }
+ print ' | ';
+ }
// Date start
- if (empty($conf->global->PROJECT_LIST_HIDE_STARTDATE))
- {
+ if (! empty($arrayfields['p.dateo']['checked']))
+ {
print '';
- print dol_print_date($db->jdate($objp->date_start),'day');
+ print dol_print_date($db->jdate($obj->date_start),'day');
print ' | ';
}
-
// Date end
- print '';
- print dol_print_date($db->jdate($objp->date_end),'day');
- print ' | ';
-
+ if (! empty($arrayfields['p.datee']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_end),'day');
+ print ' | ';
+ }
// Visibility
- print '';
- if ($objp->public) print $langs->trans('SharedProject');
- else print $langs->trans('PrivateProject');
- print ' | ';
-
- $parameters=array('obj' => $objp);
- $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
-
- if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
- {
+ if (! empty($arrayfields['p.public']['checked']))
+ {
+ print '';
+ if ($obj->public) print $langs->trans('SharedProject');
+ else print $langs->trans('PrivateProject');
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.opp_amount']['checked']))
+ {
print '';
- if ($objp->opp_status_code) print price($objp->opp_amount, 1, '', 1, - 1, - 1, $conf->currency);
+ if ($obj->opp_status_code) print price($obj->opp_amount, 1, '', 1, - 1, - 1, $conf->currency);
print ' | ';
-
- print '';
- if ($objp->opp_status_code) print $langs->trans("OppStatusShort".$objp->opp_status_code);
+ }
+ if (! empty($arrayfields['p.fk_opp_status']['checked']))
+ {
+ print ' | ';
+ if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
print ' | ';
}
-
+ // Extra fields
+ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+ {
+ foreach($extrafields->attribute_label as $key => $val)
+ {
+ if (! empty($arrayfields["ef.".$key]['checked']))
+ {
+ print 'getAlignFlag($key);
+ if ($align) print ' align="'.$align.'"';
+ print '>';
+ $tmpkey='options_'.$key;
+ print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+ print '';
+ }
+ }
+ }
+ // Fields from hook
+ $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ // Date creation
+ if (! empty($arrayfields['p.datec']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+ print ' | ';
+ }
+ // Date modification
+ if (! empty($arrayfields['p.tms']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+ print ' | ';
+ }
// Status
- $projectstatic->statut = $objp->fk_statut;
- print ''.$projectstatic->getLibStatut(5).' | ';
-
+ if (! empty($arrayfields['p.statut']['checked']))
+ {
+ $projectstatic->statut = $obj->fk_statut;
+ print ''.$projectstatic->getLibStatut(5).' | ';
+ }
+ // Action column
print ' | ';
print "
\n";
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index c4e769d6ffd..43812be515c 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -266,10 +266,12 @@ if ($result)
print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
}
+ $moreforfilter='';
+
$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
- print '