diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index d7b51735243..fb2ec070b3c 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2757,16 +2757,15 @@ if ($action == 'create') { print '' . $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)) { - print ' - ' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code); + print '' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; } print ''; - print ''; - print ''; + 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)) { - print ' - ' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code); + print '' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; } print ''; print ''; @@ -2776,16 +2775,15 @@ if ($action == 'create') { print '' . $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 '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; } print ''; - print ''; + if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { - print ''; 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 '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; } print ''; print ''; @@ -2795,6 +2793,9 @@ if ($action == 'create') { print ''; print '' . $langs->trans('AmountTTC') . ''; print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ''; + if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; + } print ''; print '';