diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index c2c2ef9a452ee24dea709c0aff978fe82e376540..875b81cd05ee5d89937679bc2eda6abd4319a08e 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -34,6 +34,9 @@ elseif ($module == 'fichinter') { $permission=$user->rights->ficheinter->creer elseif ($module == 'invoice_supplier') { $permission=$user->rights->fournisseur->facture->creer; } elseif ($module == 'order_supplier') { $permission=$user->rights->fournisseur->commande->creer; } elseif ($module == 'project') { $permission=$user->rights->projet->creer; } +elseif ($module == 'action') { $permission=$user->rights->agenda->myactions->create; } +elseif ($module == 'shipping') { $permission=$user->rights->expedition->creer; } +elseif ($module == 'project_task') { $permission=$user->rights->projet->creer; } elseif (! isset($permission)) { $permission=$user->rights->$module->creer; } // If already defined by caller page $formcompany= new FormCompany($db); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 80ddc0cd1783720cf87e74ffd6d37f2feae20d76..27559938626605cc9b125536662fac3e43c3e86b 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -283,7 +283,7 @@ if ($id > 0 || ! empty($ref)) print '<input type="hidden" name="action" value="addcontact">'; print '<input type="hidden" name="source" value="internal">'; print '<input type="hidden" name="id" value="'.$id.'">'; - print '<input type="hidden" name="withproject" value="'.$withproject.'">'; + if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; // Ligne ajout pour contact interne print "<tr ".$bc[$var].">"; @@ -299,7 +299,7 @@ if ($id > 0 || ! empty($ref)) print '<td colspan="1">'; // On recupere les id des users deja selectionnes $contactsofproject=$projectstatic->getListContactId('internal'); - $form->select_users($user->id,'contactid',0,'',0,'',$contactsofproject); + $form->select_users($user->id,'userid',0,'',0,'',$contactsofproject); print '</td>'; print '<td>'; $formcompany->selectTypeContact($object, '', 'type','internal','rowid'); @@ -317,6 +317,7 @@ if ($id > 0 || ! empty($ref)) print '<input type="hidden" name="action" value="addcontact">'; print '<input type="hidden" name="source" value="external">'; print '<input type="hidden" name="id" value="'.$object->id.'">'; + if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; $var=!$var; print "<tr ".$bc[$var].">";