TheCoreDev/domokits
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Modification de la facture pour intégrer taxe sur frais de port

Browse Source
This commit is contained in:
TheCoreDev
2020-12-09 15:08:03 +01:00
parent bd13055424
commit 5bffee869e
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
local/I18n/fr_FR.php
View File

@@ -3,9 +3,7 @@
return [ return [
'pdf.default2020' => [ 'pdf.default2020' => [
'Discount' => 'Remise TTC', 'Discount' => 'Remise TTC',
'Postage' => 'Frais de livraison TTC', 'Postage' => 'Frais de livraison',
'Total products with tax' => 'Total matériel TTC',
'Total taxes' => 'Total taxes',
'Total with tax' => 'Total TTC', 'Total with tax' => 'Total TTC',
], ],
]; ];

3
templates/pdf/default2020/I18n/fr_FR.php
View File

@@ -15,6 +15,7 @@ return array(
'Payment module' => 'Module de paiement', 'Payment module' => 'Module de paiement',
'Phone: ' => 'Tél.: ', 'Phone: ' => 'Tél.: ',
'Postage' => 'Frais de livraison', 'Postage' => 'Frais de livraison',
'Postage TTC' => 'Frais de livraison TTC',
'Product' => 'Produit', 'Product' => 'Produit',
'Product ref : ' => 'Réf. produit : ', 'Product ref : ' => 'Réf. produit : ',
'Quantity' => 'Quantité', 'Quantity' => 'Quantité',
@@ -22,9 +23,9 @@ return array(
'Tax' => 'Taxe', 'Tax' => 'Taxe',
'Taxed total' => 'Total TTC', 'Taxed total' => 'Total TTC',
'Total' => 'Total', 'Total' => 'Total',
'Total products with tax' => 'Total products with tax',
'Total products without tax' => 'Total matériel HT', 'Total products without tax' => 'Total matériel HT',
'Total taxes' => 'Total taxes', 'Total taxes' => 'Total taxes',
'Total to pay' => 'Total à payer',
'Total with tax' => 'Total matériel TTC', 'Total with tax' => 'Total matériel TTC',
'Total without tax' => 'Sous-total HT', 'Total without tax' => 'Sous-total HT',
'Unit taxed price' => 'Prix unitaire TTC', 'Unit taxed price' => 'Prix unitaire TTC',

39
templates/pdf/default2020/invoice.html
View File

@@ -105,6 +105,9 @@
.table-3-module span { .table-3-module span {
font-size: 11px; font-size: 11px;
} }
.section {
background-color: orange;
}
.align-left { .align-left {
text-align: left; text-align: left;
@@ -324,8 +327,10 @@
<tr> <tr>
<td class="table-3-1"><p>{intl l="Total products without tax"}</p></td> <td class="table-3-1"><p>{intl l="Total products without tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY}</p></td> <td class="table-3-1 align-right"><p>{format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY}</p></td>
<!-- <td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} currency_id=$CURRENCY}</p></td>-->
</tr> </tr>
<!-- Séparateur //-->
<tr><td colspan="2" class="table-3-1"></td></tr>
{strip} {strip}
{capture name="tax"} {capture name="tax"}
{foreach $taxes as $name=>$prices} {foreach $taxes as $name=>$prices}
@@ -350,12 +355,10 @@
{/capture} {/capture}
{/strip} {/strip}
<!-- Sous-total HT --> <!-- Détail des taxes -->
<tr> <tr>
<td class="table-3-1"><p>{intl l="Total without tax"}</p></td> <td colspan="2" class="table-3-1 section">Détail des taxes</td>
<td class="table-3-1 align-right"><p>{format_money number={$totalItemsPriceWtTaxes} currency_id=$CURRENCY}</p></td>
</tr> </tr>
<!-- Total taxes --> <!-- Total taxes -->
{if $smarty.capture.tax ne ""} {if $smarty.capture.tax ne ""}
<tr> <tr>
@@ -365,21 +368,21 @@
{$smarty.capture.tax nofilter} {$smarty.capture.tax nofilter}
{/if} {/if}
<!-- Total TTC --> <!-- Séparateur //-->
<tr> <tr><td colspan="2" class="table-3-1"></td></tr>
<td class="table-3-1" ><p>{intl l="Total products with tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$totalItemsPriceWtTaxes + $TOTAL_TAX} currency_id=$CURRENCY}</p></td> <!-- Total produits TTC -->
</tr>
<!-- Frais de livraison TTC -->
<tr>
<td class="table-3-1"><p>{intl l="Postage"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$POSTAGE currency_id=$CURRENCY}</p></td>
</tr>
<!-- Total TTC -->
<tr> <tr>
<td class="table-3-1" ><p>{intl l="Total with tax"}</p></td> <td class="table-3-1" ><p>{intl l="Total with tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$totalItemsPriceWtTaxes + $TOTAL_TAX + $POSTAGE} currency_id=$CURRENCY}</p></td> <td class="table-3-1 align-right"><p>{format_money number=$TOTAL_TAXED_AMOUNT-$POSTAGE currency_id=$CURRENCY}</p></td>
</tr> </tr>
<!-- Frais de livraison TTC -->
<tr>
<td class="table-3-1"><p>{intl l="Postage TTC"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$POSTAGE currency_id=$CURRENCY}</p></td>
</tr>
<!-- Remise --> <!-- Remise -->
{if $DISCOUNT} {if $DISCOUNT}
<tr> <tr>
@@ -389,7 +392,7 @@
{/if} {/if}
<!-- Total --> <!-- Total -->
<tr> <tr>
<td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total"}</h3></td> <td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total to pay"}</h3></td>
<td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY}</h3></td> <td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY}</h3></td>
</tr> </tr>
</table> </table>