Merge pull request #8793 from atm-john/Fix_situation_discount_used

Fix creating next situation invoice if a discount was allready apply
This commit is contained in:
Laurent Destailleur 2018-05-18 12:18:58 +02:00 committed by GitHub
commit 7de812d2ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1362,11 +1362,26 @@ if (empty($reshook))
$object->origin = $origin;
$object->origin_id = $originid;
foreach ($object->lines as &$line)
foreach ($object->lines as $i => &$line)
{
$line->origin = $object->origin;
$line->origin_id = $line->id;
$line->fetch_optionals($line->id);
// Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée
if ($line->fk_remise_except)
{
$discount=new DiscountAbsolute($line->db);
$result=$discount->fetch($line->fk_remise_except);
if ($result > 0)
{
// Check if discount not already affected to another invoice
if ($discount->fk_facture_line > 0)
{
$line->fk_remise_except = 0;
}
}
}
}
}