diff --git a/local/I18n/fr_FR.php b/local/I18n/fr_FR.php index 77a7d9c4..43cbaa6e 100644 --- a/local/I18n/fr_FR.php +++ b/local/I18n/fr_FR.php @@ -3,9 +3,7 @@ return [ 'pdf.default2020' => [ 'Discount' => 'Remise TTC', - 'Postage' => 'Frais de livraison TTC', - 'Total products with tax' => 'Total matériel TTC', - 'Total taxes' => 'Total taxes', + 'Postage' => 'Frais de livraison', 'Total with tax' => 'Total TTC', ], ]; diff --git a/templates/pdf/default2020/I18n/fr_FR.php b/templates/pdf/default2020/I18n/fr_FR.php index fb7919ce..fa482c45 100755 --- a/templates/pdf/default2020/I18n/fr_FR.php +++ b/templates/pdf/default2020/I18n/fr_FR.php @@ -15,6 +15,7 @@ return array( 'Payment module' => 'Module de paiement', 'Phone: ' => 'Tél.: ', 'Postage' => 'Frais de livraison', + 'Postage TTC' => 'Frais de livraison TTC', 'Product' => 'Produit', 'Product ref : ' => 'Réf. produit : ', 'Quantity' => 'Quantité', @@ -22,9 +23,9 @@ return array( 'Tax' => 'Taxe', 'Taxed total' => 'Total TTC', 'Total' => 'Total', - 'Total products with tax' => 'Total products with tax', 'Total products without tax' => 'Total matériel HT', 'Total taxes' => 'Total taxes', + 'Total to pay' => 'Total à payer', 'Total with tax' => 'Total matériel TTC', 'Total without tax' => 'Sous-total HT', 'Unit taxed price' => 'Prix unitaire TTC', diff --git a/templates/pdf/default2020/invoice.html b/templates/pdf/default2020/invoice.html index 68344f4d..2088a317 100644 --- a/templates/pdf/default2020/invoice.html +++ b/templates/pdf/default2020/invoice.html @@ -105,6 +105,9 @@ .table-3-module span { font-size: 11px; } + .section { + background-color: orange; + } .align-left { text-align: left; @@ -324,8 +327,10 @@

{intl l="Total products without tax"}

{format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY}

- + + + {strip} {capture name="tax"} {foreach $taxes as $name=>$prices} @@ -350,12 +355,10 @@ {/capture} {/strip} - + -

{intl l="Total without tax"}

-

{format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY}

+ Détail des taxes - {if $smarty.capture.tax ne ""} @@ -365,21 +368,21 @@ {$smarty.capture.tax nofilter} {/if} - - -

{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}

+

{format_money number=$TOTAL_TAXED_AMOUNT-$POSTAGE currency_id=$CURRENCY}

+ + + +

{intl l="Postage TTC"}

+

{format_money number=$POSTAGE currency_id=$CURRENCY}

+ + {if $DISCOUNT} @@ -389,7 +392,7 @@ {/if} -

{intl l="Total"}

+

{intl l="Total to pay"}

{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY}