Conflicts:
	htdocs/public/payment/newpayment.php
This commit is contained in:
Laurent Destailleur 2017-09-12 18:37:54 +02:00
parent 6e3174e71a
commit 0744b5d91b

View File

@ -750,7 +750,8 @@ if (GETPOST("source") == 'contractline')
if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
{
$amount=$contractline->total_ttc;
if ($contractline->fk_product)
if ($contractline->fk_product && ! empty($conf->global->PAYMENT_USE_NEW_PRICE_FOR_CONTRACTLINES))
{
$product=new Product($db);
$result=$product->fetch($contractline->fk_product);