Merge pull request 'Added warning text for non returned packagings' (#737) from 3097-delivery_note_text into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #737 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
commit
2846089f8e
|
|
@ -118,20 +118,20 @@
|
|||
</table>
|
||||
<!-- End of sales block -->
|
||||
|
||||
<div class="columns">
|
||||
<div class="columns vn-mb-ml">
|
||||
<!-- Services block-->
|
||||
<div class="size100 no-page-break" v-if="services.length > 0">
|
||||
<h2>{{$t('services')}}</h2>
|
||||
<h2>{{$t('services.title')}}</h2>
|
||||
<table class="column-oriented">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="5%"></th>
|
||||
<th class="number">{{$t('quantity')}}</th>
|
||||
<th width="50%">{{$t('concept')}}</th>
|
||||
<th class="number">{{$t('price')}}</th>
|
||||
<th class="number">{{$t('services.theader.quantity')}}</th>
|
||||
<th width="50%">{{$t('services.theader.concept')}}</th>
|
||||
<th class="number">{{$t('services.theader.price')}}</th>
|
||||
<th class="centered" width="5%"></th>
|
||||
<th class="centered">{{$t('vat')}}</th>
|
||||
<th class="number">{{$t('amount')}}</th>
|
||||
<th class="centered">{{$t('services.theader.vat')}}</th>
|
||||
<th class="number">{{$t('services.theader.amount')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -148,25 +148,26 @@
|
|||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="6" class="font bold">
|
||||
<span class="pull-right">{{$t('subtotal')}}</span>
|
||||
<span class="pull-right">{{$t('services.tfoot.subtotal')}}</span>
|
||||
</td>
|
||||
<td class="number">{{serviceTotal | currency('EUR', $i18n.locale)}}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<span class="font gray">* {{ $t('services.warning') }}</span>
|
||||
</div>
|
||||
<!-- End of services block -->
|
||||
</div>
|
||||
<div class="columns">
|
||||
<!-- Packages block -->
|
||||
<div id="packagings" class="size100 no-page-break" v-if="packagings.length > 0">
|
||||
<h2>{{$t('packagings')}}</h2>
|
||||
<h2>{{$t('packagings.title')}}</h2>
|
||||
<table class="column-oriented">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{$t('reference')}}</th>
|
||||
<th class="number">{{$t('quantity')}}</th>
|
||||
<th wihth="75%">{{$t('concept')}}</th>
|
||||
<th>{{$t('packagings.theader.reference')}}</th>
|
||||
<th class="number">{{$t('packagings.theader.quantity')}}</th>
|
||||
<th wihth="75%">{{$t('packagings.theader.concept')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -183,21 +184,18 @@
|
|||
<div class="columns vn-mt-xl">
|
||||
<!-- Taxes block -->
|
||||
<div id="taxes" class="size50 pull-right no-page-break" v-if="taxes">
|
||||
<!-- <h2>{{$t('taxBreakdown')}}</h2> -->
|
||||
<table class="column-oriented">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="4">{{$t('taxBreakdown')}}</th>
|
||||
<th colspan="4">{{$t('taxes.title')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<thead class="light">
|
||||
<tr>
|
||||
<th width="45%">{{$t('type')}}</th>
|
||||
<th width="25%" class="number">
|
||||
{{$t('taxBase')}}
|
||||
</th>
|
||||
<th>{{$t('tax')}}</th>
|
||||
<th class="number">{{$t('fee')}}</th>
|
||||
<th width="45%">{{$t('taxes.theader.type')}}</th>
|
||||
<th width="25%" class="number">{{$t('taxes.theader.taxBase')}}</th>
|
||||
<th>{{$t('taxes.theader.tax')}}</th>
|
||||
<th class="number">{{$t('taxes.theader.fee')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
|
|||
|
|
@ -12,17 +12,37 @@ price: PSP/u
|
|||
discount: Disc.
|
||||
vat: VAT
|
||||
amount: Amount
|
||||
type: Type
|
||||
taxBase: Tax base
|
||||
tax: Tax
|
||||
fee: Fee
|
||||
total: Total
|
||||
subtotal: Subtotal
|
||||
taxBreakdown: Tax breakdown
|
||||
packagings: Buckets and packaging
|
||||
services: Services
|
||||
vatType: VAT Type
|
||||
digitalSignature: Digital signature
|
||||
ticket: Delivery note {0}
|
||||
plantPassport: Plant passport
|
||||
packages: Packages
|
||||
packages: Packages
|
||||
services:
|
||||
title: Services
|
||||
theader:
|
||||
quantity: Qty.
|
||||
concept: Concept
|
||||
price: PSP/u
|
||||
vat: VAT
|
||||
amount: Amount
|
||||
tfoot:
|
||||
subtotal: Subtotal
|
||||
warning: Deposit packaging will be invoiced if they have not been returned after 30 days of their delivery
|
||||
packagings:
|
||||
title: Buckets and packaging
|
||||
theader:
|
||||
reference: Reference
|
||||
quantity: Quantity
|
||||
concept: Concept
|
||||
taxes:
|
||||
title: Tax breakdown
|
||||
theader:
|
||||
type: Type
|
||||
taxBase: Tax base
|
||||
tax: Tax
|
||||
fee: Fee
|
||||
tfoot:
|
||||
subtotal: Subtotal
|
||||
total: Total
|
||||
|
|
@ -12,17 +12,37 @@ price: PVP/u
|
|||
discount: Dto.
|
||||
vat: IVA
|
||||
amount: Importe
|
||||
type: Tipo
|
||||
taxBase: Base imp.
|
||||
tax: Tasa
|
||||
fee: Cuota
|
||||
total: Total
|
||||
subtotal: Subtotal
|
||||
taxBreakdown: Desglose impositivo
|
||||
packagings: Cubos y embalajes
|
||||
services: Servicios
|
||||
vatType: Tipo de IVA
|
||||
digitalSignature: Firma digital
|
||||
ticket: Albarán {0}
|
||||
plantPassport: Pasaporte fitosanitario
|
||||
packages: Bultos
|
||||
packages: Bultos
|
||||
services:
|
||||
title: Servicios
|
||||
theader:
|
||||
quantity: Cantidad
|
||||
concept: Concepto
|
||||
price: PVP/u
|
||||
vat: IVA
|
||||
amount: Importe
|
||||
tfoot:
|
||||
subtotal: Subtotal
|
||||
warning: Los embalajes en depósito se facturarán si no han sido devueltos pasados 30 dias de su entrega
|
||||
packagings:
|
||||
title: Cubos y embalajes
|
||||
theader:
|
||||
reference: Referencia
|
||||
quantity: Cantidad
|
||||
concept: Concepto
|
||||
taxes:
|
||||
title: Desglose impositivo
|
||||
theader:
|
||||
type: Tipo
|
||||
taxBase: Base imp.
|
||||
tax: Tasa
|
||||
fee: Cuota
|
||||
tfoot:
|
||||
subtotal: Subtotal
|
||||
total: Total
|
||||
|
|
@ -12,17 +12,37 @@ price: PRIX/u
|
|||
discount: Remise
|
||||
vat: TVA
|
||||
amount: Montant
|
||||
type: Type
|
||||
taxBase: Base imposable
|
||||
tax: Taxe
|
||||
fee: Quote
|
||||
total: Total
|
||||
subtotal: Total partiel
|
||||
taxBreakdown: Répartition taxes
|
||||
packagings: Bacs et emballages
|
||||
services: Service
|
||||
vatType: Type de TVA
|
||||
digitalSignature: Signature numérique
|
||||
ticket: BL {0}
|
||||
plantPassport: Passeport phytosanitaire
|
||||
packages: Paquets
|
||||
packages: Paquets
|
||||
services:
|
||||
title: Service
|
||||
theader:
|
||||
quantity: Quantité
|
||||
concept: Concept
|
||||
price: PRIX/u
|
||||
vat: TVA
|
||||
amount: Montant
|
||||
tfoot:
|
||||
subtotal: Total partiel
|
||||
warning: Les emballages de consigne seront facturés s'ils n'ont pas été retournés après 30 jours de leur livraison
|
||||
packagings:
|
||||
title: Bacs et emballages
|
||||
theader:
|
||||
reference: Référence
|
||||
quantity: Quantité
|
||||
concept: Concept
|
||||
taxes:
|
||||
title: Répartition taxes
|
||||
theader:
|
||||
type: Type
|
||||
taxBase: Base imposable
|
||||
tax: Taxe
|
||||
fee: Quote
|
||||
tfoot:
|
||||
subtotal: Total partiel
|
||||
total: Total
|
||||
|
|
@ -12,17 +12,37 @@ price: PVP/u
|
|||
discount: Dto.
|
||||
vat: IVA
|
||||
amount: Importe
|
||||
type: Tipo
|
||||
taxBase: Base imp.
|
||||
tax: Taxa
|
||||
fee: Quota
|
||||
total: Total
|
||||
subtotal: Sub-total
|
||||
taxBreakdown: Desglose impositivo
|
||||
packagings: Baldes e Embalagens
|
||||
services: Serviços
|
||||
vatType: Tipo de IVA
|
||||
digitalSignature: Assinatura digital
|
||||
ticket: Nota de Entrega {0}
|
||||
plantPassport: Passaporte vegetal
|
||||
packages: Pacotes
|
||||
packages: Pacotes
|
||||
services:
|
||||
title: Serviços
|
||||
theader:
|
||||
quantity: Quantidade
|
||||
concept: Conceito
|
||||
price: PVP/u
|
||||
vat: IVA
|
||||
amount: Quantia
|
||||
tfoot:
|
||||
subtotal: Subtotal
|
||||
warning: Os pacotes do armazém serão cobrados se não forem devolvidos 30 dias após a entrega
|
||||
packagings:
|
||||
title: Baldes e Embalagens
|
||||
theader:
|
||||
reference: Referência
|
||||
quantity: Quantidade
|
||||
concept: Conceito
|
||||
taxes:
|
||||
title: Repartição de impostos
|
||||
theader:
|
||||
type: Cara
|
||||
taxBase: Tributável
|
||||
tax: Taxa
|
||||
fee: Compartilhado
|
||||
tfoot:
|
||||
subtotal: Subtotal
|
||||
total: Total
|
||||
Loading…
Reference in New Issue