- |
+ |
- {{buy.buyFk}}
+ {{formatNumber(buy.buyFk)}}
|
-
+ |
{{date}}
|
-
+ |
{{`${buy.labelNum}/${buy.quantity / (packing || buy.packing)}`}}
diff --git a/print/templates/reports/buy-label-barcode/buy-label-barcode.js b/print/templates/reports/buy-label-barcode/buy-label-barcode.js
index 8c39a7046f..37b618f097 100755
--- a/print/templates/reports/buy-label-barcode/buy-label-barcode.js
+++ b/print/templates/reports/buy-label-barcode/buy-label-barcode.js
@@ -9,7 +9,7 @@ module.exports = {
this.date = Date.vnNew();
this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
if (!this.buys.length) throw new UserError(`Empty data source`);
- this.date = moment(this.date).format('WW/E');
+ this.date = moment(this.date).format('WW/DD');
},
methods: {
getBarcode(data) {
@@ -20,11 +20,14 @@ module.exports = {
xmlDocument: document,
format: 'code128',
displayValue: false,
- width: 3.8,
- height: 85,
+ width: 3.5,
+ height: 75,
margin: 0
});
return new XMLSerializer().serializeToString(svgNode);
+ },
+ formatNumber(number) {
+ return new Intl.NumberFormat('es-ES', {maximumFractionDigits: 0}).format(number);
}
},
props: {
diff --git a/print/templates/reports/buy-label-qr/assets/css/style.css b/print/templates/reports/buy-label-qr/assets/css/style.css
index 0e288704bc..36db0fdefe 100644
--- a/print/templates/reports/buy-label-qr/assets/css/style.css
+++ b/print/templates/reports/buy-label-qr/assets/css/style.css
@@ -34,6 +34,9 @@ html {
background-color: black;
color: white;
}
+.sm-txt {
+ font-size: 18px;
+}
.md-txt {
font-size: 20px;
}
diff --git a/print/templates/reports/buy-label-qr/buy-label-qr.html b/print/templates/reports/buy-label-qr/buy-label-qr.html
index 00e64b57d7..00ede54880 100644
--- a/print/templates/reports/buy-label-qr/buy-label-qr.html
+++ b/print/templates/reports/buy-label-qr/buy-label-qr.html
@@ -11,8 +11,8 @@
|
- {{buy.entryFk}}
+
@@ -103,7 +102,7 @@
|
- Entrada: {{buy.entryFk}}
+ Entrada: {{formatNumber(buy.entryFk)}}
|
diff --git a/print/templates/reports/buy-label-qr/buy-label-qr.js b/print/templates/reports/buy-label-qr/buy-label-qr.js
index 74470ad6dc..614e408168 100755
--- a/print/templates/reports/buy-label-qr/buy-label-qr.js
+++ b/print/templates/reports/buy-label-qr/buy-label-qr.js
@@ -9,7 +9,7 @@ module.exports = {
this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
if (!this.buys.length) throw new UserError(`Empty data source`);
this.qr = await this.getQr(this.buys[0].buyFk);
- this.date = moment(this.date).format('WW/E');
+ this.date = moment(this.date).format('WW/DD');
},
methods: {
getQr(data) {
@@ -24,6 +24,9 @@ module.exports = {
margin: 0,
errorCorrectionLevel: 'L'
});
+ },
+ formatNumber(number) {
+ return new Intl.NumberFormat('es-ES', {maximumFractionDigits: 0}).format(number);
}
},
props: {
diff --git a/print/templates/reports/buy-label-supplier/assets/css/style.css b/print/templates/reports/buy-label-supplier/assets/css/style.css
index 3b1f2f91e3..f64e016886 100644
--- a/print/templates/reports/buy-label-supplier/assets/css/style.css
+++ b/print/templates/reports/buy-label-supplier/assets/css/style.css
@@ -1,7 +1,7 @@
html {
font-family: "Roboto", "Helvetica", "Arial", sans-serif;
margin-top: -7px;
- font-size: 28px;
+ font-size: 20px;
}
table {
border: 1px solid;
@@ -10,22 +10,22 @@ table {
}
td {
border: 1px solid;
- padding: 5px;
+ padding: 2px;
width: 100%;
}
span {
- font-size: 48px;
+ font-size: 34px;
font-weight: bold;
}
.lbl {
color: gray;
font-weight: lighter;
- font-size: 18px;
+ font-size: 12px;
display: block;
}
.cell {
width: 157px;
- height: 50px;
+ height: 35px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/print/templates/reports/buy-label-supplier/buy-label-supplier.html b/print/templates/reports/buy-label-supplier/buy-label-supplier.html
index 5777d34de0..31fef38f77 100644
--- a/print/templates/reports/buy-label-supplier/buy-label-supplier.html
+++ b/print/templates/reports/buy-label-supplier/buy-label-supplier.html
@@ -86,7 +86,7 @@
{{$t('boxNum')}}
- {{`${buy.labelNum} / ${buy.maxLabelNum}`}}
+ {{getTotal(buy)}}
|
diff --git a/print/templates/reports/buy-label-supplier/buy-label-supplier.js b/print/templates/reports/buy-label-supplier/buy-label-supplier.js
index 3cef5f2950..c8af17a5d0 100755
--- a/print/templates/reports/buy-label-supplier/buy-label-supplier.js
+++ b/print/templates/reports/buy-label-supplier/buy-label-supplier.js
@@ -9,8 +9,8 @@ module.exports = {
mixins: [vnReport],
async serverPrefetch() {
const buy = await models.Buy.findById(this.id, null);
- this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id]);
- const date = new Date();
+ this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id, this.id]);
+ const date = Date.vnNew();
this.weekNum = moment(date).isoWeek();
this.dayNum = moment(date).day();
},
@@ -24,9 +24,15 @@ module.exports = {
format: 'code128',
displayValue: false,
width: 3.8,
- height: 115,
+ height: 60,
+ margin: 3,
});
return new XMLSerializer().serializeToString(svgNode);
+ },
+ getTotal(buy) {
+ return (this.showEntryLines) ?
+ `${buy.entryLabelNum} / ${buy.entryLabels}` :
+ `${buy.buyLabelNum} / ${buy.buyLabels}`;
}
},
props: {
@@ -34,6 +40,10 @@ module.exports = {
type: Number,
required: true,
description: 'The entry id'
+ },
+ showEntryLines: {
+ type: Boolean,
+ required: false
}
}
};
diff --git a/print/templates/reports/buy-label-supplier/options.json b/print/templates/reports/buy-label-supplier/options.json
index 4ed0461b30..a2a781cbfb 100644
--- a/print/templates/reports/buy-label-supplier/options.json
+++ b/print/templates/reports/buy-label-supplier/options.json
@@ -1,6 +1,6 @@
{
"width": "10cm",
- "height": "10cm",
+ "height": "6.5cm",
"margin": {
"top": "0.17cm",
"right": "0.2cm",
diff --git a/print/templates/reports/buy-label-supplier/sql/buy.sql b/print/templates/reports/buy-label-supplier/sql/buy.sql
index 26efeb06ef..fe001ff104 100644
--- a/print/templates/reports/buy-label-supplier/sql/buy.sql
+++ b/print/templates/reports/buy-label-supplier/sql/buy.sql
@@ -10,7 +10,7 @@ WITH RECURSIVE numbers AS (
)
),
labels AS (
- SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
+ SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) entryLabelNum,
i.name,
i.`size`,
i.category,
@@ -33,6 +33,9 @@ labels AS (
WHERE b.entryFk = ?
AND num.n <= b.stickers
)
-SELECT *, (SELECT SUM(stickers) FROM buy WHERE entryFk = ?) maxLabelNum
+SELECT *,
+ ROW_NUMBER() OVER(ORDER BY entryLabelNum) buyLabelNum,
+ (SELECT SUM(stickers) FROM buy WHERE entryFk = ?) entryLabels,
+ (SELECT stickers FROM buy WHERE id = ?) buyLabels
FROM labels
WHERE id = ?
\ No newline at end of file
diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html
index 109afd2f58..8e69d6c658 100644
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@@ -16,7 +16,7 @@
| {{$t('date')}} |
- {{formatDate(route.created, '%d-%m-%Y')}} |
+ {{formatDate(route.dated, '%d-%m-%Y')}} |
{{$t('vehicle')}} |
{{route.vehicleTradeMark}} {{route.vehicleModel}} |
@@ -90,8 +90,7 @@
{{ticket.id}} |
{{ticket.clientFk}} {{ticket.addressName}} |
- {{ticket.addressFk.toString().substr(0, ticket.addressFk.toString().length - 3)}}
- {{ticket.addressFk.toString().substr(-3, 3)}}
+ {{ticket.addressFk.toString()}}
|
{{ticket.packages}} |
{{ticket.itemPackingTypes}} |
diff --git a/print/templates/reports/driver-route/sql/routes.sql b/print/templates/reports/driver-route/sql/routes.sql
index 9d2dd5c13f..334f2337d4 100644
--- a/print/templates/reports/driver-route/sql/routes.sql
+++ b/print/templates/reports/driver-route/sql/routes.sql
@@ -1,6 +1,6 @@
SELECT r.id,
r.m3,
- r.created,
+ r.dated,
r.time,
u.nickName userNickName,
v.tradeMark vehicleTradeMark,
diff --git a/print/templates/reports/entry-order/assets/css/style.css b/print/templates/reports/entry-order/assets/css/style.css
index 767b1185ab..858ae704e2 100644
--- a/print/templates/reports/entry-order/assets/css/style.css
+++ b/print/templates/reports/entry-order/assets/css/style.css
@@ -17,4 +17,14 @@ h3 {
.tags {
font-size: 10px;
margin: 0;
+}
+
+.column-oriented th,
+.column-oriented td{
+ padding: 5px
+}
+
+[row] {
+ display: flex;
+ column-gap: 5px;
}
\ No newline at end of file
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index e5d3bfb6de..d3f909d4d9 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -41,42 +41,50 @@
+ | {{$t('code')}} |
{{$t('boxes')}} |
- |
+ |
{{$t('packing')}} |
- {{$t('concept')}} |
- {{$t('reference')}} |
- {{$t('tags')}} |
- {{$t('quantity')}} |
- |
- {{$t('price')}} |
- |
- {{$t('amount')}} |
+ {{$t('concept')}} |
+ {{$t('reference')}} |
+ {{$t('tags')}} |
+ {{$t('quantity')}} |
+ |
+ {{$t('price')}} |
+ |
+ {{$t('amount')}} |
+ | {{buy.itemFk}} |
{{buy.stickers}} |
- x |
- {{buy.packing}} |
- {{buy.name}} |
- {{buy.comment}} |
-
- {{buy.tag5}} → {{buy.value5}}
- {{buy.tag6}} → {{buy.value6}}
- {{buy.tag7}} → {{buy.value7}}
+ | x |
+ {{buy.packing}} |
+ {{buy.name}} |
+ {{buy.comment}} |
+
+
+ {{buy.tag5}}→ {{buy.value5}}
+ {{buy.tag6}}→ {{buy.value6}}
+
+ {{buy.tag7}}→ {{buy.value7}}
+ {{buy.tag8}}→ {{buy.value8}}
+ |
- {{buy.quantity | number($i18n.locale)}} |
- x |
- {{buy.buyingValue | currency('EUR', $i18n.locale)}} |
- = |
-
+ | {{buy.quantity | number($i18n.locale)}} |
+ x |
+ {{buy.buyingValue | currency('EUR', $i18n.locale)}} |
+ = |
+
{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
|
+ |
{{getTotalBy('stickers')}} |
|
|
diff --git a/print/templates/reports/entry-order/locale/es.yml b/print/templates/reports/entry-order/locale/es.yml
index 5a6716ba13..9ec3578021 100644
--- a/print/templates/reports/entry-order/locale/es.yml
+++ b/print/templates/reports/entry-order/locale/es.yml
@@ -16,4 +16,5 @@ entry: Entrada {0}
supplierData: Datos del proveedor
notes: Notas
reference: Referencia
-tags: Tags
\ No newline at end of file
+tags: Etiquetas
+code: Código
\ No newline at end of file
diff --git a/print/templates/reports/entry-order/sql/buys.sql b/print/templates/reports/entry-order/sql/buys.sql
index 92c055483c..545849908a 100644
--- a/print/templates/reports/entry-order/sql/buys.sql
+++ b/print/templates/reports/entry-order/sql/buys.sql
@@ -10,7 +10,9 @@ SELECT b.itemFk,
i.tag6,
i.value6,
i.tag7,
- i.value7
+ i.value7,
+ i.tag8,
+ i.value8
FROM buy b
JOIN item i ON i.id = b.itemFk
LEFT JOIN item i2 ON i2.id = b.itemOriginalFk
diff --git a/print/templates/reports/expedition-pallet-label/sql/labelData.sql b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
index 49a4031ae0..5ddf8eb6ec 100644
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@@ -4,7 +4,7 @@ SELECT ep.id palletFk,
r.description `zone`,
COUNT(es.id) labels,
t.warehouseFk warehouseFk,
- dayname(r.created) `dayName`,
+ dayname(r.dated) `dayName`,
rs.id <=> rm.roadmapStopFk isMatch
FROM vn.roadmapStop rs
JOIN vn.expeditionPallet ep ON ep.truckFk = rs.id
diff --git a/print/templates/reports/incoterms-authorization/locale/en.yml b/print/templates/reports/incoterms-authorization/locale/en.yml
new file mode 100644
index 0000000000..eb6a8a5138
--- /dev/null
+++ b/print/templates/reports/incoterms-authorization/locale/en.yml
@@ -0,0 +1,39 @@
+reportName: autorization-incoterms
+description: '{socialName} a duly constituted and responsible company limited
+and registered under corporate law {country} and here represented by {socialName}, with address in {address},
+CIF {fiscalID}. Hereinafter referred to as {name}.'
+issued: 'In {0}, on {1} of {2} of {3}'
+client: 'Customer {0}'
+declaration: '{socialName} hereby declares that:'
+declarations:
+ - 'All purchases made by {socialName} with {companyName} They are delivered according to the conditions defined in the Incoterm.'
+ - '{socialName} recognizes that it is important for {companyName} have
+proof of intra-community delivery of the goods to {destinationCountry} to
+be able to invoice with 0% VAT.'
+ - 'Therefore, by signing this agreement, {socialName} declares that all goods
+purchased from {companyName} will be delivered to {destinationCountry}.'
+ - 'Besides, {socialName} shall, at the first request of {companyName},
+provide proof that all products purchased from {companyName} have
+been delivered in {destinationCountry}.'
+ - 'In addition to the above, {companyName} will provide to {socialName}
+a monthly summary that includes all bills (and corresponding deliveries).
+{socialName} will sign and return the monthly summary to {companyName},
+S.L. within 5 days of receiving the summary.'
+signer:
+ representative: Representative
+ representativeRole: Position of the representative
+ signed: Date of signature
+manager: Manager
+months:
+ - 'January'
+ - 'February'
+ - 'March'
+ - 'April'
+ - 'May'
+ - 'June'
+ - 'July'
+ - 'August'
+ - 'September'
+ - 'October'
+ - 'November'
+ - 'December'
diff --git a/print/templates/reports/invoice-incoterms/sql/incoterms.sql b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
index 016a8342ec..77a7daad11 100644
--- a/print/templates/reports/invoice-incoterms/sql/incoterms.sql
+++ b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
@@ -1,9 +1,9 @@
WITH tickets AS(
-SELECT id, packages, addressFk, weight
- FROM ticket
- WHERE refFk= ?
+SELECT id, addressFk, packages, refFk, weight
+ FROM vn.ticket
+ WHERE refFk = ?
), volume AS(
-SELECT SUM(volume) volume
+SELECT SUM(sv.volume) volume, MAX(t.weight)weight
FROM tickets t
JOIN vn.saleVolume sv ON sv.ticketFk = t.id
), intrastat AS(
@@ -12,10 +12,14 @@ SELECT GROUP_CONCAT(DISTINCT ir.description ORDER BY ir.description SEPARATOR '
JOIN vn.sale s ON t.id = s.ticketFk
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.intrastat ir ON ir.id = i.intrastatFk
-)SELECT SUM(t.packages) packages,
- a.incotermsFk,
+), totalPackages AS(
+SELECT SUM(packages)packages
+ FROM tickets s
+)
+SELECT tp.packages,
+ io.incotermsFk,
ic.name incotermsName,
- MAX(t.weight) weight,
+ v.weight weight,
ca.fiscalName customsAgentName,
ca.street customsAgentStreet,
ca.nif customsAgentNif,
@@ -23,9 +27,10 @@ SELECT GROUP_CONCAT(DISTINCT ir.description ORDER BY ir.description SEPARATOR '
ca.email customsAgentEmail,
CAST(v.volume AS DECIMAL (10,2)) volume,
i.intrastat
- FROM tickets t
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.incoterms ic ON ic.code = a.incotermsFk
- LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
+ FROM vn.invoiceOut io
+ JOIN vn.incoterms ic ON ic.code = io.incotermsFk
+ LEFT JOIN vn.customsAgent ca ON ca.id = io.customsAgentFk
JOIN volume v
JOIN intrastat i
+ JOIN totalPackages tp
+ WHERE `ref` = (SELECT DISTINCT refFk FROM tickets)
\ No newline at end of file