diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 2d9241301a6d390e26cd6f3c5c22a228140e61cc..9b4d37d63358291b304b16fa6c1b1c84b0b466c0 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Cédric Salvador <csalvador@gpcsolutions.fr> * Copyright (C) 2012-2014 Raphaël Dourseanud <rdoursenaud@gpcsolutions.fr> - * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es> + * Copyright (C) 2014-2106 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * @@ -633,18 +633,18 @@ if (! empty($conf->expensereport->enabled)) $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author"; $sql.= " WHERE p.entity = ".getEntity('expensereport',1); - $sql.= " AND p.fk_statut>5"; + $sql.= " AND p.fk_statut>=5"; $column='p.date_valid'; } else { - $sql = "SELECT p.rowid, p.ref, u.firstname, u.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc"; + $sql = "SELECT p.rowid, p.ref, u.rowid as userid, u.firstname, u.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id"; $sql.= " WHERE p.entity = ".getEntity('expensereport',1); - $sql.= " AND p.fk_statut=6"; + $sql.= " AND p.fk_statut>=5"; $column='pe.datep'; } @@ -654,7 +654,7 @@ if (! empty($conf->expensereport->enabled)) if (! empty($date_start) && ! empty($date_end)) $sql.= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'"; - $sql.= " GROUP BY p.rowid, p.ref, u.firstname, u.lastname, dm"; + $sql.= " GROUP BY u.rowid, p.rowid, p.ref, u.firstname, u.lastname, dm"; $sql.= " ORDER BY p.ref"; dol_syslog("get expense report outcome"); @@ -677,7 +677,7 @@ if (! empty($conf->expensereport->enabled)) $var = !$var; print "<tr ".$bc[$var]."><td> </td>"; - print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/card.php?id=".$obj->rowid."\">".$obj->ref.' ('.$obj->firstname." ".$obj->lastname.")</a></td>\n"; + print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n"; if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount_ht).'</td>'; print '<td align="right">'.price(-$obj->amount_ttc).'</td>'; diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index a98ce53ae8105f1ea1d9dc9b1e8beec3f2d63195..861b44edd6c779cf353c7e0d90c80a7da6e56875 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> - * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es> + * Copyright (C) 2014-2016 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * @@ -529,7 +529,7 @@ if (! empty($conf->expensereport->enabled)) $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author"; $sql.= " WHERE p.entity = ".getEntity('expensereport',1); - $sql.= " AND p.fk_statut>5"; + $sql.= " AND p.fk_statut>=5"; $column='p.date_valid'; @@ -540,7 +540,7 @@ if (! empty($conf->expensereport->enabled)) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id"; $sql.= " WHERE p.entity = ".getEntity('expensereport',1); - $sql.= " AND p.fk_statut=6"; + $sql.= " AND p.fk_statut>=5"; $column='pe.datep'; }