From b8add5b0bce3b5970578205b438b68a83b700280 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 10 Nov 2022 08:57:42 +0100 Subject: [PATCH] Report template --- .eslintrc.yml | 1 + .vscode/settings.json | 9 +- package.json | 1 + .../credit-request/credit-request.html | 349 +++++------ .../reports/credit-request/credit-request.js | 2 + .../reports/driver-route/driver-route.html | 303 +++++---- .../reports/driver-route/driver-route.js | 2 + .../reports/entry-order/entry-order.html | 230 ++++--- .../reports/entry-order/entry-order.js | 2 + .../reports/exportation/exportation.html | 86 ++- .../reports/exportation/exportation.js | 2 + .../extra-community/extra-community.html | 149 ++--- .../extra-community/extra-community.js | 2 + .../incoterms-authorization.html | 141 ++--- .../incoterms-authorization.js | 2 + .../invoice-incoterms/invoice-incoterms.html | 228 ++++--- .../invoice-incoterms/invoice-incoterms.js | 2 + print/templates/reports/invoice/invoice.html | 592 ++++++++---------- print/templates/reports/invoice/invoice.js | 2 + .../reports/invoiceIn/invoiceIn.html | 395 ++++++------ .../templates/reports/invoiceIn/invoiceIn.js | 2 + .../reports/item-label/item-label.html | 58 +- .../reports/item-label/item-label.js | 2 + .../reports/letter-debtor/letter-debtor.html | 170 +++-- .../reports/letter-debtor/letter-debtor.js | 2 + print/templates/reports/receipt/receipt.html | 74 +-- print/templates/reports/receipt/receipt.js | 2 + .../reports/sepa-core/sepa-core.html | 378 ++++++----- .../templates/reports/sepa-core/sepa-core.js | 2 + .../supplier-campaign-metrics.html | 190 +++--- .../supplier-campaign-metrics.js | 2 + .../vehicle-event-expired.html | 65 +- .../vehicle-event-expired.js | 2 + print/templates/reports/zone/zone.html | 21 +- print/templates/reports/zone/zone.js | 6 + 35 files changed, 1608 insertions(+), 1868 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 13fc2b1402..df7429ec88 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -4,6 +4,7 @@ parserOptions: sourceType: "module" plugins: - jasmine + - html env: jasmine: true rules: diff --git a/.vscode/settings.json b/.vscode/settings.json index 54dc05c7ff..a76784faee 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,10 @@ { // Carácter predeterminado de final de línea. "files.eol": "\n", - "editor.codeActionsOnSave": { - "source.fixAll.eslint": true - } + "editor.bracketPairColorization.enabled": true, + "editor.guides.bracketPairs": true, + "editor.formatOnSave": true, + "editor.defaultFormatter": "dbaeumer.vscode-eslint", + "editor.codeActionsOnSave": ["source.fixAll.eslint"], + "eslint.validate": ["javascript", "html"] } \ No newline at end of file diff --git a/package.json b/package.json index ba39a65928..7d245e1fac 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "del": "^2.2.2", "eslint": "^7.11.0", "eslint-config-google": "^0.11.0", + "eslint-plugin-html": "^7.1.0", "eslint-plugin-jasmine": "^2.10.1", "fancy-log": "^1.3.2", "file-loader": "^1.1.11", diff --git a/print/templates/reports/credit-request/credit-request.html b/print/templates/reports/credit-request/credit-request.html index 975115eef8..68b03ebfc9 100644 --- a/print/templates/reports/credit-request/credit-request.html +++ b/print/templates/reports/credit-request/credit-request.html @@ -1,190 +1,167 @@ - - - - - - - + +
- - - - -
-
-

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

-
-
- - - - - - - - - -
{{$t('fields.date')}}: -
- -
-
- - -
-
-
-
-

{{$t('fields.companyInfo')}}

+ + +
+
+

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

+
+
+ + + + + + + +
{{$t('fields.date')}}: +
+ +
+
+
+
+
+
+

{{$t('fields.companyInfo')}}

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('fields.companyName')}}: +
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('fields.companyName')}}: -
- -
-
{{$t('fields.businessType')}}: -
- -
- 		{{$t('fields.antiquity')}}: -
- -
-
{{$t('fields.surface')}}: -
- -
- 		{{$t('fields.numberOfEmployees')}}: -
- -
-
{{$t('fields.owner')}}: -
- -
- 		{{$t('fields.phone')}}: -
- -
-
{{$t('fields.payer')}}: -
- -
- 		{{$t('fields.phone')}}: -
- -
-
+
{{$t('fields.businessType')}}: +
+
+ 		{{$t('fields.antiquity')}}: +
+ +
+
{{$t('fields.surface')}}: +
+ +
+ 		{{$t('fields.numberOfEmployees')}}: +
+ +
+
{{$t('fields.owner')}}: +
+ +
+ 		{{$t('fields.phone')}}: +
+ +
+
{{$t('fields.payer')}}: +
+ +
+ 		{{$t('fields.phone')}}: +
+ +
+
+
+
+
+
+
+
+
+
+

{{$t('fields.economicInfo')}}

+
+
+ + + + + + + + + + + + + + + +
{{$t('fields.previousSalesVolume')}}: +
+ +
+
{{$t('fields.forecastedSalesVolume')}}: +
+ +
+
{{$t('fields.forecastedPurchases')}}: +
+ +
+
+
+
+
+
+
+
+
+ + + + + + + - -
{{$t('fields.personFilling')}}: +
+
- - - - -
-
-
-
-

{{$t('fields.economicInfo')}}

-
-
- - - - - - - - - - - - - - - -
{{$t('fields.previousSalesVolume')}}: -
- -
-
{{$t('fields.forecastedSalesVolume')}}: -
- -
-
{{$t('fields.forecastedPurchases')}}: -
- -
-
-
+
{{$t('fields.phone')}}: +
+
- - - - -
-
-
- - - - - - - - - -
{{$t('fields.personFilling')}}: -
- -
- 		{{$t('fields.phone')}}: -
- -
-
-
-
-
- - - - -
- - \ No newline at end of file + +
+ + + + + + \ No newline at end of file diff --git a/print/templates/reports/credit-request/credit-request.js b/print/templates/reports/credit-request/credit-request.js index 7de1060caf..7886ddf173 100755 --- a/print/templates/reports/credit-request/credit-request.js +++ b/print/templates/reports/credit-request/credit-request.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -12,6 +13,7 @@ const rptCreditRequest = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() } diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html index e310539e03..fdedebb129 100644 --- a/print/templates/reports/driver-route/driver-route.html +++ b/print/templates/reports/driver-route/driver-route.html @@ -1,161 +1,146 @@ - - - - - - - - - -
- - - -
-
-

