diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 5e327e1b706..1e846eaf74a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2596,45 +2596,45 @@ if ($action == 'create') {
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
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 ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount VAT
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 ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount TTC
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 ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
}
// Amount HT
print '| '.$langs->trans('AmountHT').' | ';
- print ''.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
// Amount VAT
print '| '.$langs->trans('AmountVAT').' | ';
- print ''.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
// Amount Local Taxes
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { // Localtax1
print '| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { // Localtax2
print '| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
}
// Amount TTC
print '| '.$langs->trans('AmountTTC').' | ';
- print ''.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
// Statut
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 80980a6abae..969c7acbb0d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2567,17 +2567,17 @@ if ($action == 'create' && $usercancreate) {
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
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 ''.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount VAT
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 ''.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount TTC
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 ''.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
}
@@ -2587,23 +2587,23 @@ if ($action == 'create' && $usercancreate) {
$alert = ' '.img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->order_min_amount));
}
print '| '.$langs->trans('AmountHT').' | ';
- print ''.price($object->total_ht, 1, '', 1, -1, -1, $conf->currency).$alert.' | ';
+ 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).' |
';
+ print '| '.$langs->trans('AmountVAT').' | '.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).' |
';
// Amount Local Taxes
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { // Localtax1
print '| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).' |
';
+ print ''.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).' | ';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { // Localtax2 IRPF
print '| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).' |
';
+ print ''.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).' | ';
}
// Total TTC
- print '| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).' |
';
+ print '| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).' |
';
// Statut
//print '| ' . $langs->trans('Status') . ' | ' . $object->getLibStatut(4) . ' |
';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index b1f746b2245..24d1671b37e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2301,17 +2301,17 @@ if ($action == 'create') {
if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
// Multicurrency Amount HT
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 ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount VAT
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 ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount TTC
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 ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
}
@@ -2321,27 +2321,29 @@ if ($action == 'create') {
$alert = ' '.img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->supplier_order_min_amount));
}
print '| '.$langs->trans("AmountHT").' | ';
- print ''.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).$alert.' | ';
+ print ''.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).$alert.' | ';
print '
';
// Total VAT
- print '| '.$langs->trans("AmountVAT").' | '.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).' | ';
+ print '
| '.$langs->trans("AmountVAT").' | ';
+ print ''.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).' | ';
print '
';
// Amount Local Taxes
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
print '| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency).' | ';
+ print ''.price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency).' | ';
print '
';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
print '| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency).' | ';
+ print ''.price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency).' | ';
print '
';
}
// Total TTC
- print '| '.$langs->trans("AmountTTC").' | '.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).' | ';
+ print '
| '.$langs->trans("AmountTTC").' | ';
+ print ''.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).' | ';
print '
';
print '';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 366b510737b..9e92a5fb4b6 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1778,45 +1778,45 @@ if ($action == 'create') {
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
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 ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount VAT
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 ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
// Multicurrency Amount TTC
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 ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print '
';
}
// Amount HT
print '| '.$langs->trans('AmountHT').' | ';
- print ''.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
// Amount VAT
print '| '.$langs->trans('AmountVAT').' | ';
- print ''.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
// Amount Local Taxes
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { // Localtax1
print '| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { // Localtax2
print '| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
}
// Amount TTC
print '| '.$langs->trans('AmountTTC').' | ';
- print ''.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
+ print ''.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).' | ';
print '
';
print '';