From ee810d65dae3ddfd3bb67115e3abc83b9d4683a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 29 Jan 2024 01:52:43 +0100 Subject: [PATCH] Close #27842 --- htdocs/product/price.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 122001ce2f6..4df1f623fb5 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -2191,7 +2191,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) { print ''; - print "".$staticsoc->getNomUrl(1).""; + print ''.$staticsoc->getNomUrl(1).""; print ''.$line->ref_customer.''; print "".dol_print_date($line->datec, "dayhour", 'tzuserrel').""; print ''.$langs->trans($line->price_base_type).""; @@ -2307,10 +2307,10 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) { $pu = $object->price_ttc; } - // Local tax was not saved into table llx_product on old version. So we will use value linked to VAT code. + // Local tax was not saved into table llx_product on old versions. So we will use the value linked to the VAT code. $localtaxarray = getLocalTaxesFromRate($object->tva_tx.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), 0, $mysoc, $mysoc); // Define part of HT, VAT, TTC - $resultarray = calcul_price_total(1, $pu, 0, $object->tva_tx, 1, 1, 0, $object->price_base_type, $object->recuperableonly, $object->type, $mysoc, $localtaxarray); + $resultarray = calcul_price_total(1, $pu, 0, $object->tva_tx, 1, 1, 0, $object->price_base_type, 0, $object->type, $mysoc, $localtaxarray); // Calcul du total ht sans remise $total_ht = $resultarray[0]; $total_vat = $resultarray[1]; @@ -2398,7 +2398,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) { print ''; - print "".$staticsoc->getNomUrl(1).""; + print ''.$staticsoc->getNomUrl(1).""; print ''.dol_escape_htmltag($line->ref_customer).''; print "".dol_print_date($line->datec, "dayhour", 'tzuserrel').""; print ''.$langs->trans($line->price_base_type)."";