From 79529f3e844889ad5df3aa176f799d4a8d094014 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 22 Mar 2011 11:12:55 +0000
Subject: [PATCH] Fix: missing contactid and socid Fix: missing contact in
event if no company
---
htdocs/comm/action/fiche.php | 9 +++------
htdocs/contact/index.php | 7 +++----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 29ce354d1c6..b727d74686e 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -1,8 +1,8 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
- * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,6 @@ $actioncomm = new ActionComm($db);
$contact = new Contact($db);
-
/*
* Action creation de l'action
*/
@@ -410,8 +409,6 @@ if (GETPOST("action") == 'update')
}
}
-
-
/*
* View
*/
@@ -583,7 +580,7 @@ if (GETPOST('action') == 'create')
print '</td></tr>';
// If company is forced, we propose contacts (may be contact is also forced)
- if (GETPOST("socid") > 0)
+ if (GETPOST("contactid") > 0 || GETPOST("socid") > 0)
{
print '<tr><td nowrap>'.$langs->trans("ActionOnContact").'</td><td>';
$html->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1,1);
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index 97b5c4306d7..3dad11c8ca3 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -1,8 +1,8 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
- * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -346,8 +346,7 @@ if ($result)
// Links Add action and Export vcard
print '<td align="right">';
- $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&contactid='.$cid.'&socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
- print $link;
+ print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&backtopage=1&contactid='.$obj->cidp.'&socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
print ' ';
print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
print img_picto($langs->trans("VCard"),'vcard.png').' ';
--
GitLab