diff --git a/local/I18n/fr_FR.php b/local/I18n/fr_FR.php index b6251283..77a7d9c4 100644 --- a/local/I18n/fr_FR.php +++ b/local/I18n/fr_FR.php @@ -1,4 +1,11 @@ [ + 'Discount' => 'Remise TTC', + 'Postage' => 'Frais de livraison TTC', + 'Total products with tax' => 'Total matériel TTC', + 'Total taxes' => 'Total taxes', + 'Total with tax' => 'Total TTC', + ], ]; diff --git a/templates/pdf/default2020/I18n/fr_FR.php b/templates/pdf/default2020/I18n/fr_FR.php index ca74d341..fb7919ce 100755 --- a/templates/pdf/default2020/I18n/fr_FR.php +++ b/templates/pdf/default2020/I18n/fr_FR.php @@ -1,6 +1,7 @@ 'Réf. combinaison : ', 'Customer Number' => 'Numéro de client', 'DELIVERY' => 'LIVRAISON', 'Delivery address' => 'Adresse de livraison', @@ -14,20 +15,20 @@ return [ 'Payment module' => 'Module de paiement', 'Phone: ' => 'Tél.: ', 'Postage' => 'Frais de livraison', - 'Postage without tax' => 'Frais de livraison HT', 'Product' => 'Produit', + 'Product ref : ' => 'Réf. produit : ', 'Quantity' => 'Quantité', 'Ref' => 'Réf.', 'Tax' => 'Taxe', - 'Total taxes' => 'Total taxes', 'Taxed total' => 'Total TTC', 'Total' => 'Total', - 'Total with tax' => 'Sous-total matériel TTC', - 'Total without tax' => 'Sous-total matériel HT', + 'Total products with tax' => 'Total products with tax', + 'Total products without tax' => 'Total matériel HT', + 'Total taxes' => 'Total taxes', + 'Total with tax' => 'Total matériel TTC', + 'Total without tax' => 'Sous-total HT', 'Unit taxed price' => 'Prix unitaire TTC', 'Unit. price' => 'Prix unitaire', - 'delivery.imprint' => 'delivery.imprint', - 'invoice.imprint' => 'invoice.imprint', 'page' => 'page', 'product' => 'Produit', -]; +); diff --git a/templates/pdf/default2020/invoice.html b/templates/pdf/default2020/invoice.html index 1242ba98..5f11c0e8 100644 --- a/templates/pdf/default2020/invoice.html +++ b/templates/pdf/default2020/invoice.html @@ -237,6 +237,9 @@
{intl l="Discount"} |
- {format_money number=$DISCOUNT currency_id=$CURRENCY} |
- ||
{intl l="Total without tax"} |
- {format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} currency_id=$CURRENCY} |
- ||
{intl l="Postage"} |
- {format_money number=$POSTAGE currency_id=$CURRENCY} |
+ {intl l="Total products without tax"} |
+ {format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY} |
+
{intl l="Total without tax"} |
+ {format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY} |
+ ||
{intl l="Total taxes"} |
@@ -355,10 +360,30 @@
|||
{intl l="Total with tax"} |
- {format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} currency_id=$CURRENCY} |
+ {intl l="Total products with tax"} |
+ {format_money number={$totalItemsPriceWtTaxes + $TOTAL_TAX} currency_id=$CURRENCY} |
{intl l="Postage"} |
+ {format_money number=$POSTAGE currency_id=$CURRENCY} |
+ ||
{intl l="Total with tax"} |
+ {format_money number={$totalItemsPriceWtTaxes + $TOTAL_TAX + $POSTAGE} currency_id=$CURRENCY} |
+ ||
{intl l="Discount"} |
+ -{format_money number=$DISCOUNT currency_id=$CURRENCY} |
+ ||
{intl l="Total"} |
{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY} |