Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
192e181d8a
2 changed files with 2 additions and 2 deletions
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue