From eec04e2fe10fc5a4596b14f77c9ab68a138bdb57 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 25 Sep 2009 07:50:31 +0000 Subject: [PATCH] Fix: rowid of user is lost --- htdocs/comm/fiche.php | 10 +++++----- htdocs/lib/company.lib.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 4351c97c290..8a9d9131657 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -1,9 +1,9 @@ - * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2001-2005 Rodolphe Quiedeville + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 3933f01bf10..ec4221c986d 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -499,7 +499,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') $sql.= " a.propalrowid as pid, a.fk_commande as oid, a.fk_facture as fid,"; $sql.= " a.fk_user_author, a.fk_contact,"; $sql.= " c.code as acode, c.libelle,"; - $sql.= " u.login, u.rowid,"; + $sql.= " u.login, u.rowid as user_id,"; $sql.= " sp.name, sp.firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";