diff --git a/ChangeLog b/ChangeLog index a169a80654b..00a07efb2d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed. - Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1749 ] Undefined $mailchimp +- Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index f0bdce25fca..8a6ebb0a3d4 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -57,7 +57,7 @@ $projectstatic = new Project($db); // Add new contact if ($action == 'addcontact' && $user->rights->projet->creer) { - $result = $object->fetch($id); + $result = $object->fetch($id, $ref); if ($result > 0 && $id > 0) { @@ -87,7 +87,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer) // bascule du statut d'un contact if ($action == 'swapstatut' && $user->rights->projet->creer) { - if ($object->fetch($id)) + if ($object->fetch($id, $ref)) { $result=$object->swapContactStatus(GETPOST('ligne')); } @@ -100,7 +100,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer) // Efface un contact if ($action == 'deleteline' && $user->rights->projet->creer) { - $object->fetch($id); + $object->fetch($id, $ref); $result = $object->delete_contact($_GET["lineid"]); if ($result >= 0) @@ -152,7 +152,7 @@ $userstatic = new User($db); if ($id > 0 || ! empty($ref)) { - if ($object->fetch($id) > 0) + if ($object->fetch($id, $ref) > 0) { $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); @@ -245,7 +245,7 @@ if ($id > 0 || ! empty($ref)) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; // Label diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 50763f839f7..03ca7bae452 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -209,7 +209,7 @@ if ($object->id > 0) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; print ''; diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index a6f8846ce0e..04e92c7c7f2 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -181,7 +181,7 @@ if ($object->id > 0) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; // Label diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 7136ffc43c5..8f72510adba 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -72,7 +72,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) if (! $error) { - $object->fetch($id); + $object->fetch($id, $ref); $object->timespent_note = $_POST["timespent_note"]; $object->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds @@ -109,7 +109,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree if (! $error) { - $object->fetch($id); + $object->fetch($id, $ref); $object->timespent_id = $_POST["lineid"]; $object->timespent_note = $_POST["timespent_note_line"]; @@ -183,7 +183,7 @@ if ($id > 0 || ! empty($ref)) /* * Fiche projet en mode visu */ - if ($object->fetch($id) >= 0) + if ($object->fetch($id, $ref) >= 0) { $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); @@ -277,7 +277,7 @@ if ($id > 0 || ! empty($ref)) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; // Label