diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 884d156c98a..ec52ebd46e3 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -71,11 +71,11 @@ $search_public=GETPOST("search_public",'int'); $search_user=GETPOST('search_user','int'); $search_sale=GETPOST('search_sale','int'); -$day = GETPOST('day','int'); +$day = GETPOST('day','int'); $month = GETPOST('month','int'); -$year = GETPOST('year','int'); - +$year = GETPOST('year','int'); +if ($search_status == '') $search_status=-1; // -1 or 1 // Purge criteria if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers @@ -85,7 +85,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $search_societe=""; $search_year=""; $search_all=0; - $search_status=1; + $search_status=-1; $search_public=""; $search_sale=""; $search_user=''; @@ -115,7 +115,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; // We'll need this table joined to the select in order to filter by sale -if ($search_sale || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if ($search_user > 0) { $sql.=", ".MAIN_DB_PREFIX."element_contact as c"; @@ -152,17 +152,13 @@ else if ($year > 0) { $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } - if ($search_all) { $sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all); } - -if ($search_status!='') $sql .= " AND p.fk_statut = ".$db->escape($search_status); - +if ($search_status >= 0) $sql .= " AND p.fk_statut = ".$db->escape($search_status); if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public); - -if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale; +if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale; if ($search_user > 0) { $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='project' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user; @@ -171,6 +167,7 @@ if ($search_user > 0) $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit+1, $offset); +//print $sql; dol_syslog("list allowed project", LOG_DEBUG); $resql = $db->query($sql); @@ -179,28 +176,28 @@ if ($resql) $var=true; $num = $db->num_rows($resql); $i = 0; - + $param=''; if ($month) $param.='&month='.$month; if ($year) $param.='&year=' .$year; - if ($search_ref != '') $param.='&search_ref='.$search_ref; - if ($search_label != '') $param.='&search_label='.$search_label; - if ($search_societe != '') $param.='&search_societe='.$search_societe; - if ($search_status != '') $param.='&search_status='.$search_status; - if ($search_public != '') $param.='&search_public='.$search_public; + if ($search_ref != '') $param.='&search_ref='.$search_ref; + if ($search_label != '') $param.='&search_label='.$search_label; + if ($search_societe != '') $param.='&search_societe='.$search_societe; + if ($search_status >= 0) $param.='&search_status='.$search_status; + if ($search_public != '') $param.='&search_public='.$search_public; if ($search_user > 0) $param.='&search_user='.$search_user; if ($search_sale > 0) $param.='&search_sale='.$search_sale; - + $text=$langs->trans("Projects"); if ($mine) $text=$langs->trans('MyProjects'); print_barre_liste($text, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); print '
'; - + print ''; - - + + // Show description of content if ($mine) print $langs->trans("MyProjectsDesc").'

'; else @@ -208,7 +205,7 @@ if ($resql) if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'

'; else print $langs->trans("ProjectsPublicDesc").'

'; } - + // If the user can view prospects other than his' if ($user->rights->societe->client->voir || $socid) { @@ -218,7 +215,7 @@ if ($resql) $moreforfilter.='       '; } // If the user can view prospects other than his' - + if (($user->rights->societe->client->voir || $socid) && !$mine) { $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': '; @@ -231,7 +228,7 @@ if ($resql) print $moreforfilter; print ''; } - + print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder); @@ -255,23 +252,21 @@ if ($resql) print ''; print ''; print ''; - + print ''; - + print ''; - print ''; + print $form->selectarray('search_public',$array,$search_public); + print ''; + print ''; @@ -316,7 +311,7 @@ if ($resql) } print ''; - + // Sales Rapresentatives print ''; - + // Date end print ''; - + // Visibility print ''; + print ''; print "\n";
 '; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; $array=array(''=>'',0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject")); - print $form->selectarray('search_public',$array,$search_public); - print ''; - - print $form->selectarray('search_status', array(''=>'', '0'=>$langs->trans('Draft'),'1'=>$langs->trans('Opened'),'2'=>$langs->trans('Closed')),$search_status); - - 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 ''; if($objp->socid) @@ -350,12 +345,12 @@ if ($resql) print ' '; } print ''; print dol_print_date($db->jdate($objp->date_end),'day'); print ''; if ($objp->public) print $langs->trans('SharedProject'); @@ -364,7 +359,7 @@ if ($resql) // Status $projectstatic->statut = $objp->fk_statut; - print ''.$projectstatic->getLibStatut(5).''.$projectstatic->getLibStatut(5).'