diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json index 7747b81f9..e489981a6 100644 --- a/modules/entry/back/models/entry.json +++ b/modules/entry/back/models/entry.json @@ -31,9 +31,6 @@ "isExcludedFromAvailable": { "type": "boolean" }, - // "notes": { - // "type": "string" - // }, "isConfirmed": { "type": "boolean" }, diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json index d521edeca..c5c5f407a 100644 --- a/modules/entry/front/routes.json +++ b/modules/entry/front/routes.json @@ -12,7 +12,6 @@ "card": [ {"state": "entry.card.basicData", "icon": "settings"}, {"state": "entry.card.buy.index", "icon": "icon-lines"}, - {"state": "entry.card.observation", "icon": "insert_drive_file"}, {"state": "entry.card.log", "icon": "history"} ] }, @@ -74,16 +73,6 @@ }, "acl": ["buyer", "administrative"] }, - { - "url": "/observation", - "state": "entry.card.observation", - "component": "vn-entry-observation", - // "description": "Notes", - "params": { - "entry": "$ctrl.entry" - }, - "acl": ["buyer", "administrative"] - }, { "url" : "/log", "state": "entry.card.log", diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js index 5ee51de8e..388ba52a1 100644 --- a/modules/travel/back/methods/travel/extraCommunityFilter.js +++ b/modules/travel/back/methods/travel/extraCommunityFilter.js @@ -167,7 +167,6 @@ module.exports = Self => { s.name AS supplierName, SUM(b.stickers) AS stickers, e.evaNotes, - e.notes, e.invoiceAmount, CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg, CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg diff --git a/modules/travel/back/methods/travel/getEntries.js b/modules/travel/back/methods/travel/getEntries.js index 5ca12f7a1..71bb0d8fb 100644 --- a/modules/travel/back/methods/travel/getEntries.js +++ b/modules/travel/back/methods/travel/getEntries.js @@ -31,7 +31,6 @@ module.exports = Self => { e.isConfirmed, e.invoiceNumber, e.reference, - e.notes, e.evaNotes AS observation, s.name AS supplierName, CAST((SUM(IF(p.volume > 0,p.volume,p.width * p.depth * IF(p.height, p.height, i.size + pconfig.upperGap)) diff --git a/print/templates/reports/entry-order/sql/entry.sql b/print/templates/reports/entry-order/sql/entry.sql index 57b8d9293..c30eebca8 100644 --- a/print/templates/reports/entry-order/sql/entry.sql +++ b/print/templates/reports/entry-order/sql/entry.sql @@ -1,7 +1,6 @@ SELECT e.id, e.invoiceNumber, - e.notes, c.code companyCode, t.landed FROM entry e