Merge pull request #7525 from hregis/5.0_bug2

Fix: two errors when you create invoice from shipping
This commit is contained in:
Laurent Destailleur 2017-10-02 01:25:35 +02:00 committed by GitHub
commit ea5c54ad9c

View File

@ -486,7 +486,8 @@ class Facture extends CommonInvoice
foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
{
$originforcontact = 'commande';
$originidforcontact = $value->id;
if (is_object($value)) $originidforcontact = $value->id;
else $originidforcontact = $value;
break; // We take first one
}
}