diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c84fe2bd0fd..cb2ddc10801 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1929,11 +1929,13 @@ else $pagenext = $page + 1; $sql = 'SELECT s.nom, s.rowid, s.client, '; - $sql.= 'p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, '.$db->pdate('p.datep').' as dp,'.$db->pdate('p.fin_validite').' as dfv'; - if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; + $sql.= 'p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, '.$db->pdate('p.datep').' as dp,'.$db->pdate('p.fin_validite').' as dfv,'; + if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,"; + $sql.= ' u.login'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p'; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal'; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid'; $sql.= ' WHERE p.fk_soc = s.rowid'; if (!$user->rights->societe->client->voir && !$socid) //restriction @@ -1981,7 +1983,8 @@ else if ($result) { $propalstatic=new Propal($db); - + $userstatic=new User($db); + $num = $db->num_rows($result); $param='&socid='.$socid.'&viewstatut='.$viewstatut; @@ -1997,6 +2000,7 @@ else print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'p.datep','',$param, 'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('DateEndPropalShort'),$_SERVER["PHP_SELF"],'dfv','',$param, 'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Price'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder); print ' '; print "\n"; @@ -2008,7 +2012,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print $langs->trans('Month').': '; @@ -2022,6 +2026,7 @@ else print ''; print ''; print ''; + print ' '; print ''; $html->select_propal_statut($viewstatut); print ''; @@ -2097,9 +2102,15 @@ else } print ''.price($objp->total_ht)."\n"; - $propal=New Propal($db); - print ''.$propal->LibStatut($objp->fk_statut,5)."\n"; - print " "; + + $userstatic->id=$objp->fk_user_author; + $userstatic->login=$objp->login; + print ''.$userstatic->getLoginUrl(1)."\n"; + + print ''.$propalstatic->LibStatut($objp->fk_statut,5)."\n"; + + print ' '; + print "\n"; $total = $total + $objp->total_ht;