';
- print '| ';
- print '';
-
- // Date start
- print ' | ';
- print '';
- $formother->select_year($year_start,'year_start',1, $min_year, $max_year);
- print ' | ';
-
- // Date end
- print '';
- print '';
- $formother->select_year($year_end,'year_end',1, $min_year, $max_year);
- print ' | ';
-
- // User
- if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
+ if (! empty($arrayfields['d.ref']['checked']))
{
- print '';
- print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
- print ' | ';
- } else {
- print ' | ';
+ print '';
+ print '';
+ print ' | ';
}
-
+ // User
+ if (! empty($arrayfields['user']['checked']))
+ {
+ if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
+ {
+ print '';
+ print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+ print ' | ';
+ } else {
+ print ' | ';
+ }
+ }
+ // Date start
+ if (! empty($arrayfields['d.date_debut']['checked']))
+ {
+ print '';
+ print '';
+ $formother->select_year($year_start,'year_start',1, $min_year, $max_year);
+ print ' | ';
+ }
+ // Date end
+ if (! empty($arrayfields['d.date_fin']['checked']))
+ {
+ print '';
+ print '';
+ $formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+ print ' | ';
+ }
// Amount with no tax
- print ' | ';
-
- print ' | ';
-
+ if (! empty($arrayfields['d.total_ht']['checked']))
+ {
+ print ' | ';
+ }
+ if (! empty($arrayfields['d.total_vat']['checked']))
+ {
+ print ' | ';
+ }
// Amount with all taxes
- print ' | ';
-
+ if (! empty($arrayfields['d.total_ttc']['checked']))
+ {
+ 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']))
+ {
+ $align=$extrafields->getAlignFlag($key);
+ $typeofextrafield=$extrafields->attribute_type[$key];
+ print '';
+ if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+ {
+ $crit=$val;
+ $tmpkey=preg_replace('/search_options_/','',$key);
+ $searchclass='';
+ if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+ if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+ print '';
+ }
+ 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;
+ // Date creation
+ if (! empty($arrayfields['d.datec']['checked']))
+ {
+ print '';
+ print ' | ';
+ }
+ // Date modification
+ if (! empty($arrayfields['d.tms']['checked']))
+ {
+ print '';
+ print ' | ';
+ }
// Status
- print '';
- select_expensereport_statut($search_status,'search_status',1,1);
+ if (! empty($arrayfields['d.fk_statut']['checked']))
+ {
+ print ' | ';
+ select_expensereport_statut($search_status,'search_status',1,1);
+ print ' | ';
+ }
+ // Action column
+ print '';
+ $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+ print $searchpitco;
print ' | ';
- print '';
- $searchpitco=$form->showFilterAndCheckAddButtons(0);
- print $searchpitco;
- print ' | ';
-
print "
\n";
$var=true;
@@ -318,7 +496,10 @@ if ($resql)
if ($num > 0)
{
- while ($i < min($num,$limit))
+ $i=0;
+ $var=true;
+ $totalarray=array();
+ while ($i < min($num,$limit))
{
$obj = $db->fetch_object($resql);
@@ -331,30 +512,113 @@ if ($resql)
$var=!$var;
print "";
- print '| ';
- print $expensereportstatic->getNomUrl(1);
- if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
- if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
- print ' | ';
- print ''.($obj->date_debut > 0 ? dol_print_date($obj->date_debut, 'day') : '').' | ';
- print ''.($obj->date_fin > 0 ? dol_print_date($obj->date_fin, 'day') : '').' | ';
- print '';
- $usertmp->id=$obj->id_user;
- $usertmp->lastname=$obj->lastname;
- $usertmp->firstname=$obj->firstname;
- $usertmp->login=$obj->login;
- $usertmp->statut=$obj->statut;
- $usertmp->photo=$obj->photo;
- print $usertmp->getNomUrl(-1);
- print ' | ';
- print ''.price($obj->total_ht).' | ';
- print ''.price($obj->total_tva).' | ';
- print ''.price($obj->total_ttc).' | ';
- print '';
- print $expensereportstatic->getLibStatut(5);
- print ' | ';
-
- print ' | ';
+ if (! empty($arrayfields['d.ref']['checked'])) {
+ print '';
+ print $expensereportstatic->getNomUrl(1);
+ if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
+ if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
+ print ' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ if (! empty($arrayfields['user']['checked'])) {
+ print '';
+ $usertmp->id=$obj->id_user;
+ $usertmp->lastname=$obj->lastname;
+ $usertmp->firstname=$obj->firstname;
+ $usertmp->login=$obj->login;
+ $usertmp->statut=$obj->statut;
+ $usertmp->photo=$obj->photo;
+ print $usertmp->getNomUrl(-1);
+ print ' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ if (! empty($arrayfields['d.date_debut']['checked'])) {
+ print ''.($obj->date_debut > 0 ? dol_print_date($obj->date_debut, 'day') : '').' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ if (! empty($arrayfields['d.date_fin']['checked'])) {
+ print ''.($obj->date_fin > 0 ? dol_print_date($obj->date_fin, 'day') : '').' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ // Amount HT
+ if (! empty($arrayfields['d.total_ht']['checked']))
+ {
+ print ''.price($obj->total_ht)." | \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
+ $totalarray['totalht'] += $obj->total_ht;
+ }
+ // Amount VAT
+ if (! empty($arrayfields['d.total_vat']['checked']))
+ {
+ print ''.price($obj->total_tva)." | \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
+ $totalarray['totalvat'] += $obj->total_tva;
+ }
+ // Amount TTC
+ if (! empty($arrayfields['d.total_ttc']['checked']))
+ {
+ print ''.price($obj->total_ttc)." | \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
+ $totalarray['totalttc'] += $obj->total_ttc;
+ }
+
+ // 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 '';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ }
+ }
+ // 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['d.datec']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+ print ' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ // Date modification
+ if (! empty($arrayfields['d.tms']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+ print ' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ // Status
+ if (! empty($arrayfields['d.fk_statut']['checked']))
+ {
+ print ''.$expensereportstatic->getLibStatut(5).' | ';
+ if (! $i) $totalarray['nbfield']++;
+ }
+ // Action column
+ print '';
+ if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ {
+ $selected=0;
+ if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+ print '';
+ }
+ print ' | ';
+ if (! $i) $totalarray['nbfield']++;
print "
\n";
@@ -364,33 +628,65 @@ if ($resql)
$i++;
}
-
- print '