{{$t('route')}} {{route.id}}

-
-
{{$t('information')}}
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('route')}}{{route.id}}{{$t('driver')}}{{route.userNickName}}
{{$t('date')}}{{route.created | date('%d-%m-%Y')}}{{$t('vehicle')}}{{route.vehicleTradeMark}} {{route.vehicleModel}}
{{$t('time')}}{{route.time | date('%H:%M')}}{{route.plateNumber}}
{{$t('volume')}}{{route.m3}}{{$t('agency')}}{{route.agencyName}}
-
- - - - - - - - - - - - - - - -
-

Hora inicio

- 		-

Hora fin

- 		-

Km inicio

- 		-

Km fin

-
-
- -
- 		-
- -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - -
{{$t('order')}}{{$t('ticket')}}{{$t('client')}}{{$t('address')}}{{$t('packages')}}{{$t('packagingType')}}
{{ticket.priority}}{{ticket.id}}{{ticket.clientFk}} {{ticket.addressName}} - {{ticket.addressFk.toString().substr(0, - ticket.addressFk.toString().length - 3)}} - - {{ticket.addressFk.toString().substr(-3, 3)}} - - {{ticket.packages}}{{ticket.itemPackingTypes}}
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('street')}}{{ticket.street}}{{$t('postcode')}}{{ticket.postalCode}}
{{$t('city')}}{{ticket.city}}{{$t('agency')}}{{ticket.ticketAgency}}
{{$t('mobile')}}{{ticket.mobile}}{{$t('phone')}}{{ticket.phone}}
{{$t('warehouse')}}{{ticket.warehouseName}}{{$t('salesPerson')}}{{ticket.salesPersonName}}
-
-

{{ticket.description}}

-
-
-
+ + +
+
+

{{$t('route')}} {{route.id}}

+
+
{{$t('information')}}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('route')}}{{route.id}}{{$t('driver')}}{{route.userNickName}}
{{$t('date')}}{{route.created | date('%d-%m-%Y')}}{{$t('vehicle')}}{{route.vehicleTradeMark}} {{route.vehicleModel}}
{{$t('time')}}{{route.time | date('%H:%M')}}{{route.plateNumber}}
{{$t('volume')}}{{route.m3}}{{$t('agency')}}{{route.agencyName}}
+
+ + + + + + + + + + + + + + + +
+

Hora inicio

+ 		+

Hora fin

+ 		+

Km inicio

+ 		+

Km fin

+
+
+ +
+ 		+
+ +
+
- - - -
- - \ No newline at end of file + + +
+
+ + + + + + + + + + + + + + + + + + + + + +
{{$t('order')}}{{$t('ticket')}}{{$t('client')}}{{$t('address')}}{{$t('packages')}}{{$t('packagingType')}}
{{ticket.priority}}{{ticket.id}}{{ticket.clientFk}} {{ticket.addressName}} + {{ticket.addressFk.toString().substr(0, + ticket.addressFk.toString().length - 3)}} + + {{ticket.addressFk.toString().substr(-3, 3)}} + + {{ticket.packages}}{{ticket.itemPackingTypes}}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('street')}}{{ticket.street}}{{$t('postcode')}}{{ticket.postalCode}}
{{$t('city')}}{{ticket.city}}{{$t('agency')}}{{ticket.ticketAgency}}
{{$t('mobile')}}{{ticket.mobile}}{{$t('phone')}}{{ticket.phone}}
{{$t('warehouse')}}{{ticket.warehouseName}}{{$t('salesPerson')}}{{ticket.salesPersonName}}
+
+

{{ticket.description}}

+
+
+
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js index 0015379419..080d3c8168 100755 --- a/print/templates/reports/driver-route/driver-route.js +++ b/print/templates/reports/driver-route/driver-route.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -39,6 +40,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html index 956d4e2f6f..280723e8a5 100644 --- a/print/templates/reports/entry-order/entry-order.html +++ b/print/templates/reports/entry-order/entry-order.html @@ -1,127 +1,107 @@ - - - - - - - - - -
- - - - -
-
-
-
-
-

{{$t('title')}}

- - - - - - - - - - - - - - - -
{{$t('entryId')}}{{entry.id}}
{{$t('date')}}{{entry.landed | date('%d-%m-%Y')}}
{{$t('ref')}}{{entry.ref}}
-
-
-
-
-
{{$t('supplierData')}}
-
-

{{supplier.name}}

-
- {{supplier.street}} -
-
- {{supplier.postCode}}, {{supplier.city}}, ({{supplier.province}}) -
-
- {{supplier.nif}} -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('boxes')}}{{$t('packing')}}{{$t('concept')}}{{$t('quantity')}}{{$t('price')}}{{$t('amount')}}
{{buy.box}}{{buy.packing}}{{buy.itemName}}{{buy.quantity | number($i18n.locale)}}{{buy.buyingValue | currency('EUR', $i18n.locale)}}{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
- - {{buy.tag5}} {{buy.value5}} - - - {{buy.tag6}} {{buy.value6}} - - - {{buy.tag7}} {{buy.value7}} - -
- {{$t('total')}} - {{getTotal() | currency('EUR', $i18n.locale)}}
- -
-
-
-
-

{{$t('notes')}}

-
- {{entry.notes}} -
-
-
-
-
+ + + +
+
+
+
+
+

{{$t('title')}}

+ + + + + + + + + + + + + + + +
{{$t('entryId')}}{{entry.id}}
{{$t('date')}}{{entry.landed | date('%d-%m-%Y')}}
{{$t('ref')}}{{entry.ref}}
+
+
+
+
+
{{$t('supplierData')}}
+
+

{{supplier.name}}

+
+ {{supplier.street}} +
+
+ {{supplier.postCode}}, {{supplier.city}}, ({{supplier.province}}) +
+
+ {{supplier.nif}}
- - - -
- - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('boxes')}}{{$t('packing')}}{{$t('concept')}}{{$t('quantity')}}{{$t('price')}}{{$t('amount')}}
{{buy.box}}{{buy.packing}}{{buy.itemName}}{{buy.quantity | number($i18n.locale)}}{{buy.buyingValue | currency('EUR', $i18n.locale)}}{{buy.buyingValue * buy.quantity | currency('EUR', + $i18n.locale)}}
+ + {{buy.tag5}} {{buy.value5}} + + + {{buy.tag6}} {{buy.value6}} + + + {{buy.tag7}} {{buy.value7}} + +
+ {{$t('total')}} + {{getTotal() | currency('EUR', $i18n.locale)}}
+
+
+
+
+

