diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 5e9bad062f8..101b69d8d68 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -301,8 +301,7 @@ if (empty($reshook)) { $object->linked_objects['commande'] = $orderid; } elseif (!empty($srcObject->linkedObjectsIds['propal'])) { $proposalid = reset($srcObject->linkedObjectsIds['propal']); - - $object->linked_objects['commande'] = $proposalid; + $object->linked_objects['propal'] = $proposalid; } } diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 665751ff28f..5dcdffd95eb 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -189,6 +189,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO } } else { $thirdparty = $mysoc; + $result = 1; // No object to fetch (e.g. Setup -> Emails -> send test email): consider OK } if ($result > 0) {