From f90eb4c39de8e0c2b84ff9c8d06c1c855b77f69e Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 20 Sep 2021 08:57:51 +0200 Subject: [PATCH] refactor(deliveryNote): added warning text for non returned packagings Refs: 3097 --- .../reports/delivery-note/delivery-note.html | 38 +++++++++---------- .../reports/delivery-note/locale/en.yml | 36 ++++++++++++++---- .../reports/delivery-note/locale/es.yml | 36 ++++++++++++++---- .../reports/delivery-note/locale/fr.yml | 36 ++++++++++++++---- .../reports/delivery-note/locale/pt.yml | 36 ++++++++++++++---- 5 files changed, 130 insertions(+), 52 deletions(-) diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 771f1fd0cc..36d9abde14 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -118,20 +118,20 @@ -
+
-

{{$t('services')}}

+

{{$t('services.title')}}

- - - + + + - - + + @@ -148,25 +148,26 @@
{{$t('quantity')}}{{$t('concept')}}{{$t('price')}}{{$t('services.theader.quantity')}}{{$t('services.theader.concept')}}{{$t('services.theader.price')}} {{$t('vat')}}{{$t('amount')}}{{$t('services.theader.vat')}}{{$t('services.theader.amount')}}
- {{$t('subtotal')}} + {{$t('services.tfoot.subtotal')}} {{serviceTotal | currency('EUR', $i18n.locale)}}
+ * {{ $t('services.warning') }}
-

{{$t('packagings')}}

+

{{$t('packagings.title')}}

- - - + + + @@ -183,21 +184,18 @@
-
{{$t('reference')}}{{$t('quantity')}}{{$t('concept')}}{{$t('packagings.theader.reference')}}{{$t('packagings.theader.quantity')}}{{$t('packagings.theader.concept')}}
- + - - - - + + + + diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml index ec961cabec..50e0612263 100644 --- a/print/templates/reports/delivery-note/locale/en.yml +++ b/print/templates/reports/delivery-note/locale/en.yml @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml index 674cb875e0..73c200c6bf 100644 --- a/print/templates/reports/delivery-note/locale/es.yml +++ b/print/templates/reports/delivery-note/locale/es.yml @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml index 526df30686..2aae418b3e 100644 --- a/print/templates/reports/delivery-note/locale/fr.yml +++ b/print/templates/reports/delivery-note/locale/fr.yml @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml index 95bcd857ec..0c9889ee99 100644 --- a/print/templates/reports/delivery-note/locale/pt.yml +++ b/print/templates/reports/delivery-note/locale/pt.yml @@ -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 \ No newline at end of file +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 \ No newline at end of file -- 2.40.1
{{$t('taxBreakdown')}}{{$t('taxes.title')}}
{{$t('type')}} - {{$t('taxBase')}} - {{$t('tax')}}{{$t('fee')}}{{$t('taxes.theader.type')}}{{$t('taxes.theader.taxBase')}}{{$t('taxes.theader.tax')}}{{$t('taxes.theader.fee')}}