diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index 97e12b17ceb65c621636e52a88f6301338ee072a..13c4301dad5a0c387630531356c60cc7a35706e7 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -146,8 +146,7 @@ $max=10; * Last modified donations */ -$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.societe, c.nom,"; -$sql.= " tms as datem, amount"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.societe, c.lastname, c.firstname, c.tms as datem, c.amount"; $sql.= " FROM ".MAIN_DB_PREFIX."don as c"; $sql.= " WHERE c.entity = ".$conf->entity; //$sql.= " AND c.fk_statut > 2"; @@ -183,7 +182,7 @@ if ($resql) print '<td class="nobordernopadding">'; print $obj->societe; print ($obj->societe && $obj->nom?' / ':''); - print $obj->nom; + print dolGetFirstLastname($obj->nom,$obj->firstname); print '</td>'; print '<td width="16" align="right" class="nobordernopadding">'; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 7f541e1b8db1f1ea16bc70fb46b9c06761173eec..978109ff67e00cb61b1854875df81401f73f35f1 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -372,7 +372,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print '<td nowrap="nowrap">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="100" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="110" class="nobordernopadding" nowrap="nowrap">'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; @@ -767,7 +767,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="100" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="110" class="nobordernopadding" nowrap="nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; @@ -864,7 +864,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print '<td nowrap="nowrap">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="100" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="110" class="nobordernopadding" nowrap="nowrap">'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 52f4c03f1fabe81a9a17f71fea8e850f741f866f..817396f97fcf51911349aa85262011fb56262e15 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1,7 +1,7 @@ <?php /* Copyright (C) 2000-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> - * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr> @@ -3638,6 +3638,21 @@ function get_date_range($date_start,$date_end,$format = '',$outputlangs='') return $out; } +/** + * Return firstname and lastname in correct order + * + * @param string $firstname Firstname + * @param string $lastname Lastname + * @return string Firstname + lastname or Lastname + firstname + */ +function dolGetFirstLastname($firstname,$lastname) +{ + global $conf; + if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) return $firstname.' '.$lastname; + else return $lastname.' '.$firstname; +} + + /** * Set event message in dol_events session *