{{$t('notes')}}

+
+ {{entry.notes}} +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/entry-order/entry-order.js b/print/templates/reports/entry-order/entry-order.js index 18fc4a5ea2..22c5b55fe6 100755 --- a/print/templates/reports/entry-order/entry-order.js +++ b/print/templates/reports/entry-order/entry-order.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -35,6 +36,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/exportation/exportation.html b/print/templates/reports/exportation/exportation.html index 2529994675..0f70287ccb 100644 --- a/print/templates/reports/exportation/exportation.html +++ b/print/templates/reports/exportation/exportation.html @@ -1,51 +1,35 @@ - - - - - - - - - -
- - - -
-
-

{{$t('title')}}

-

{{$t('toAttention')}}

-

-

-

    -
  • - {{responsibility}} -
    • -
-

-
-

{{$t('issued', [ - 'Algemesí', - invoice.issued.getDate(), - $t('months')[invoice.issued.getMonth()], - invoice.issued.getFullYear()]) - }} -

-

({{$t('signature')}})

- -

-

{{$t('signer.name')}}: {{company.manager}}
-
{{$t('signer.ID')}}: {{company.managerFi}}
-
{{$t('signer.position')}}: {{$t('manager')}}
-

-
-
-
- - - -
- - \ No newline at end of file + + +
+
+

{{$t('title')}}

+

{{$t('toAttention')}}

+

+

+

    +
  • + {{responsibility}} +
    • +
+

+
+

{{$t('issued', [ + 'Algemesí', + invoice.issued.getDate(), + $t('months')[invoice.issued.getMonth()], + invoice.issued.getFullYear()]) + }} +

+

({{$t('signature')}})

+ +

+

{{$t('signer.name')}}: {{company.manager}}
+
{{$t('signer.ID')}}: {{company.managerFi}}
+
{{$t('signer.position')}}: {{$t('manager')}}
+

+
+
+
+ + + \ No newline at end of file diff --git a/print/templates/reports/exportation/exportation.js b/print/templates/reports/exportation/exportation.js index 0aab05feec..01ca2399fa 100755 --- a/print/templates/reports/exportation/exportation.js +++ b/print/templates/reports/exportation/exportation.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -25,6 +26,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/extra-community/extra-community.html b/print/templates/reports/extra-community/extra-community.html index 86baf858bc..91caebbd50 100644 --- a/print/templates/reports/extra-community/extra-community.html +++ b/print/templates/reports/extra-community/extra-community.html @@ -1,84 +1,67 @@ - - - - - - - - - -
- - -
-
-

{{$t('title')}}

-
-
+ + +
+
+

{{$t('title')}}

+
+
+
+
+
+
{{$t('information')}}
+
+
+ + + + + + + + + + + + + + + + + + + + + +
{{$t('reference')}}{{travel.ref}}{{$t('blockedKg')}}{{travel.kg | number($i18n.locale)}}
{{$t('packages')}}{{travel.stickers}}{{$t('volumeKg')}}{{travel.volumeKg | number($i18n.locale)}}
{{$t('shipped')}}{{travel.shipped | date('%d-%m-%Y')}}{{$t('physicalKg')}}{{travel.loadedKg | number($i18n.locale)}}
+
+
+
- -
-
-
-
{{$t('information')}}
-
-
- - - - - - - - - - - - - - - - - - - - - -
{{$t('reference')}}{{travel.ref}}{{$t('blockedKg')}}{{travel.kg | number($i18n.locale)}}
{{$t('packages')}}{{travel.stickers}}{{$t('volumeKg')}}{{travel.volumeKg | number($i18n.locale)}}
{{$t('shipped')}}{{travel.shipped | date('%d-%m-%Y')}}{{$t('physicalKg')}}{{travel.loadedKg | number($i18n.locale)}}
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
{{$t('supplier')}}{{$t('reference')}}{{$t('volKg')}}{{$t('phyKg')}}{{$t('packages')}}
{{entry.supplierName}}{{entry.ref}}{{entry.volumeKg | number($i18n.locale)}}{{entry.loadedKg | number($i18n.locale)}}{{entry.stickers}}
{{$t('noRows')}}
-
-
- - - -
- - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + +
{{$t('supplier')}}{{$t('reference')}}{{$t('volKg')}}{{$t('phyKg')}}{{$t('packages')}}
{{entry.supplierName}}{{entry.ref}}{{entry.volumeKg | number($i18n.locale)}}{{entry.loadedKg | number($i18n.locale)}}{{entry.stickers}}
{{$t('noRows')}}
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js index dec89648a8..1b10f129e6 100755 --- a/print/templates/reports/extra-community/extra-community.js +++ b/print/templates/reports/extra-community/extra-community.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); const db = require(`vn-print/core/database`); @@ -100,6 +101,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/incoterms-authorization/incoterms-authorization.html b/print/templates/reports/incoterms-authorization/incoterms-authorization.html index 27cad97b16..7fad5cfe2b 100644 --- a/print/templates/reports/incoterms-authorization/incoterms-authorization.html +++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.html @@ -1,84 +1,59 @@ - - - - - - - - - -
- - - -
-
-

-

-

-

+ + +
+
+

+

+

+

-
-
-

{{client.name}}

-
-

- - - - - - - - - - - - - - - -
{{$t('signer.representative')}}:
{{$t('signer.representativeRole')}}:
{{$t('signer.signed')}}:
-

-
-
-

{{ company.name }}

- -

-

{{company.manager}}
-
{{$t('manager')}}
-

{{$t('issued', [ - company.city, - issued.getDate(), - $t('months')[issued.getMonth()], - issued.getFullYear()]) - }} -

-

-
-
-
-
- - - -
- - \ No newline at end of file +
+
+

{{client.name}}

+
+

+ + + + + + + + + + + + + + + +
{{$t('signer.representative')}}:
{{$t('signer.representativeRole')}}:
{{$t('signer.signed')}}:
+

+
+
+

{{ company.name }}

+ +

+

{{company.manager}}
+
{{$t('manager')}}
+

+
+
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/incoterms-authorization/incoterms-authorization.js b/print/templates/reports/incoterms-authorization/incoterms-authorization.js index 3eb5b65ea7..399cb52024 100755 --- a/print/templates/reports/incoterms-authorization/incoterms-authorization.js +++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -16,6 +17,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.html b/print/templates/reports/invoice-incoterms/invoice-incoterms.html index f306670424..82a0ea2989 100644 --- a/print/templates/reports/invoice-incoterms/invoice-incoterms.html +++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.html @@ -1,123 +1,109 @@ - - - - - - - - - -
- - - - -
-
-
-
-
-

