TheCoreDev/bio-concept-pharma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Début correction ano 0000019 : OK sur dates + OK sur inversion "unitaire HT" et "Taxe"

Browse Source
This commit is contained in:
Laurent LE CORRE
2020-03-27 09:47:07 +01:00
parent ce808d11e5
commit 239479d854
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/pdf/invoice.product-tab.tpl
View File

@@ -28,13 +28,13 @@
<tr> <tr>
<th class="product header small" width="{$layout.reference.width}%">{l s='Reference' d='Shop.Pdf' pdf='true'}</th> <th class="product header small" width="{$layout.reference.width}%">{l s='Reference' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.product.width}%">{l s='Product' d='Shop.Pdf' pdf='true'}</th> <th class="product header small" width="{$layout.product.width}%">{l s='Product' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.tax_code.width}%">{l s='Tax Rate' d='Shop.Pdf' pdf='true'}</th> <th class="product header-right small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.tax_code.width}%">{l s='Tax Rate' d='Shop.Pdf' pdf='true'}</th>
{if isset($layout.before_discount)} {if isset($layout.before_discount)}
<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Base price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th> <th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Base price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
{/if} {/if}
<th class="product header-right small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.quantity.width}%">{l s='Qty' d='Shop.Pdf' pdf='true'}</th> <th class="product header small" width="{$layout.quantity.width}%">{l s='Qty' d='Shop.Pdf' pdf='true'}</th>
<th class="product header-right small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th> <th class="product header-right small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
</tr> </tr>
@@ -68,12 +68,18 @@
{else} {else}
{$order_detail.product_name} {$order_detail.product_name}
{/if} {/if}
</td> </td>
<td class="product right">
{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
{if $order_detail.ecotax_tax_excl > 0}
<br>
<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
{/if}
</td>
<td class="product center"> <td class="product center">
{$order_detail.order_detail_tax_label} {$order_detail.order_detail_tax_label}
</td> </td>
{if isset($layout.before_discount)} {if isset($layout.before_discount)}
<td class="product center"> <td class="product center">
{if isset($order_detail.unit_price_tax_excl_before_specific_price)} {if isset($order_detail.unit_price_tax_excl_before_specific_price)}
@@ -84,13 +90,6 @@
</td> </td>
{/if} {/if}
<td class="product right">
{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
{if $order_detail.ecotax_tax_excl > 0}
<br>
<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
{/if}
</td>
<td class="product center"> <td class="product center">
{$order_detail.product_quantity} {$order_detail.product_quantity}
</td> </td>

8
web/pdf/invoice.summary-tab.tpl
View File

@@ -25,18 +25,18 @@
<table id="summary-tab" width="100%"> <table id="summary-tab" width="100%">
<tr> <tr>
<th class="header small" valign="middle">{l s='Invoice Number' d='Shop.Pdf' pdf='true'}</th> <th class="header small" valign="middle">{l s='Invoice Number' d='Shop.Pdf' pdf='true'}</th>
<th class="header small" valign="middle">{l s='Invoice Date' d='Shop.Pdf' pdf='true'}</th>
<th class="header small" valign="middle">{l s='Order Reference' d='Shop.Pdf' pdf='true'}</th>
<th class="header small" valign="middle">{l s='Order date' d='Shop.Pdf' pdf='true'}</th> <th class="header small" valign="middle">{l s='Order date' d='Shop.Pdf' pdf='true'}</th>
<th class="header small" valign="middle">{l s='Order Reference' d='Shop.Pdf' pdf='true'}</th>
<th class="header small" valign="middle">{l s='Invoice Date' d='Shop.Pdf' pdf='true'}</th>
{if $addresses.invoice->vat_number} {if $addresses.invoice->vat_number}
<th class="header small" valign="middle">{l s='VAT Number' d='Shop.Pdf' pdf='true'}</th> <th class="header small" valign="middle">{l s='VAT Number' d='Shop.Pdf' pdf='true'}</th>
{/if} {/if}
</tr> </tr>
<tr> <tr>
<td class="center small white">{$title|escape:'html':'UTF-8'}</td> <td class="center small white">{$title|escape:'html':'UTF-8'}</td>
<td class="center small white">{dateFormat date=$order->invoice_date full=0}</td>
<td class="center small white">{$order->getUniqReference()}</td>
<td class="center small white">{dateFormat date=$order->date_add full=0}</td> <td class="center small white">{dateFormat date=$order->date_add full=0}</td>
<td class="center small white">{$order->getUniqReference()}</td>
<td class="center small white">{dateFormat date=$order->invoice_date full=0}</td>
{if $addresses.invoice->vat_number} {if $addresses.invoice->vat_number}
<td class="center small white"> <td class="center small white">
{$addresses.invoice->vat_number} {$addresses.invoice->vat_number}