From 5bf5b9b16f2fd59d34c3e0c37ec2693395bd6f29 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 2 Nov 2014 21:12:40 +0100 Subject: [PATCH] Trips list --- htdocs/compta/deplacement/list.php | 71 +++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index bb2c50b42bf..da0e3e21dcd 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -27,6 +27,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("companies"); $langs->load("users"); @@ -37,6 +39,10 @@ $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement','',''); +$search_ref=GETPOST('search_ref','int'); +$search_name=GETPOST('search_name','alpha'); +$search_company=GETPOST('search_company','alpha'); +// $search_amount=GETPOST('search_amount','alpha'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -48,13 +54,24 @@ if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="d.dated"; $limit = $conf->liste_limit; -$search_ref=GETPOST('search_ref','alpha'); +$year=GETPOST("year"); +$month=GETPOST("month"); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_name=""; + $search_company=""; + // $search_amount=""; + $year=""; + $month=""; +} /* * View */ +$formother = new FormOther($db); $tripandexpense_static=new Deplacement($db); $userstatic = new User($db); @@ -76,10 +93,31 @@ $sql.= " AND d.entity = ".$conf->entity; if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')'; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; -if (trim($search_ref) != '') + +if ($search_ref) $sql.=" AND d.rowid=".$search_ref; +if ($search_name) { - $sql.= ' AND d.rowid LIKE \'%'.$db->escape(trim($search_ref)) . '%\''; + $sql .= natural_search('u.lastname', $search_name); } +if ($search_company) +{ + $sql .= natural_search('s.nom', $search_company); +} +// if ($search_amount) $sql.=" AND d.km='".$db->escape(price2num(trim($search_amount)))."'"; +if ($month > 0) +{ + if ($year > 0 && empty($day)) + $sql.= " AND d.dated BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'"; + else if ($year > 0 && ! empty($day)) + $sql.= " AND d.dated BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'"; + else + $sql.= " AND date_format(d.dated, '%m') = '".$month."'"; +} +else if ($year > 0) +{ + $sql.= " AND bc.date_bordereau BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; +} + $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); @@ -97,7 +135,7 @@ if ($resql) print ""; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","","&socid=$socid",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"d.type","","&socid=$socid",'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.lastname","","&socid=$socid",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socid=$socid",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("FeesKilometersOrAmout"),$_SERVER["PHP_SELF"],"d.km","","&socid=$socid",'align="right"',$sortfield,$sortorder); @@ -107,24 +145,27 @@ if ($resql) // Filters lines print ''; print ''; - print ''; + print ''; print ''; print ''; - //print ''; + print ' '; + print ''; + print ''; + if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + print ''; + $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; print ''; - //print ''; + print ''; print ''; - print ''; - print ' '; + print ''; + print ''; print ''; print ''; - print ' '; - print ''; - print ''; - print ' '; + // print ''; print ''; print ''; + print ''; print "\n"; $var=true; @@ -142,9 +183,9 @@ if ($resql) // Type print ''.$langs->trans($obj->type).''; // Date - print ''.dol_print_date($db->jdate($obj->dd),'day').''; + print ''.dol_print_date($db->jdate($obj->dd),'day').''; // User - print ''; + print ''; $userstatic->id = $obj->rowid; $userstatic->lastname = $obj->lastname; $userstatic->firstname = $obj->firstname;