{{$t('title')}}

- - - - - - - - - - - - - - - -
{{$t('clientId')}}{{client.id}}
{{$t('invoice')}}{{invoice.ref}}
{{$t('date')}}{{invoice.issued | date('%d-%m-%Y')}}
-
-
-
-
-
{{$t('invoiceData')}}
-
-

{{client.socialName}}

-
- {{client.postalAddress}} -
-
- {{client.postcodeCity}} -
-
- {{$t('fiscalId')}}: {{client.fi}} -
-
-
-
-
- -
-
{{$t('incotermsTitle')}}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$t('incoterms')}} - {{incoterms.incotermsFk}} - {{incoterms.incotermsName}}
- {{$t('productDescription')}} - {{incoterms.intrastat}}
{{$t('expeditionDescription')}}
{{$t('packageNumber')}}{{incoterms.packages}}
{{$t('packageGrossWeight')}}{{incoterms.weight}} KG
{{$t('packageCubing')}}{{incoterms.volume}} m3
- -

-

- {{$t('customsInfo')}} - {{incoterms.customsAgentName}} -
-
- ( - {{incoterms.customsAgentNif}} - {{incoterms.customsAgentStreet}} - - ☎ {{incoterms.customsAgentPhone}} - - - ✉ {{incoterms.customsAgentEmail}} - - ) -
-

-

- {{$t('productDisclaimer')}} -

-
-
+ + + +
+
+
+
+
+

{{$t('title')}}

+ + + + + + + + + + + + + + + +
{{$t('clientId')}}{{client.id}}
{{$t('invoice')}}{{invoice.ref}}
{{$t('date')}}{{invoice.issued | date('%d-%m-%Y')}}
+
+
+
+
+
{{$t('invoiceData')}}
+
+

{{client.socialName}}

+
+ {{client.postalAddress}} +
+
+ {{client.postcodeCity}} +
+
+ {{$t('fiscalId')}}: {{client.fi}}
-
- - \ No newline at end of file + + + + +
+
{{$t('incotermsTitle')}}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{$t('incoterms')}} + {{incoterms.incotermsFk}} - {{incoterms.incotermsName}}
+ {{$t('productDescription')}} + {{incoterms.intrastat}}
{{$t('expeditionDescription')}}
{{$t('packageNumber')}}{{incoterms.packages}}
{{$t('packageGrossWeight')}}{{incoterms.weight}} KG
{{$t('packageCubing')}}{{incoterms.volume}} m3
+ +

+

+ {{$t('customsInfo')}} + {{incoterms.customsAgentName}} +
+
+ ( + {{incoterms.customsAgentNif}} + {{incoterms.customsAgentStreet}} + + ☎ {{incoterms.customsAgentPhone}} + + + ✉ {{incoterms.customsAgentEmail}} + + ) +
+

+

+ {{$t('productDisclaimer')}} +

+
+
+ + + \ No newline at end of file diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.js b/print/templates/reports/invoice-incoterms/invoice-incoterms.js index ba9981373d..a7ec29bdbf 100755 --- a/print/templates/reports/invoice-incoterms/invoice-incoterms.js +++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -27,6 +28,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html index aed4b38f3f..10fc3b2a98 100644 --- a/print/templates/reports/invoice/invoice.html +++ b/print/templates/reports/invoice/invoice.html @@ -1,319 +1,277 @@ - - - - - - - - - -
- - - - - - - - - -
-
-
-
-
-

{{$t('title')}}

- - - - - - - - - - - - - - - -
{{$t('clientId')}}{{client.id}}
{{$t('invoice')}}{{invoice.ref}}
{{$t('date')}}{{invoice.issued | date('%d-%m-%Y')}}
-
-
-
-
-
{{$t('invoiceData')}}
-
-

{{client.socialName}}

-
- {{client.postalAddress}} -
-
- {{client.postcodeCity}} -
-
- {{$t('fiscalId')}}: {{client.fi}} -
-
-
-
-
- - -
-

{{$t('rectifiedInvoices')}}

- - - - - - - - - - - - - - - - - -
{{$t('invoice')}}{{$t('issued')}}{{$t('amount')}}{{$t('description')}}
{{row.ref}}{{row.issued | date}}{{row.amount | currency('EUR', $i18n.locale)}}{{row.description}}
-
- - - -
-
-
-

{{$t('deliveryNote')}} -

-
-
- {{ticket.id}} -
-
-
-

{{$t('shipped')}}

-
-
-
- {{ticket.shipped | date}} -
-
- -

{{ticket.nickname}}

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('reference')}}{{$t('quantity')}}{{$t('concept')}}{{$t('price')}}{{$t('discount')}}{{$t('vat')}}{{$t('amount')}}
{{sale.itemFk | zerofill('000000')}}{{sale.quantity}}{{sale.concept}}{{sale.price | currency('EUR', $i18n.locale)}}{{(sale.discount / 100) | percentage}}{{sale.vatType}}{{saleImport(sale) | currency('EUR', $i18n.locale)}}
- - {{sale.tag5}} {{sale.value5}} - - - {{sale.tag6}} {{sale.value6}} - - - {{sale.tag7}} {{sale.value7}} - -
- {{$t('subtotal')}} - {{ticketSubtotal(ticket) | currency('EUR', $i18n.locale)}}
-
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('taxBreakdown')}}
{{$t('type')}} - {{$t('taxBase')}} - {{$t('tax')}}{{$t('fee')}}
{{tax.name}} - {{tax.base | currency('EUR', $i18n.locale)}} - {{tax.vatPercent | percentage}}{{tax.vat | currency('EUR', $i18n.locale)}}
{{$t('subtotal')}} - {{sumTotal(taxes, 'base') | currency('EUR', $i18n.locale)}} - {{sumTotal(taxes, 'vat') | currency('EUR', $i18n.locale)}}
{{$t('total')}}{{taxTotal | currency('EUR', $i18n.locale)}}
- -
-
{{$t('notes')}}
-
- {{invoice.footNotes}} -
-
-
- - - -
-
-
-
-
-
- -
-
- {{$t('plantPassport')}}
-
-
-
-
-
- A - {{botanical}} -
-
- B - ES17462130 -
-
- C - {{ticketsId}} -
-
- D - ES -
-
-
-
-
- -
- - - -
-

