diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 332d9d13e0b..778df650514 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2692,52 +2692,65 @@ if ($action == 'create' && $usercancreate) { print '
| '.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).' | '; - print ''.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | '; - print '|
| '.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).' | '; - print ''.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | '; - print '|
| '.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).' | '; - print ''.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | '; - print '|
| '.$langs->trans('AmountHT').' | '; - print ''.price($object->total_ht, 1, '', 1, -1, -1, $conf->currency).$alert.' | '; - // Total VAT - print '|
| '.$langs->trans('AmountVAT').' | '.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).' | |
| ' . $langs->trans('AmountHT') . ' | '; + print '' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . ' | '; + if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + // Multicurrency Amount HT + print '' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | '; + } + print '
| ' . $langs->trans('AmountVAT') . ' | '; + print '' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . ' | '; + if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + // Multicurrency Amount VAT + print '' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | '; + } + print '
| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | '; - print ''.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).' | |
| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | '; - print ''.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).' | |
| ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' | '; + print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . ' | '; + if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | '; + } + print '
| ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' | '; + print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . ' | '; + if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | '; + } + print '
| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).' | |
| ' . $langs->trans('AmountTTC') . ' | '; + print '' . price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency) . ' | '; + if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + // Multicurrency Amount TTC + print '' . price($object->total_ttc, 1, '', 1, -1, -1, $object->multicurrency_code) . ' | '; + } + print '