lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: missing contactid and socid

Browse Source 
Fix: missing contact in event if no company
This commit is contained in:
Regis Houssin 2011-03-22 11:29:17 +00:00
parent 609d01d386
commit 745acdf313
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/fiche.php
View File

@ -573,7 +573,7 @@ if (GETPOST('action') == 'create')
print '</td></tr>'; print '</td></tr>';
// If company is forced, we propose contacts (may be contact is also forced) // 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>'; print '<tr><td nowrap>'.$langs->trans("ActionOnContact").'</td><td>';
$html->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1,1); $html->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1,1);

13
htdocs/contact/index.php
View File

@ -136,19 +136,19 @@ else
if ($search_nom) // filtre sur le nom if ($search_nom) // filtre sur le nom
{ {
$sql .= " AND p.name like '%".addslashes($search_nom)."%'"; $sql .= " AND p.name like '%".$db->escape($search_nom)."%'";
} }
if ($search_prenom) // filtre sur le prenom if ($search_prenom) // filtre sur le prenom
{ {
$sql .= " AND p.firstname like '%".addslashes($search_prenom)."%'"; $sql .= " AND p.firstname like '%".$db->escape($search_prenom)."%'";
} }
if ($search_societe) // filtre sur la societe if ($search_societe) // filtre sur la societe
{ {
$sql .= " AND s.nom like '%".addslashes($search_societe)."%'"; $sql .= " AND s.nom like '%".$db->escape($search_societe)."%'";
} }
if ($search_email) // filtre sur l'email if ($search_email) // filtre sur l'email
{ {
$sql .= " AND p.email like '%".addslashes($search_email)."%'"; $sql .= " AND p.email like '%".$db->escape($search_email)."%'";
} }
if ($type == "o") // filtre sur type if ($type == "o") // filtre sur type
{ {
@ -168,7 +168,7 @@ if ($type == "p") // filtre sur type
} }
if ($sall) if ($sall)
{ {
$sql .= " AND (p.name like '%".addslashes($sall)."%' OR p.firstname like '%".addslashes($sall)."%' OR p.email like '%".addslashes($sall)."%') "; $sql .= " AND (p.name like '%".$db->escape($sall)."%' OR p.firstname like '%".$db->escape($sall)."%' OR p.email like '%".$db->escape($sall)."%') ";
} }
if ($socid) if ($socid)
{ {
@ -339,8 +339,7 @@ if ($result)
// Links Add action and Export vcard // Links Add action and Export vcard
print '<td align="right">'; print '<td align="right">';
$link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
print $link;
print ' &nbsp; '; print ' &nbsp; ';
print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">'; print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
print img_picto($langs->trans("VCard"),'vcard.png').' '; print img_picto($langs->trans("VCard"),'vcard.png').' ';