{{$t('intrastat')}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('code')}}{{$t('description')}}{{$t('stems')}}{{$t('netKg')}}{{$t('amount')}}
{{row.code}}{{row.description || $t('services') }}{{row.stems | number($i18n.locale)}}{{row.netKg | number($i18n.locale)}}{{row.subtotal | currency('EUR', $i18n.locale)}}
- {{sumTotal(intrastat, 'stems') | number($i18n.locale)}} - - {{sumTotal(intrastat, 'netKg') | number($i18n.locale)}} - - {{sumTotal(intrastat, 'subtotal') | currency('EUR', $i18n.locale)}} -
-
- - - -
-
-
-
{{$t('observations')}}
-
-
{{$t('wireTransfer')}}
-
{{$t('accountNumber', [invoice.iban])}}
-
-
-
-
- - + + + + + +
+
+
+
+
+

{{$t('title')}}

+ + + + + + + + + + + + + + + +
{{$t('clientId')}}{{client.id}}
{{$t('invoice')}}{{invoice.ref}}
{{$t('date')}}{{invoice.issued | date('%d-%m-%Y')}}
+
+
+
+
+
{{$t('invoiceData')}}
+
+

{{client.socialName}}

+
+ {{client.postalAddress}} +
+
+ {{client.postcodeCity}} +
+
+ {{$t('fiscalId')}}: {{client.fi}}
- - - -
- - \ No newline at end of file + + + +
+

{{$t('rectifiedInvoices')}}

+ + + + + + + + + + + + + + + + + +
{{$t('invoice')}}{{$t('issued')}}{{$t('amount')}}{{$t('description')}}
{{row.ref}}{{row.issued | date}}{{row.amount | currency('EUR', $i18n.locale)}}{{row.description}}
+
+
+
+
+

{{$t('deliveryNote')}} +

+
+
+ {{ticket.id}} +
+
+
+

{{$t('shipped')}}

+
+
+
+ {{ticket.shipped | date}} +
+
+ +

{{ticket.nickname}}

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('reference')}}{{$t('quantity')}}{{$t('concept')}}{{$t('price')}}{{$t('discount')}}{{$t('vat')}}{{$t('amount')}}
{{sale.itemFk | zerofill('000000')}}{{sale.quantity}}{{sale.concept}}{{sale.price | currency('EUR', $i18n.locale)}}{{(sale.discount / 100) | percentage}}{{sale.vatType}}{{saleImport(sale) | currency('EUR', $i18n.locale)}}
+ + {{sale.tag5}} {{sale.value5}} + + + {{sale.tag6}} {{sale.value6}} + + + {{sale.tag7}} {{sale.value7}} + +
+ {{$t('subtotal')}} + {{ticketSubtotal(ticket) | currency('EUR', $i18n.locale)}}
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('taxBreakdown')}}
{{$t('type')}} + {{$t('taxBase')}} + {{$t('tax')}}{{$t('fee')}}
{{tax.name}} + {{tax.base | currency('EUR', $i18n.locale)}} + {{tax.vatPercent | percentage}}{{tax.vat | currency('EUR', $i18n.locale)}}
{{$t('subtotal')}} + {{sumTotal(taxes, 'base') | currency('EUR', $i18n.locale)}} + {{sumTotal(taxes, 'vat') | currency('EUR', $i18n.locale)}}
{{$t('total')}}{{taxTotal | currency('EUR', $i18n.locale)}}
+ +
+
{{$t('notes')}}
+
+ {{invoice.footNotes}} +
+
+
+
+
+
+
+
+
+ +
+
+ {{$t('plantPassport')}}
+
+
+
+
+
+ A + {{botanical}} +
+
+ B + ES17462130 +
+
+ C + {{ticketsId}} +
+
+ D + ES +
+
+
+
+
+
+
+

{{$t('intrastat')}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('code')}}{{$t('description')}}{{$t('stems')}}{{$t('netKg')}}{{$t('amount')}}
{{row.code}}{{row.description || $t('services') }}{{row.stems | number($i18n.locale)}}{{row.netKg | number($i18n.locale)}}{{row.subtotal | currency('EUR', $i18n.locale)}}
+ {{sumTotal(intrastat, 'stems') | number($i18n.locale)}} + + {{sumTotal(intrastat, 'netKg') | number($i18n.locale)}} + + {{sumTotal(intrastat, 'subtotal') | currency('EUR', $i18n.locale)}} +
+
+
+
+
+
{{$t('observations')}}
+
+
{{$t('wireTransfer')}}
+
{{$t('accountNumber', [invoice.iban])}}
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js index 31df7f7f59..eebbde8ef1 100755 --- a/print/templates/reports/invoice/invoice.js +++ b/print/templates/reports/invoice/invoice.js @@ -1,5 +1,6 @@ const Component = require(`vn-print/core/component`); const Report = require(`vn-print/core/report`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); const invoiceIncoterms = new Report('invoice-incoterms'); @@ -110,6 +111,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build(), 'invoice-incoterms': invoiceIncoterms.build() diff --git a/print/templates/reports/invoiceIn/invoiceIn.html b/print/templates/reports/invoiceIn/invoiceIn.html index 8919403b9e..2e3a0044bb 100644 --- a/print/templates/reports/invoiceIn/invoiceIn.html +++ b/print/templates/reports/invoiceIn/invoiceIn.html @@ -1,214 +1,187 @@ - - - - - - - - - -
- - - - - -
-
-
-
-
-

{{$t('title')}}

- - - - - - - - - - - - - - - -
{{$t('supplierId')}}{{invoice.supplierId}}
{{$t('invoiceId')}}{{invoice.id}}
{{$t('date')}}{{invoice.created | date('%d-%m-%Y')}}
-
-
-
-
-
{{$t('invoiceData')}}
-
-

{{invoice.name}}

-
- {{invoice.postalAddress}} -
-
- {{invoice.postcodeCity}} -
-
- {{$t('fiscalId')}}: {{invoice.nif}} -
-
- {{$t('phone')}}: {{invoice.phone}} -
-
-
-
-
- -
-
-
-

{{$t('invoiceId')}} -

-
-
- {{entry.id}} -
-
-
-

{{$t('date')}}

-
-
-
- {{entry.landed | date}} -
-
- -
-

{{$t('reference')}}

