diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html index faa8eedfe..88ed4b46b 100644 --- a/modules/ticket/front/descriptor-menu/index.html +++ b/modules/ticket/front/descriptor-menu/index.html @@ -32,6 +32,12 @@ translate> as PDF + + as PDF without prices + diff --git a/modules/ticket/front/descriptor-menu/locale/es.yml b/modules/ticket/front/descriptor-menu/locale/es.yml index 56fa1a973..761687e74 100644 --- a/modules/ticket/front/descriptor-menu/locale/es.yml +++ b/modules/ticket/front/descriptor-menu/locale/es.yml @@ -2,6 +2,7 @@ Show Delivery Note...: Ver albarán... Send Delivery Note...: Enviar albarán... as PDF: como PDF as CSV: como CSV +as PDF without prices: como PDF sin precios Send PDF: Enviar PDF Send CSV: Enviar CSV Send CSV Delivery Note: Enviar albarán en CSV diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 644e0cf04..35f9a2960 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -77,10 +77,10 @@ {{$t('reference')}} {{$t('quantity')}} {{$t('concept')}} - {{$t('price')}} - {{$t('discount')}} - {{$t('vat')}} - {{$t('amount')}} + {{$t('price')}} + {{$t('discount')}} + {{$t('vat')}} + {{$t('amount')}} @@ -88,10 +88,10 @@ {{sale.itemFk | zerofill('000000')}} {{sale.quantity}} {{sale.concept}} - {{sale.price | currency('EUR', $i18n.locale)}} - {{(sale.discount / 100) | percentage}} - {{sale.vatType}} - {{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}} + {{sale.price | currency('EUR', $i18n.locale)}} + {{(sale.discount / 100) | percentage}} + {{sale.vatType}} + {{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}} @@ -107,7 +107,7 @@ - + {{$t('subtotal')}} @@ -181,7 +181,7 @@ -
+
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js index dbfedae8f..adda6e756 100755 --- a/print/templates/reports/delivery-note/delivery-note.js +++ b/print/templates/reports/delivery-note/delivery-note.js @@ -45,6 +45,9 @@ module.exports = { return total; }, + showPrices() { + return this.type != 'withoutPrices'; + }, footerType() { const translatedType = this.$t(this.type); return `${translatedType} ${this.ticketId}`; diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml index 93c09d98c..c74b87520 100644 --- a/print/templates/reports/delivery-note/locale/en.yml +++ b/print/templates/reports/delivery-note/locale/en.yml @@ -1,6 +1,7 @@ reportName: delivery-note deliveryNote: Delivery note proforma: Proforma +withoutPrices: Delivery note clientId: Client deliveryAddress: Delivery address fiscalData: Fiscal data diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml index b33b376fd..5c5a6af4d 100644 --- a/print/templates/reports/delivery-note/locale/es.yml +++ b/print/templates/reports/delivery-note/locale/es.yml @@ -1,6 +1,7 @@ reportName: albaran deliveryNote: Albarán proforma: Proforma +withoutPrices: Albarán clientId: Cliente deliveryAddress: Dirección de entrega fiscalData: Datos fiscales diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml index 74d52471d..df7ca053b 100644 --- a/print/templates/reports/delivery-note/locale/fr.yml +++ b/print/templates/reports/delivery-note/locale/fr.yml @@ -1,6 +1,7 @@ reportName: bon-de-livraison deliveryNote: Bon de livraison proforma: Proforma +withoutPrices: Bon de livraison clientId: Client deliveryAddress: Adresse de livraison fiscalData: Coordonnées diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml index 93554f74b..1f418b31f 100644 --- a/print/templates/reports/delivery-note/locale/pt.yml +++ b/print/templates/reports/delivery-note/locale/pt.yml @@ -1,6 +1,7 @@ reportName: nota-de-entrega deliveryNote: Nota de Entrega proforma: Proforma +withoutPrices: Nota de Entrega clientId: Cliente deliveryAddress: Morada de Entrega fiscalData: Dados Fiscais