|
@@ -1302,7 +1302,6 @@ if ($id > 0)
|
|
|
print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td>';
|
|
|
print '<input type="text" name="priority" value="'.($object->priority?$object->priority:'').'" size="5">';
|
|
|
print '</td></tr>';
|
|
|
-
|
|
|
// Object linked
|
|
|
if (! empty($object->fk_element) && ! empty($object->elementtype))
|
|
|
{
|
|
@@ -1610,8 +1609,9 @@ if ($id > 0)
|
|
|
print ($object->priority?$object->priority:'');
|
|
|
print '</td></tr>';
|
|
|
|
|
|
- // Object linked
|
|
|
- if (! empty($object->fk_element) && ! empty($object->elementtype))
|
|
|
+ // Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
|
|
|
+ // for such objects because there is already a dedicated field into table llx_actioncomm.
|
|
|
+ if (! empty($object->fk_element) && ! empty($object->elementtype) && ! in_array($object->elementtype, array('societe','contact','project')))
|
|
|
{
|
|
|
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
|
|
print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
|