{{name}}
+
+ {{category.name}}
+
+
+
+ Id/{{$ctrl.$t('Name')}}: {{$ctrl.filter.search}}
+
+
+ {{$ctrl.$t('Category')}}: {{category.selection.name}}
+
+
+ {{$ctrl.$t('Type')}}: {{type.selection.name}}
+
+
+ {{$ctrl.$t('Buyer')}}: {{buyer.selection.nickname}}
+
+
+ {{$ctrl.$t('Warehouse')}}: {{warehouse.selection.name}}
+
+
+ {{$ctrl.$t('Started')}}: {{$ctrl.filter.started | date:'dd/MM/yyyy'}}
+
+
+ {{$ctrl.$t('Ended')}}: {{$ctrl.filter.ended | date:'dd/MM/yyyy'}}
+
+
+ {{$ctrl.$t('For me')}}: {{$ctrl.filter.mine ? '✓' : '✗'}}
+
+
+ {{$ctrl.$t('Minimum price')}}: {{$ctrl.filter.hasMinPrice ? '✓' : '✗'}}
+
+
+ {{$ctrl.showTagInfo(chipTag)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+|
+ |
+ + Item ID + | ++ Description + | ++ Grouping price + | ++ Packing price + | ++ Min price + | ++ Started + | ++ Ended + | ++ Warehouse + | ++ |
|---|---|---|---|---|---|---|---|---|---|
|
+ |
+
+ {{id}}
+
+ {{name}}
+
+ |
+
+
+
+ {{itemFk.selection.name}}
+
+
+ {{price.subName}}+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+
+| + | + Identifier + | ++ Grouping + | ++ Packing + | ++ Description + | ++ Stems + | ++ Size + | ++ Type + | ++ Category + | ++ Intrastat + | ++ Origin + | ++ Buyer + | ++ Weight/Piece + | ++ Multiplier + | ++ Active + | ++ Producer + | ++ Landed + | ++ |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
+ |
+ + + {{::item.id}} + + | +{{::item.grouping | dashIfEmpty}} | +{{::item.packing | dashIfEmpty}} | +
+
+
+ {{::item.subName}}+ |
+ {{::item.stems}} | +{{::item.size}} | ++ {{::item.typeName}} + | ++ {{::item.category}} + | ++ {{::item.intrastat}} + | +{{::item.origin}} | ++ + {{::item.userName}} + + | +{{::item.weightByPiece}} | +{{::item.stemMultiplier}} | +
+ |
+ {{::item.producer | dashIfEmpty}} | +{{::item.landed | date:'dd/MM/yyyy'}} | +
+ |
+
+
+
+
+
+
+ Total
+
+
+
+
+ |
+ |
+ + Created + | ++ Item + | ++ Concept + | ++ Parking + | ++ Shelving + | ++ Etiqueta + | ++ Packing + | +
|---|---|---|---|---|---|---|---|
|
+ |
+ {{::itemShelvingPlacementSupplyStock.created | date: 'dd/MM/yyyy'}} | ++ {{::itemShelvingPlacementSupplyStock.itemFk}} + | ++ + {{itemShelvingPlacementSupplyStock.longName}} + + | ++ {{::itemShelvingPlacementSupplyStock.parking}} + | ++ {{::itemShelvingPlacementSupplyStock.shelving}} + | ++ {{(itemShelvingPlacementSupplyStock.stock / itemShelvingPlacementSupplyStock.packing).toFixed(2)}} + | ++ {{::itemShelvingPlacementSupplyStock.packing}} + | +
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/search-panel/index.js b/modules/item/front/item-type/search-panel/index.js
new file mode 100644
index 000000000..17a439c39
--- /dev/null
+++ b/modules/item/front/item-type/search-panel/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.component('vnItemTypeSearchPanel', {
+ template: require('./index.html'),
+ controller: SearchPanel
+});
diff --git a/modules/item/front/item-type/summary/index.html b/modules/item/front/item-type/summary/index.html
new file mode 100644
index 000000000..d003c8f38
--- /dev/null
+++ b/modules/item/front/item-type/summary/index.html
@@ -0,0 +1,50 @@
++ {{summary.id}} - {{summary.name}} - {{summary.worker.firstName}} {{summary.worker.lastName}} +
+Basic data
+
+
+
+
+
diff --git a/modules/item/front/request-search-panel/index.js b/modules/item/front/request-search-panel/index.js
new file mode 100644
index 000000000..556bdd874
--- /dev/null
+++ b/modules/item/front/request-search-panel/index.js
@@ -0,0 +1,48 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+class Controller extends SearchPanel {
+ constructor($element, $) {
+ super($element, $);
+
+ this.states = [
+ {code: 'pending', name: this.$t('Pending')},
+ {code: 'accepted', name: this.$t('Accepted')},
+ {code: 'denied', name: this.$t('Denied')}
+ ];
+ }
+
+ get from() {
+ return this._from;
+ }
+
+ set from(value) {
+ this._from = value;
+ this.filter.scopeDays = null;
+ }
+
+ get to() {
+ return this._to;
+ }
+
+ set to(value) {
+ this._to = value;
+ this.filter.scopeDays = null;
+ }
+
+ get scopeDays() {
+ return this._scopeDays;
+ }
+
+ set scopeDays(value) {
+ this._scopeDays = value;
+
+ this.filter.from = null;
+ this.filter.to = null;
+ }
+}
+
+ngModule.vnComponent('vnRequestSearchPanel', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/item/front/request-search-panel/index.spec.js b/modules/item/front/request-search-panel/index.spec.js
new file mode 100644
index 000000000..56c76eabf
--- /dev/null
+++ b/modules/item/front/request-search-panel/index.spec.js
@@ -0,0 +1,48 @@
+import './index';
+
+describe(' Component vnRequestSearchPanel', () => {
+ let controller;
+
+ beforeEach(ngModule('item'));
+
+ beforeEach(inject($componentController => {
+ controller = $componentController('vnRequestSearchPanel', {$element: null});
+ controller.$t = () => {};
+ controller.filter = {};
+ }));
+
+ describe('from() setter', () => {
+ it('should clear the scope days when setting the from property', () => {
+ controller.filter.scopeDays = 1;
+
+ controller.from = Date.vnNew();
+
+ expect(controller.filter.scopeDays).toBeNull();
+ expect(controller.from).toBeDefined();
+ });
+ });
+
+ describe('to() setter', () => {
+ it('should clear the scope days when setting the to property', () => {
+ controller.filter.scopeDays = 1;
+
+ controller.to = Date.vnNew();
+
+ expect(controller.filter.scopeDays).toBeNull();
+ expect(controller.to).toBeDefined();
+ });
+ });
+
+ describe('scopeDays() setter', () => {
+ it('should clear the date range when setting the scopeDays property', () => {
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
+
+ controller.scopeDays = 1;
+
+ expect(controller.filter.from).toBeNull();
+ expect(controller.filter.to).toBeNull();
+ expect(controller.scopeDays).toBeDefined();
+ });
+ });
+});
diff --git a/modules/item/front/request-search-panel/locale/es.yml b/modules/item/front/request-search-panel/locale/es.yml
new file mode 100644
index 000000000..8d5276194
--- /dev/null
+++ b/modules/item/front/request-search-panel/locale/es.yml
@@ -0,0 +1,4 @@
+Ink: Tinta
+Origin: Origen
+Producer: Productor
+For me: Para mi
\ No newline at end of file
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
new file mode 100644
index 000000000..03c8db8ec
--- /dev/null
+++ b/modules/item/front/request/index.html
@@ -0,0 +1,172 @@
+
+
+
diff --git a/modules/item/front/search-panel/index.js b/modules/item/front/search-panel/index.js
new file mode 100644
index 000000000..2448728be
--- /dev/null
+++ b/modules/item/front/search-panel/index.js
@@ -0,0 +1,67 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+class Controller extends SearchPanel {
+ constructor($element, $) {
+ super($element, $);
+ let model = 'Item';
+ let moreFields = ['id', 'description', 'name', 'isActive'];
+
+ let properties;
+ let validations = window.validations;
+
+ if (validations && validations[model])
+ properties = validations[model].properties;
+ else
+ properties = {};
+
+ this.moreFields = [];
+ for (let field of moreFields) {
+ let prop = properties[field];
+ this.moreFields.push({
+ name: field,
+ label: prop ? prop.description : field,
+ type: prop ? prop.type : null
+ });
+ }
+ }
+
+ get filter() {
+ let filter = this.$.filter;
+
+ for (let fieldFilter of this.fieldFilters)
+ filter[fieldFilter.name] = fieldFilter.value;
+
+ return filter;
+ }
+
+ set filter(value) {
+ if (!value)
+ value = {};
+ if (!value.tags)
+ value.tags = [{}];
+
+ this.fieldFilters = [];
+ for (let field of this.moreFields) {
+ if (value[field.name] != undefined) {
+ this.fieldFilters.push({
+ name: field.name,
+ value: value[field.name],
+ info: field
+ });
+ }
+ }
+
+ this.$.filter = value;
+ }
+
+ removeField(index, field) {
+ this.fieldFilters.splice(index, 1);
+ delete this.$.filter[field];
+ }
+}
+
+ngModule.vnComponent('vnItemSearchPanel', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/item/front/search-panel/index.spec.js b/modules/item/front/search-panel/index.spec.js
new file mode 100644
index 000000000..39b5b7aa5
--- /dev/null
+++ b/modules/item/front/search-panel/index.spec.js
@@ -0,0 +1,60 @@
+import './index.js';
+
+describe('Item', () => {
+ describe('Component vnItemSearchPanel', () => {
+ let $element;
+ let controller;
+
+ beforeEach(ngModule('item'));
+
+ beforeEach(inject($componentController => {
+ $element = angular.element(``);
+ controller = $componentController('vnItemSearchPanel', {$element});
+ }));
+
+ describe('filter() setter', () => {
+ it(`should set the tags property to the scope filter with an empty array`, () => {
+ const expectedFilter = {
+ tags: [{}]
+ };
+ controller.filter = null;
+
+ expect(controller.filter).toEqual(expectedFilter);
+ });
+
+ it(`should set the tags property to the scope filter with an array of tags`, () => {
+ const expectedFilter = {
+ description: 'My item',
+ tags: [{}]
+ };
+ const expectedFieldFilter = [{
+ info: {
+ label: 'description',
+ name: 'description',
+ type: null
+ },
+ name: 'description',
+ value: 'My item'
+ }];
+ controller.filter = {
+ description: 'My item'
+ };
+
+ expect(controller.filter).toEqual(expectedFilter);
+ expect(controller.fieldFilters).toEqual(expectedFieldFilter);
+ });
+ });
+
+ describe('removeField()', () => {
+ it(`should remove the description property from the fieldFilters and from the scope filter`, () => {
+ const expectedFilter = {tags: [{}]};
+ controller.filter = {description: 'My item'};
+
+ controller.removeField(0, 'description');
+
+ expect(controller.filter).toEqual(expectedFilter);
+ expect(controller.fieldFilters).toEqual([]);
+ });
+ });
+ });
+});
diff --git a/modules/item/front/search-panel/locale/es.yml b/modules/item/front/search-panel/locale/es.yml
new file mode 100644
index 000000000..67a5200d7
--- /dev/null
+++ b/modules/item/front/search-panel/locale/es.yml
@@ -0,0 +1,8 @@
+Ink: Tinta
+Origin: Origen
+Producer: Productor
+With visible: Con visible
+Field: Campo
+More fields: Más campos
+Add field: Añadir campo
+Remove field: Quitar campo
\ No newline at end of file
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
new file mode 100644
index 000000000..0e4cfc955
--- /dev/null
+++ b/modules/item/front/summary/index.html
@@ -0,0 +1,227 @@
+
+
+
+ Visible
+{{$ctrl.summary.visible}}
+Available
+{{$ctrl.summary.available}}
+
+
+ + Basic data + +
++ Basic data +
++ + Other data + +
++ Other data +
++ + Tags + +
++ Tags +
++ + Description + +
++ Description +
++ {{$ctrl.summary.item.description}} +
++ + Tax + +
++ Tax +
++ + Botanical + +
++ Botanical +
++ + Barcode + +
++ Barcode +
++ {{barcode.code}} +
+
- {{buy.itemFk}}
+ {{formatNumber(buy.itemFk)}}
{{`${(packing || buy.packing)} x ${buy.stems || ''}`}}
@@ -56,7 +56,7 @@
{{'LAID'}}
- {{buy.entryFk}}
+ {{formatNumber(buy.entryFk)}}
- {{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 8c39a7046..37b618f09 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 0e288704b..36db0fdef 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 00e64b57d..00ede5488 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.itemFk}}
+ {{formatNumber(buy.itemFk)}}
{{'LAID'}}
-
- {{buy.entryFk}}
+
@@ -103,7 +102,7 @@
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 74470ad6d..614e40816 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/buy-label-supplier.html b/print/templates/reports/buy-label-supplier/buy-label-supplier.html
index 5777d34de..31fef38f7 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 @@
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 3cef5f295..5e59472eb 100755
--- a/print/templates/reports/buy-label-supplier/buy-label-supplier.js
+++ b/print/templates/reports/buy-label-supplier/buy-label-supplier.js
@@ -9,7 +9,7 @@ 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]);
+ this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id, this.id]);
const date = new Date();
this.weekNum = moment(date).isoWeek();
this.dayNum = moment(date).day();
@@ -27,6 +27,11 @@ module.exports = {
height: 115,
});
return new XMLSerializer().serializeToString(svgNode);
+ },
+ getTotal(buy) {
+ return (this.showEntryLines) ?
+ `${buy.entryLabelNum} / ${buy.entryLabels}` :
+ `${buy.buyLabelNum} / ${buy.buyLabels}`;
}
},
props: {
@@ -34,6 +39,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/sql/buy.sql b/print/templates/reports/buy-label-supplier/sql/buy.sql
index 26efeb06e..fe001ff10 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 109afd2f5..e3a206656 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}}
diff --git a/print/templates/reports/driver-route/sql/routes.sql b/print/templates/reports/driver-route/sql/routes.sql
index 9d2dd5c13..334f2337d 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 767b1185a..858ae704e 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 e5d3bfb6d..d3f909d4d 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -41,42 +41,50 @@
- Entrada: {{buy.entryFk}}
+ Entrada: {{formatNumber(buy.entryFk)}}
{{$t('boxNum')}}
- {{`${buy.labelNum} / ${buy.maxLabelNum}`}}
+ {{getTotal(buy)}}
| {{$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 5a6716ba1..9ec357802 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 92c055483..545849908 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 49a4031ae..5ddf8eb6e 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 |