-
-
-
- {{entry.ref}} -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('item')}}{{$t('quantity')}}{{$t('buyingValue')}}{{$t('amount')}}
{{buy.name}}{{buy.quantity}}{{buy.buyingValue}}{{buyImport(buy) | currency('EUR', $i18n.locale)}}
- - {{buy.tag5}} {{buy.value5}} - - - {{buy.tag6}} {{buy.value6}} - - - {{buy.tag7}} {{buy.value7}} - -
- {{$t('subtotal')}} - {{entrySubtotal(entry) | currency('EUR', $i18n.locale)}}
-
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('taxBreakdown')}}
{{$t('type')}} - {{$t('taxBase')}} - {{$t('tax')}}{{$t('fee')}}
{{tax.name}} - {{tax.taxableBase | currency('EUR', $i18n.locale)}} - {{tax.rate | percentage}}{{tax.vat | currency('EUR', $i18n.locale)}}
{{$t('subtotal')}} - {{sumTotal(taxes, 'taxableBase') | currency('EUR', $i18n.locale)}} - {{sumTotal(taxes, 'vat') | currency('EUR', $i18n.locale)}}
{{$t('total')}}{{taxTotal() | currency('EUR', $i18n.locale)}}
- -
-
{{$t('notes')}}
-
- {{invoice.footNotes}} -
-
-
- - - -
-
-
-
{{$t('observations')}}
-
-
{{$t('payMethod')}}
-
{{invoice.payMethod}}
-
-
-
-
- - + + + +
+
+
+
+
+

{{$t('title')}}

+ + + + + + + + + + + + + + + +
{{$t('supplierId')}}{{invoice.supplierId}}
{{$t('invoiceId')}}{{invoice.id}}
{{$t('date')}}{{invoice.created | date('%d-%m-%Y')}}
+
+
+
+
+
{{$t('invoiceData')}}
+
+

{{invoice.name}}

+
+ {{invoice.postalAddress}} +
+
+ {{invoice.postcodeCity}} +
+
+ {{$t('fiscalId')}}: {{invoice.nif}} +
+
+ {{$t('phone')}}: {{invoice.phone}}
- - - -
- - + + + +
+
+
+

{{$t('invoiceId')}} +

+
+
+ {{entry.id}} +
+
+
+

{{$t('date')}}

+
+
+
+ {{entry.landed | date}} +
+
+ +
+

{{$t('reference')}}

+
+
+
+ {{entry.ref}} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('item')}}{{$t('quantity')}}{{$t('buyingValue')}}{{$t('amount')}}
{{buy.name}}{{buy.quantity}}{{buy.buyingValue}}{{buyImport(buy) | currency('EUR', $i18n.locale)}}
+ + {{buy.tag5}} {{buy.value5}} + + + {{buy.tag6}} {{buy.value6}} + + + {{buy.tag7}} {{buy.value7}} + +
+ {{$t('subtotal')}} + {{entrySubtotal(entry) | currency('EUR', $i18n.locale)}}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('taxBreakdown')}}
{{$t('type')}} + {{$t('taxBase')}} + {{$t('tax')}}{{$t('fee')}}
{{tax.name}} + {{tax.taxableBase | currency('EUR', $i18n.locale)}} + {{tax.rate | percentage}}{{tax.vat | currency('EUR', $i18n.locale)}}
{{$t('subtotal')}} + {{sumTotal(taxes, 'taxableBase') | currency('EUR', $i18n.locale)}} + {{sumTotal(taxes, 'vat') | currency('EUR', $i18n.locale)}}
{{$t('total')}}{{taxTotal() | currency('EUR', $i18n.locale)}}
+ +
+
{{$t('notes')}}
+
+ {{invoice.footNotes}} +
+
+
+
+
+
+
{{$t('observations')}}
+
+
{{$t('payMethod')}}
+
{{invoice.payMethod}}
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/invoiceIn/invoiceIn.js b/print/templates/reports/invoiceIn/invoiceIn.js index 526c40fc66..40dd25a5b8 100755 --- a/print/templates/reports/invoiceIn/invoiceIn.js +++ b/print/templates/reports/invoiceIn/invoiceIn.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -82,6 +83,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build(), }, diff --git a/print/templates/reports/item-label/item-label.html b/print/templates/reports/item-label/item-label.html index 3f2d7ce690..8f2207d40b 100644 --- a/print/templates/reports/item-label/item-label.html +++ b/print/templates/reports/item-label/item-label.html @@ -1,35 +1,23 @@ - - - - - - - - - -
-
-
-

{{item.id}}

-
- -
-
-
-
{{item.name}}
-
{{tags.color}}
-
{{tags.producer}}
-
-
-
{{packing()}}
-
{{dated}}
-
{{labelPage}}
-
-
{{item.size}}
-
-
-
-
- - - + +
+
+

{{item.id}}

+
+ +
+
+
+
{{item.name}}
+
{{tags.color}}
+
{{tags.producer}}
+
+
+
{{packing()}}
+
{{dated}}
+
{{labelPage}}
+
+
{{item.size}}
+
+
+
+ \ No newline at end of file diff --git a/print/templates/reports/item-label/item-label.js b/print/templates/reports/item-label/item-label.js index d03d03cfa4..94383aef96 100755 --- a/print/templates/reports/item-label/item-label.js +++ b/print/templates/reports/item-label/item-label.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); const qrcode = require('qrcode'); @@ -50,6 +51,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/letter-debtor/letter-debtor.html b/print/templates/reports/letter-debtor/letter-debtor.html index 88bf15bdbd..d50418d266 100644 --- a/print/templates/reports/letter-debtor/letter-debtor.html +++ b/print/templates/reports/letter-debtor/letter-debtor.html @@ -1,95 +1,79 @@ - - - - - - - - - -
- - - -
-
-
-
-
-

{{$t('title')}}

- - - - - - - - - - - -
{{$t('clientId')}}{{client.id}}
{{$t('date')}}{{dated}}
-
-
-
-
-
{{$t('clientData')}}
-
-

{{client.socialName}}

-
- {{client.street}} -
-
- {{client.postcode}}, {{client.city}} ({{client.province}}) -
-
- {{client.country}} -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('date')}}{{$t('concept')}}{{$t('invoiced')}}{{$t('payed')}}{{$t('balance')}}
{{sale.issued | date('%d-%m-%Y')}}{{sale.ref}}{{sale.debtOut}}{{sale.debtIn}}{{getBalance(sale)}}
- Total - {{getTotalDebtOut() | currency('EUR', $i18n.locale)}} - {{getTotalDebtIn() | currency('EUR', $i18n.locale)}}{{totalBalance | currency('EUR', $i18n.locale)}}
+ + +
+
+
+
+
+

{{$t('title')}}

+ + + + + + + + + + + +
{{$t('clientId')}}{{client.id}}
{{$t('date')}}{{dated}}
+
+
+
+
+
{{$t('clientData')}}
+
+

{{client.socialName}}

