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

On déplace le champ "Frais de livraison" dans la facture

Browse Source
This commit is contained in:
Laurent LE CORRE
2020-05-08 10:21:46 +02:00
parent 649c92e52f
commit 914cfe3975
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
local/session/sess_626cc7572424060af857bf8311580d33
View File

Binary file not shown.

BIN
local/session/sess_81bdd48462de3f578ed871eb68abf9e8
View File

Binary file not shown.

BIN
local/session/sess_96c93632e3be69033eceddd59f82e85d
View File

Binary file not shown.

BIN
local/session/sess_e8a67c24b94967afecc41de529bb0a0b
View File

Binary file not shown.

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

@@ -323,6 +323,10 @@
<td class="table-3-1"><p>{intl l="Total without tax"}</p></td> <td class="table-3-1"><p>{intl l="Total without tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} 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>
<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>
{strip} {strip}
{capture name="tax"} {capture name="tax"}
{foreach $taxes as $name=>$prices} {foreach $taxes as $name=>$prices}
@@ -340,7 +344,7 @@
{/foreach} {/foreach}
{if $POSTAGE_TAX != 0} {if $POSTAGE_TAX != 0}
<tr> <tr>
<td class="table-3-2"><p>{intl l="Postage"}<br>{$POSTAGE_TAX_RULE_TITLE}blabla</p></td> <td class="table-3-2"><p>{intl l="Postage"}<br>{$POSTAGE_TAX_RULE_TITLE}</p></td>
<td class="table-3-2 align-right"><p>{format_money number=$POSTAGE_TAX currency_id=$CURRENCY}</p></td> <td class="table-3-2 align-right"><p>{format_money number=$POSTAGE_TAX currency_id=$CURRENCY}</p></td>
</tr> </tr>
{/if} {/if}
@@ -357,10 +361,6 @@
<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={$TOTAL_TAXED_AMOUNT - $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>
<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>
<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"}</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>