diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 09b799076..93e1c2255 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 7f9ca7d0f..48aef8b64 100755 --- a/print/templates/reports/delivery-note/delivery-note.js +++ b/print/templates/reports/delivery-note/delivery-note.js @@ -44,6 +44,9 @@ module.exports = { }); return total; + }, + showPrices() { + return this.type != 'withoutPrices'; } }, methods: {