+
+ {{client.street}} +
+
+ {{client.postcode}}, {{client.city}} ({{client.province}}) +
+
+ {{client.country}}
- - - -
- - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('date')}}{{$t('concept')}}{{$t('invoiced')}}{{$t('payed')}}{{$t('balance')}}
{{sale.issued | date('%d-%m-%Y')}}{{sale.ref}}{{sale.debtOut}}{{sale.debtIn}}{{getBalance(sale)}}
+ Total + {{getTotalDebtOut() | currency('EUR', $i18n.locale)}} + {{getTotalDebtIn() | currency('EUR', $i18n.locale)}}{{totalBalance | currency('EUR', $i18n.locale)}}
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/letter-debtor/letter-debtor.js b/print/templates/reports/letter-debtor/letter-debtor.js index 083d9fd710..82dae0f2c8 100755 --- a/print/templates/reports/letter-debtor/letter-debtor.js +++ b/print/templates/reports/letter-debtor/letter-debtor.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -58,6 +59,7 @@ module.exports = { }, }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/receipt/receipt.html b/print/templates/reports/receipt/receipt.html index 5dc1846f7e..df14909fb5 100644 --- a/print/templates/reports/receipt/receipt.html +++ b/print/templates/reports/receipt/receipt.html @@ -1,45 +1,29 @@ - - - - - - - - - -
- - - -
-
-
-

{{$t('title')}}

-

- Recibo de {{client.socialName}}, - la cantidad de {{receipt.amountPaid}} € en concepto de 'entrega a cuenta', - quedando pendiente en la cuenta del cliente - un saldo de {{receipt.amountUnpaid}} €. -

-
- -

{{$t('payed', [ - 'Algemesí', - receipt.payed.getDate(), - $t('months')[receipt.payed.getMonth()], - receipt.payed.getFullYear()]) - }} -

-
-
-
-
- - - -
- - \ No newline at end of file + + +
+
+
+

{{$t('title')}}

+

+ Recibo de {{client.socialName}}, + la cantidad de {{receipt.amountPaid}} € en concepto de 'entrega a cuenta', + quedando pendiente en la cuenta del cliente + un saldo de {{receipt.amountUnpaid}} €. +

+
+ +

{{$t('payed', [ + 'Algemesí', + receipt.payed.getDate(), + $t('months')[receipt.payed.getMonth()], + receipt.payed.getFullYear()]) + }} +

+
+
+
+
+ + + \ No newline at end of file diff --git a/print/templates/reports/receipt/receipt.js b/print/templates/reports/receipt/receipt.js index b368764b16..19dfa60657 100755 --- a/print/templates/reports/receipt/receipt.js +++ b/print/templates/reports/receipt/receipt.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -20,6 +21,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/sepa-core/sepa-core.html b/print/templates/reports/sepa-core/sepa-core.html index c935bc2a8d..8914ecb2a3 100644 --- a/print/templates/reports/sepa-core/sepa-core.html +++ b/print/templates/reports/sepa-core/sepa-core.html @@ -1,201 +1,183 @@ - - - - - - - + + + + + + + + + + + + + + + + + + +
- - - -
-
-
-

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

-

- 1. {{$t('instructions.accountFields')}} -

-

- 2. {{$t('instructions.signDocument')}} -

-

- {{$t('instructions.thanks')}} -

-
-
-
+ + +
+
+
+

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

+

+ 1. {{$t('instructions.accountFields')}} +

+

+ 2. {{$t('instructions.signDocument')}} +

+

+ {{$t('instructions.thanks')}} +

+
+
+
- - - -
-
-

{{$t('title')}}

-
-
-
- {{$t('supplier.toCompleteBySupplier')}} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$t('supplier.orderReference')}}{{supplier.mandateCode}}
{{$t('supplier.identifier')}} -
ES89000B97367486
-
B97367486-000
-
{{$t('supplier.name')}}{{supplier.name}}
{{$t('supplier.street')}}{{supplier.street}}
{{$t('supplier.location')}}{{supplier.postCode}}, {{supplier.city}} ({{supplier.province}})
{{$t('supplier.country')}}{{supplier.country}}
+ +
+
+

{{$t('title')}}

+
+
+
+ {{$t('supplier.toCompleteBySupplier')}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('supplier.orderReference')}}{{supplier.mandateCode}}
{{$t('supplier.identifier')}} +
ES89000B97367486
+
B97367486-000
+
{{$t('supplier.name')}}{{supplier.name}}
{{$t('supplier.street')}}{{supplier.street}}
{{$t('supplier.location')}}{{supplier.postCode}}, {{supplier.city}} ({{supplier.province}})
{{$t('supplier.country')}}{{supplier.country}}
+
+
+ +

{{$t('description')}}

+

+ {{$t('documentCopy')}} +

+ +
+
+
+ {{$t('client.toCompleteByClient')}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -
+ {{$t('client.name')}} +
{{$t('client.accountHolder')}}
+ 		{{client.socialName}}
+ {{$t('client.fiscalId')}} + {{client.fi}}
{{$t('client.street')}}{{client.street}}
{{$t('client.location')}}{{client.postcode}}, {{client.city}} ({{client.province}})
{{$t('client.country')}}{{client.country}}
{{$t('client.swift')}} +
+
- - -

{{$t('description')}}

-

- {{$t('documentCopy')}} -

- -
-
-
- {{$t('client.toCompleteByClient')}} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$t('client.name')}} -
{{$t('client.accountHolder')}}
- 		{{client.socialName}}
- {{$t('client.fiscalId')}} - {{client.fi}}
{{$t('client.street')}}{{client.street}}
{{$t('client.location')}}{{client.postcode}}, {{client.city}} ({{client.province}})
{{$t('client.country')}}{{client.country}}
{{$t('client.swift')}} -
- -
-
{{$t('client.accountNumber')}}
-
- {{client.countryCode.substr(0, 1)}} - {{client.countryCode.substr(1, 1)}} - -
- 		-
- {{client.countryCode.substr(0, 1)}} - {{client.countryCode.substr(1, 1)}} - -
-
-
- {{$t('client.accountNumberFormat', [ - $t(`${client.country}`), - client.ibanLength, - client.countryCode - ])}} - -
-
{{$t('client.paymentType')}} - - - - - - - - -
-
- X -
- 		{{$t('client.recurrent')}}O -
- -
- 		{{$t('client.unique')}}
-
{{$t('client.signLocation')}}{{dated}}, {{client.province}}
{{$t('client.sign')}}
+
{{$t('client.accountNumber')}}
+
+ {{client.countryCode.substr(0, 1)}} + {{client.countryCode.substr(1, 1)}} +
- - -

{{$t('mandatoryFields')}}

-

{{$t('sendOrder')}}

