231801_test_to_master #1519
|
@ -31,9 +31,6 @@
|
|||
"isExcludedFromAvailable": {
|
||||
"type": "boolean"
|
||||
},
|
||||
// "notes": {
|
||||
// "type": "string"
|
||||
// },
|
||||
"isConfirmed": {
|
||||
"type": "boolean"
|
||||
},
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
SELECT
|
||||
e.id,
|
||||
e.invoiceNumber,
|
||||
e.notes,
|
||||
c.code companyCode,
|
||||
t.landed
|
||||
FROM entry e
|
||||
|
|
Loading…
Reference in New Issue