From 57546cd581a73ee994bc934d58d2d8994dcccd49 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 8 Nov 2024 18:11:30 +0100 Subject: [PATCH] NEW Show detail of each multicurrency amount in popup of price --- htdocs/core/tpl/objectline_view.tpl.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index d8149f9a152..71dd2eb8396 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -304,10 +304,14 @@ if ($object->element == 'supplier_proposal' || $object->element == 'order_suppli } $tooltiponprice = ''; +$tooltiponpricemultiprice = ''; $tooltiponpriceend = ''; +$tooltiponpriceendmultiprice = ''; if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { $tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht); + $tooltiponpricemultiprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->multicurrency_total_ht); $tooltiponprice .= '
'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva); + $tooltiponpricemultiprice .= '
'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->multicurrency_total_tva); if (is_object($object->thirdparty)) { if ($senderissupplier) { $seller = $object->thirdparty; @@ -320,22 +324,30 @@ if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { if ($mysoc->useLocalTax(1)) { if (($seller->country_code == $buyer->country_code) || $line->total_localtax1 || $seller->useLocalTax(1)) { $tooltiponprice .= '
'.$langs->transcountry("TotalLT1", $seller->country_code).'='.price($line->total_localtax1); + $tooltiponpricemultiprice .= '
'.$langs->transcountry("TotalLT1", $seller->country_code).'='.price($line->multicurrency_total_localtax1); } else { $tooltiponprice .= '
'.$langs->transcountry("TotalLT1", $seller->country_code).'='.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").''; + $tooltiponpricemultiprice .= '
'.$langs->transcountry("TotalLT1", $seller->country_code).'='.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").''; } } if ($mysoc->useLocalTax(2)) { if ((isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) { $tooltiponprice .= '
'.$langs->transcountry("TotalLT2", $seller->country_code).'='.price($line->total_localtax2); + $tooltiponpricemultiprice .= '
'.$langs->transcountry("TotalLT2", $seller->country_code).'='.price($line->multicurrency_total_localtax2); } else { $tooltiponprice .= '
'.$langs->transcountry("TotalLT2", $seller->country_code).'='.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").''; + $tooltiponpricemultiprice .= '
'.$langs->transcountry("TotalLT2", $seller->country_code).'='.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").''; } } } $tooltiponprice .= '
'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc); + $tooltiponpricemultiprice .= '
'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->multicurrency_total_ttc); $tooltiponprice = ''; + $tooltiponpricemultiprice = ''; + $tooltiponpriceend = ''; + $tooltiponpriceendmultiprice = ''; } // VAT Rate @@ -446,7 +458,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) { if ($line->special_code == 3) { $coldisplay++; $colspanOptions = ''; - if (!empty($conf->multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { + if (isModEnabled('multicurrency') && $object->multicurrency_code != $conf->currency) { $coldisplay++; $colspanOptions = ' colspan="2"'; } @@ -459,7 +471,11 @@ if ($line->special_code == 3) { print $tooltiponpriceend; print ''; if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { - print ''.price($sign * $line->multicurrency_total_ht).''; + print ''; + print $tooltiponpricemultiprice; + print price($sign * $line->multicurrency_total_ht); + print $tooltiponpriceendmultiprice; + print ''; $coldisplay++; } }