231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
5 changed files with 0 additions and 17 deletions
Showing only changes of commit 1ce2705869 - Show all commits

View File

@ -31,9 +31,6 @@
"isExcludedFromAvailable": { "isExcludedFromAvailable": {
"type": "boolean" "type": "boolean"
}, },
// "notes": {
// "type": "string"
// },
"isConfirmed": { "isConfirmed": {
"type": "boolean" "type": "boolean"
}, },

View File

@ -12,7 +12,6 @@
"card": [ "card": [
{"state": "entry.card.basicData", "icon": "settings"}, {"state": "entry.card.basicData", "icon": "settings"},
{"state": "entry.card.buy.index", "icon": "icon-lines"}, {"state": "entry.card.buy.index", "icon": "icon-lines"},
{"state": "entry.card.observation", "icon": "insert_drive_file"},
{"state": "entry.card.log", "icon": "history"} {"state": "entry.card.log", "icon": "history"}
] ]
}, },
@ -74,16 +73,6 @@
}, },
"acl": ["buyer", "administrative"] "acl": ["buyer", "administrative"]
}, },
{
"url": "/observation",
"state": "entry.card.observation",
"component": "vn-entry-observation",
// "description": "Notes",
"params": {
"entry": "$ctrl.entry"
},
"acl": ["buyer", "administrative"]
},
{ {
"url" : "/log", "url" : "/log",
"state": "entry.card.log", "state": "entry.card.log",

View File

@ -167,7 +167,6 @@ module.exports = Self => {
s.name AS supplierName, s.name AS supplierName,
SUM(b.stickers) AS stickers, SUM(b.stickers) AS stickers,
e.evaNotes, e.evaNotes,
e.notes,
e.invoiceAmount, e.invoiceAmount,
CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg, 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 CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg

View File

@ -31,7 +31,6 @@ module.exports = Self => {
e.isConfirmed, e.isConfirmed,
e.invoiceNumber, e.invoiceNumber,
e.reference, e.reference,
e.notes,
e.evaNotes AS observation, e.evaNotes AS observation,
s.name AS supplierName, 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)) CAST((SUM(IF(p.volume > 0,p.volume,p.width * p.depth * IF(p.height, p.height, i.size + pconfig.upperGap))

View File

@ -1,7 +1,6 @@
SELECT SELECT
e.id, e.id,
e.invoiceNumber, e.invoiceNumber,
e.notes,
c.code companyCode, c.code companyCode,
t.landed t.landed
FROM entry e FROM entry e