Skip to content

Commit

Permalink
Fix: navigation on tab notes for shipment was not working.
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed May 6, 2014
1 parent 647d431 commit 215ff25
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -15,6 +15,7 @@ Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing.
Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents.
Fix: Suppliers invoice mask fails using {tttt} in numbering.
Fix: pdf template name for typhon was not correctly et when enabling module.
Fix: Navigation on notes for shipments was not working.

***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task.
Expand Down
25 changes: 24 additions & 1 deletion htdocs/expedition/note.php
Expand Up @@ -47,7 +47,30 @@
$result=restrictedArea($user, $origin, $origin_id);

$object = new Expedition($db);
$object->fetch($id);
if ($id > 0 || ! empty($ref))
{
$object->fetch($id, $ref);
$object->fetch_thirdparty();

if (!empty($object->origin))
{
$typeobject = $object->origin;
$origin = $object->origin;
$object->fetch_origin();
}

// Linked documents
if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
{
$objectsrc=new Commande($db);
$objectsrc->fetch($object->$typeobject->id);
}
if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
{
$objectsrc=new Propal($db);
$objectsrc->fetch($object->$typeobject->id);
}
}


/******************************************************************************/
Expand Down

0 comments on commit 215ff25

Please sign in to comment.