- - - - - -
- - \ No newline at end of file +
+
+ {{client.countryCode.substr(0, 1)}} + {{client.countryCode.substr(1, 1)}} + +
+
+
+ {{$t('client.accountNumberFormat', [ + $t(`${client.country}`), + client.ibanLength, + client.countryCode + ])}} + +
+
{{$t('client.paymentType')}} + + + + + + + + +
+
+ X +
+ 		{{$t('client.recurrent')}}O +
+ +
+ 		{{$t('client.unique')}}
+
{{$t('client.signLocation')}}{{dated}}, {{client.province}}
{{$t('client.sign')}}
+ + + +

{{$t('mandatoryFields')}}

+

{{$t('sendOrder')}}

+ + + + + \ No newline at end of file diff --git a/print/templates/reports/sepa-core/sepa-core.js b/print/templates/reports/sepa-core/sepa-core.js index 85121b3921..ee8a64842f 100755 --- a/print/templates/reports/sepa-core/sepa-core.js +++ b/print/templates/reports/sepa-core/sepa-core.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -35,6 +36,7 @@ const rptSepaCore = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html index 1303f22663..8471c61bd3 100644 --- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html +++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html @@ -1,105 +1,89 @@ - - - - - - - - - -
- - - -
-
-
-
-

{{$t('title')}}

-
- - - - - - - - - - - - - - - -
{{$t('Supplier')}}{{supplier.id}}
{{$t('From')}}{{from | date('%d-%m-%Y')}}
{{$t('To')}}{{to | date('%d-%m-%Y')}}
-
-
-
-
-
{{$t('supplierData')}}
-
-

{{supplier.supplierName}}

-
- {{supplier.street}} -
-
- {{supplier.postcode}}, {{supplier.city}} ({{supplier.province}}) -
-
- {{supplier.country}} -
-
-
-
-
-
-

- {{$t('entry')}} {{entry.id}} - {{$t('dated')}} {{entry.shipped | date('%d-%m-%Y')}} - {{$t('reference')}} {{entry.ref}} -

- - - - - - - - - - - - - - - - - - - - -
{{$t('itemName')}}{{$t('Quantity')}}{{$t('price')}}{{$t('total')}}
{{buy.itemName}}{{buy.quantity}}{{buy.price | currency('EUR', $i18n.locale)}}{{buy.quantity * buy.price | currency('EUR', $i18n.locale)}}
- - {{buy.tag5}} {{buy.value5}} - - - {{buy.tag6}} {{buy.value6}} - - - {{buy.tag7}} {{buy.value7}} - -
- -
+ + +
+
+
+
+

{{$t('title')}}

+
+ + + + + + + + + + + + + + + +
{{$t('Supplier')}}{{supplier.id}}
{{$t('From')}}{{from | date('%d-%m-%Y')}}
{{$t('To')}}{{to | date('%d-%m-%Y')}}
+
+
+
+
+
{{$t('supplierData')}}
+
+

{{supplier.supplierName}}

+
+ {{supplier.street}} +
+
+ {{supplier.postcode}}, {{supplier.city}} ({{supplier.province}}) +
+
+ {{supplier.country}}
- - - -
- - \ No newline at end of file + + + +
+

+ {{$t('entry')}} {{entry.id}} + {{$t('dated')}} {{entry.shipped | date('%d-%m-%Y')}} + {{$t('reference')}} {{entry.ref}} +

+ + + + + + + + + + + + + + + + + + + + +
{{$t('itemName')}}{{$t('Quantity')}}{{$t('price')}}{{$t('total')}}
{{buy.itemName}}{{buy.quantity}}{{buy.price | currency('EUR', $i18n.locale)}}{{buy.quantity * buy.price | currency('EUR', $i18n.locale)}}
+ + {{buy.tag5}} {{buy.value5}} + + + {{buy.tag6}} {{buy.value6}} + + + {{buy.tag7}} {{buy.value7}} + +
+ +
+ + + + + \ No newline at end of file diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js index fee5796d22..2abb565677 100755 --- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js +++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js @@ -1,4 +1,5 @@ const Component = require(`vn-print/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -44,6 +45,7 @@ module.exports = { } }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html index 2045f2adbe..a0a7184016 100644 --- a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html +++ b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html @@ -1,39 +1,26 @@ - - - - - - - - - -
- - - -
-
-
-

{{$t('title')}}

-
- - - - - - - - - - - - - - - -
{{$t('Plate')}}{{$t('Concept')}}{{$t('expirationDate')}}
{{vehicleEvent.numberPlate}}{{vehicleEvent.description}}{{vehicleEvent.finished | date('%d-%m-%Y')}}
-
-
-
- - \ No newline at end of file + + +
+
+
+

{{$t('title')}}

+
+ + + + + + + + + + + + + + + +
{{$t('Plate')}}{{$t('Concept')}}{{$t('expirationDate')}}
{{vehicleEvent.numberPlate}}{{vehicleEvent.description}}{{vehicleEvent.finished | date('%d-%m-%Y')}}
+
+
+ \ No newline at end of file diff --git a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js index 33e60eab71..f0b711022f 100755 --- a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js +++ b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js @@ -1,4 +1,5 @@ const Component = require(`${appPath}/core/component`); +const reportBody = new Component('report-body'); const reportHeader = new Component('report-header'); const reportFooter = new Component('report-footer'); @@ -16,6 +17,7 @@ module.exports = { }, }, components: { + 'report-body': reportBody.build(), 'report-header': reportHeader.build(), 'report-footer': reportFooter.build() }, diff --git a/print/templates/reports/zone/zone.html b/print/templates/reports/zone/zone.html index c1e8d1ec14..4dceebf4fd 100644 --- a/print/templates/reports/zone/zone.html +++ b/print/templates/reports/zone/zone.html @@ -1,16 +1,5 @@ - - - - - - - - - -
-
{{zone.agencyName}}
-
{{zone.id}}
-
{{zone.plateNumber}} {{zone.time | date('%H:%M')}}
-
- - \ No newline at end of file + +
{{zone.agencyName}}
+
{{zone.id}}
+
{{zone.plateNumber}} {{zone.time | date('%H:%M')}}
+ \ No newline at end of file diff --git a/print/templates/reports/zone/zone.js b/print/templates/reports/zone/zone.js index d237c50c0c..463c28acfc 100755 --- a/print/templates/reports/zone/zone.js +++ b/print/templates/reports/zone/zone.js @@ -1,3 +1,6 @@ +const Component = require(`${appPath}/core/component`); +const reportBody = new Component('report-body'); + module.exports = { name: 'zone', async serverPrefetch() { @@ -11,6 +14,9 @@ module.exports = { return this.findOneFromDef('zone', [id]); } }, + components: { + 'report-body': reportBody.build() + }, props: { id: { type: Number,