feat: refs #6724 permissions to vn.entry.isBooked #2147
CHANGELOG.mdpackage.json
back
db
dump
routines
bi/views
vn
procedures
clean.sqlinventory_repair.sqlinvoiceInTaxMakeByDua.sqlinvoiceInTax_recalc.sqlitem_getSimilar.sqlticket_closeByTicket.sql
triggers
views
vn2008
versions
10892-yellowGerbera
10905-grayIvy
10918-wheatRose
10923-pinkOak
10942-turquoiseCyca
10943-greenOrchid
10946-blueChrysanthemum
loopback/locale
modules
invoiceOut
parking/back
route/back/models
shelving/back
supplier
ticket
back
methods
ticket-log/specs
ticket
models
front/descriptor-menu
worker/back/models
|
@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [2414.01] - 2024-04-04
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
## [2408.01] - 2024-02-22
|
## [2408.01] - 2024-02-22
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
"Accounting": {
|
"Accounting": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"Buyer": {
|
"Buyer": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"Campaign": {
|
"Campaign": {
|
||||||
|
@ -94,6 +94,9 @@
|
||||||
"Module": {
|
"Module": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"MrwConfig": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"Notification": {
|
"Notification": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
@ -166,10 +169,10 @@
|
||||||
"VnRole": {
|
"VnRole": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"MrwConfig": {
|
"WorkerActivity": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"WorkerActivityType": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
{
|
||||||
|
"name": "WorkerActivity",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "workerActivity"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"id": true,
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"created": {
|
||||||
|
"type": "date"
|
||||||
|
},
|
||||||
|
"model": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"event": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"relations": {
|
||||||
|
"workerFk": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "Worker",
|
||||||
|
"foreignKey": "workerFk"
|
||||||
|
},
|
||||||
|
"workerActivityTypeFk": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "WorkerActivityType",
|
||||||
|
"foreignKey": "workerActivityTypeFk"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"name": "WorkerActivityType",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "workerActivityType"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"code": {
|
||||||
|
"id": true,
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"type": "string",
|
||||||
|
"required": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -3068,18 +3068,16 @@ INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentIns
|
||||||
UPDATE vn.department
|
UPDATE vn.department
|
||||||
SET workerFk = null;
|
SET workerFk = null;
|
||||||
|
|
||||||
-- NEW WAREHOUSE
|
|
||||||
|
|
||||||
INSERT INTO vn.packaging
|
INSERT INTO vn.packaging
|
||||||
VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0);
|
VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0);
|
||||||
|
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.intrastat
|
INSERT IGNORE INTO vn.intrastat
|
||||||
SET id = 44219999,
|
SET id = 44219999,
|
||||||
description = 'Manufacturas de madera',
|
description = 'Manufacturas de madera',
|
||||||
taxClassFk = 1,
|
taxClassFk = 1,
|
||||||
taxCodeFk = 1;
|
taxCodeFk = 1;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.warehouse
|
INSERT IGNORE INTO vn.warehouse
|
||||||
SET id = 999,
|
SET id = 999,
|
||||||
name = 'TestingWarehouse',
|
name = 'TestingWarehouse',
|
||||||
|
@ -3090,33 +3088,33 @@ INSERT IGNORE INTO vn.warehouse
|
||||||
hasProduction = TRUE;
|
hasProduction = TRUE;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.sector
|
INSERT IGNORE INTO vn.sector
|
||||||
SET id = 9991,
|
SET id = 9991,
|
||||||
description = 'NormalSector',
|
description = 'NormalSector',
|
||||||
warehouseFk = 999,
|
warehouseFk = 999,
|
||||||
code = 'NS',
|
code = 'NS',
|
||||||
isPackagingArea = FALSE,
|
isPackagingArea = FALSE,
|
||||||
sonFk = NULL,
|
sonFk = NULL,
|
||||||
isMain = TRUE,
|
isMain = TRUE,
|
||||||
itemPackingTypeFk = NULL;
|
itemPackingTypeFk = NULL;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.sector
|
INSERT IGNORE INTO vn.sector
|
||||||
SET id = 9992,
|
SET id = 9992,
|
||||||
description = 'PreviousSector',
|
description = 'PreviousSector',
|
||||||
warehouseFk = 999,
|
warehouseFk = 999,
|
||||||
code = 'PS',
|
code = 'PS',
|
||||||
isPackagingArea = FALSE,
|
isPackagingArea = FALSE,
|
||||||
sonFk = NULL,
|
sonFk = NULL,
|
||||||
isMain = TRUE,
|
isMain = TRUE,
|
||||||
itemPackingTypeFk = NULL;
|
itemPackingTypeFk = NULL;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.sector
|
INSERT IGNORE INTO vn.sector
|
||||||
SET id = 9993,
|
SET id = 9993,
|
||||||
description = 'MezaninneSector',
|
description = 'MezaninneSector',
|
||||||
warehouseFk = 999,
|
warehouseFk = 999,
|
||||||
code = 'MS',
|
code = 'MS',
|
||||||
isPackagingArea = FALSE,
|
isPackagingArea = FALSE,
|
||||||
sonFk = 9991,
|
sonFk = 9991,
|
||||||
isMain = TRUE,
|
isMain = TRUE,
|
||||||
itemPackingTypeFk = NULL;
|
itemPackingTypeFk = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
@ -3150,58 +3148,58 @@ INSERT IGNORE INTO vn.itemType
|
||||||
SET id = 999,
|
SET id = 999,
|
||||||
code = 'WOO',
|
code = 'WOO',
|
||||||
name = 'Wood Objects',
|
name = 'Wood Objects',
|
||||||
categoryFk = 3,
|
categoryFk = 3,
|
||||||
workerFk = 103,
|
workerFk = 103,
|
||||||
isInventory = TRUE,
|
isInventory = TRUE,
|
||||||
life = 10,
|
life = 10,
|
||||||
density = 250,
|
density = 250,
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
temperatureFk = 'warm';
|
temperatureFk = 'warm';
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.travel
|
INSERT IGNORE INTO vn.travel
|
||||||
SET id = 99,
|
SET id = 99,
|
||||||
shipped = CURDATE(),
|
shipped = CURDATE(),
|
||||||
landed = CURDATE(),
|
landed = CURDATE(),
|
||||||
warehouseInFk = 999,
|
warehouseInFk = 999,
|
||||||
warehouseOutFk = 1,
|
warehouseOutFk = 1,
|
||||||
isReceived = TRUE;
|
isReceived = TRUE;
|
||||||
|
|
||||||
INSERT INTO vn.entry
|
INSERT INTO vn.entry
|
||||||
SET id = 999,
|
SET id = 999,
|
||||||
supplierFk = 791,
|
supplierFk = 791,
|
||||||
isConfirmed = TRUE,
|
isConfirmed = TRUE,
|
||||||
dated = CURDATE(),
|
dated = CURDATE(),
|
||||||
travelFk = 99,
|
travelFk = 99,
|
||||||
companyFk = 442;
|
companyFk = 442;
|
||||||
|
|
||||||
INSERT INTO vn.ticket
|
INSERT INTO vn.ticket
|
||||||
SET id = 999999,
|
SET id = 999999,
|
||||||
clientFk = 2,
|
clientFk = 2,
|
||||||
warehouseFk = 999,
|
warehouseFk = 999,
|
||||||
shipped = CURDATE(),
|
shipped = CURDATE(),
|
||||||
nickname = 'Cliente',
|
nickname = 'Cliente',
|
||||||
addressFk = 1,
|
addressFk = 1,
|
||||||
companyFk = 442,
|
companyFk = 442,
|
||||||
agencyModeFk = 10,
|
agencyModeFk = 10,
|
||||||
landed = CURDATE();
|
landed = CURDATE();
|
||||||
|
|
||||||
INSERT INTO vn.collection
|
INSERT INTO vn.collection
|
||||||
SET id = 10101010,
|
SET id = 10101010,
|
||||||
workerFk = 9;
|
workerFk = 9;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.ticketCollection
|
INSERT IGNORE INTO vn.ticketCollection
|
||||||
SET id = 10101010,
|
SET id = 10101010,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
collectionFk = 10101010;
|
collectionFk = 10101010;
|
||||||
|
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999991,
|
SET id = 999991,
|
||||||
name = 'Palito para pinchos',
|
name = 'Palito para pinchos',
|
||||||
`size` = 25,
|
`size` = 25,
|
||||||
stems = NULL,
|
stems = NULL,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Palito para pinchos',
|
longName = 'Palito para pinchos',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 6,
|
weightByPiece = 6,
|
||||||
|
@ -3228,19 +3226,19 @@ INSERT INTO vn.sale
|
||||||
SET id = 99991,
|
SET id = 99991,
|
||||||
itemFk = 999991,
|
itemFk = 999991,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Palito para pinchos',
|
concept = 'Palito para pinchos',
|
||||||
quantity = 3,
|
quantity = 3,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999992,
|
SET id = 999992,
|
||||||
name = 'Madera verde',
|
name = 'Madera verde',
|
||||||
`size` = 10,
|
`size` = 10,
|
||||||
stems = NULL,
|
stems = NULL,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Madera verde',
|
longName = 'Madera verde',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 50,
|
weightByPiece = 50,
|
||||||
|
@ -3267,19 +3265,19 @@ INSERT INTO vn.sale
|
||||||
SET id = 99992,
|
SET id = 99992,
|
||||||
itemFk = 999992,
|
itemFk = 999992,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Madera Verde',
|
concept = 'Madera Verde',
|
||||||
quantity = 10,
|
quantity = 10,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999993,
|
SET id = 999993,
|
||||||
name = 'Madera Roja/Morada',
|
name = 'Madera Roja/Morada',
|
||||||
`size` = 12,
|
`size` = 12,
|
||||||
stems = 2,
|
stems = 2,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Madera Roja/Morada',
|
longName = 'Madera Roja/Morada',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 35,
|
weightByPiece = 35,
|
||||||
|
@ -3303,30 +3301,30 @@ INSERT INTO vn.buy
|
||||||
weight = 25;
|
weight = 25;
|
||||||
|
|
||||||
INSERT INTO vn.itemShelving
|
INSERT INTO vn.itemShelving
|
||||||
SET id = 9931,
|
SET id = 9931,
|
||||||
itemFk = 999993,
|
itemFk = 999993,
|
||||||
shelvingFk = 'NCC',
|
shelvingFk = 'NCC',
|
||||||
visible = 10,
|
visible = 10,
|
||||||
`grouping` = 5,
|
`grouping` = 5,
|
||||||
packing = 10;
|
packing = 10;
|
||||||
|
|
||||||
INSERT INTO vn.sale
|
INSERT INTO vn.sale
|
||||||
SET id = 99993,
|
SET id = 99993,
|
||||||
itemFk = 999993,
|
itemFk = 999993,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Madera Roja/Morada',
|
concept = 'Madera Roja/Morada',
|
||||||
quantity = 15,
|
quantity = 15,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999994,
|
SET id = 999994,
|
||||||
name = 'Madera Naranja',
|
name = 'Madera Naranja',
|
||||||
`size` = 18,
|
`size` = 18,
|
||||||
stems = 1,
|
stems = 1,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Madera Naranja',
|
longName = 'Madera Naranja',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 160,
|
weightByPiece = 160,
|
||||||
|
@ -3353,19 +3351,19 @@ INSERT INTO vn.sale
|
||||||
SET id = 99994,
|
SET id = 99994,
|
||||||
itemFk = 999994,
|
itemFk = 999994,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Madera Naranja',
|
concept = 'Madera Naranja',
|
||||||
quantity = 4,
|
quantity = 4,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999995,
|
SET id = 999995,
|
||||||
name = 'Madera Amarilla',
|
name = 'Madera Amarilla',
|
||||||
`size` = 11,
|
`size` = 11,
|
||||||
stems = 5,
|
stems = 5,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Madera Amarilla',
|
longName = 'Madera Amarilla',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 78,
|
weightByPiece = 78,
|
||||||
|
@ -3392,20 +3390,20 @@ INSERT INTO vn.sale
|
||||||
SET id = 99995,
|
SET id = 99995,
|
||||||
itemFk = 999995,
|
itemFk = 999995,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Madera Amarilla',
|
concept = 'Madera Amarilla',
|
||||||
quantity = 5,
|
quantity = 5,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
-- Palito naranja
|
-- Palito naranja
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999998,
|
SET id = 999998,
|
||||||
name = 'Palito naranja',
|
name = 'Palito naranja',
|
||||||
`size` = 11,
|
`size` = 11,
|
||||||
stems = 1,
|
stems = 1,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Palito naranja',
|
longName = 'Palito naranja',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 78,
|
weightByPiece = 78,
|
||||||
|
@ -3432,20 +3430,20 @@ INSERT INTO vn.sale
|
||||||
SET id = 99998,
|
SET id = 99998,
|
||||||
itemFk = 999998,
|
itemFk = 999998,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Palito naranja',
|
concept = 'Palito naranja',
|
||||||
quantity = 60,
|
quantity = 60,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
-- Palito amarillo
|
-- Palito amarillo
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 999999,
|
SET id = 999999,
|
||||||
name = 'Palito amarillo',
|
name = 'Palito amarillo',
|
||||||
`size` = 11,
|
`size` = 11,
|
||||||
stems = 1,
|
stems = 1,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Palito amarillo',
|
longName = 'Palito amarillo',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 78,
|
weightByPiece = 78,
|
||||||
|
@ -3472,20 +3470,20 @@ INSERT INTO vn.sale
|
||||||
SET id = 99999,
|
SET id = 99999,
|
||||||
itemFk = 999999,
|
itemFk = 999999,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Palito amarillo',
|
concept = 'Palito amarillo',
|
||||||
quantity = 50,
|
quantity = 50,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
-- Palito azul
|
-- Palito azul
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 1000000,
|
SET id = 1000000,
|
||||||
name = 'Palito azul',
|
name = 'Palito azul',
|
||||||
`size` = 10,
|
`size` = 10,
|
||||||
stems = 1,
|
stems = 1,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Palito azul',
|
longName = 'Palito azul',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 78,
|
weightByPiece = 78,
|
||||||
|
@ -3512,20 +3510,20 @@ INSERT INTO vn.sale
|
||||||
SET id = 100000,
|
SET id = 100000,
|
||||||
itemFk = 1000000,
|
itemFk = 1000000,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Palito azul',
|
concept = 'Palito azul',
|
||||||
quantity = 50,
|
quantity = 50,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
-- Palito rojo
|
-- Palito rojo
|
||||||
INSERT INTO vn.item
|
INSERT INTO vn.item
|
||||||
SET id = 1000001,
|
SET id = 1000001,
|
||||||
name = 'Palito rojo',
|
name = 'Palito rojo',
|
||||||
`size` = 10,
|
`size` = 10,
|
||||||
stems = NULL,
|
stems = NULL,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Palito rojo',
|
longName = 'Palito rojo',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 78,
|
weightByPiece = 78,
|
||||||
|
@ -3553,20 +3551,20 @@ INSERT INTO vn.sale
|
||||||
SET id = 100001,
|
SET id = 100001,
|
||||||
itemFk = 1000001,
|
itemFk = 1000001,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Palito rojo',
|
concept = 'Palito rojo',
|
||||||
quantity = 10,
|
quantity = 10,
|
||||||
price = 1,
|
price = 1,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
-- Previa
|
-- Previa
|
||||||
INSERT IGNORE INTO vn.item
|
INSERT IGNORE INTO vn.item
|
||||||
SET id = 999996,
|
SET id = 999996,
|
||||||
name = 'Bolas de madera',
|
name = 'Bolas de madera',
|
||||||
`size` = 2,
|
`size` = 2,
|
||||||
stems = 4,
|
stems = 4,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Bolas de madera',
|
longName = 'Bolas de madera',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 20,
|
weightByPiece = 20,
|
||||||
|
@ -3593,20 +3591,20 @@ INSERT vn.sale
|
||||||
SET id = 99996,
|
SET id = 99996,
|
||||||
itemFk = 999996,
|
itemFk = 999996,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Bolas de madera',
|
concept = 'Bolas de madera',
|
||||||
quantity = 4,
|
quantity = 4,
|
||||||
price = 7,
|
price = 7,
|
||||||
discount = 0,
|
discount = 0,
|
||||||
isPicked = TRUE;
|
isPicked = TRUE;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.item
|
INSERT IGNORE INTO vn.item
|
||||||
SET id = 999997,
|
SET id = 999997,
|
||||||
name = 'Palitos de polo MIX',
|
name = 'Palitos de polo MIX',
|
||||||
`size` = 14,
|
`size` = 14,
|
||||||
stems = NULL,
|
stems = NULL,
|
||||||
category = 'EXT',
|
category = 'EXT',
|
||||||
typeFk = 999,
|
typeFk = 999,
|
||||||
longName = 'Palitos de polo MIX',
|
longName = 'Palitos de polo MIX',
|
||||||
itemPackingTypeFk = NULL,
|
itemPackingTypeFk = NULL,
|
||||||
originFk = 1,
|
originFk = 1,
|
||||||
weightByPiece = 20,
|
weightByPiece = 20,
|
||||||
|
@ -3633,9 +3631,9 @@ INSERT vn.sale
|
||||||
SET id = 99997,
|
SET id = 99997,
|
||||||
itemFk = 999997,
|
itemFk = 999997,
|
||||||
ticketFk = 999999,
|
ticketFk = 999999,
|
||||||
concept = 'Palitos de polo MIX',
|
concept = 'Palitos de polo MIX',
|
||||||
quantity = 5,
|
quantity = 5,
|
||||||
price = 7,
|
price = 7,
|
||||||
discount = 0;
|
discount = 0;
|
||||||
|
|
||||||
USE vn;
|
USE vn;
|
||||||
|
@ -3668,38 +3666,38 @@ VALUES
|
||||||
|
|
||||||
-- Previous for Bolas de madera
|
-- Previous for Bolas de madera
|
||||||
INSERT IGNORE INTO vn.sectorCollection
|
INSERT IGNORE INTO vn.sectorCollection
|
||||||
SET id = 99,
|
SET id = 99,
|
||||||
userFk = 1,
|
userFk = 1,
|
||||||
sectorFk = 9992;
|
sectorFk = 9992;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.saleGroup
|
INSERT IGNORE INTO vn.saleGroup
|
||||||
SET id = 4,
|
SET id = 4,
|
||||||
userFk = 1,
|
userFk = 1,
|
||||||
parkingFk = 9,
|
parkingFk = 9,
|
||||||
sectorFk = 9992;
|
sectorFk = 9992;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.sectorCollectionSaleGroup
|
INSERT IGNORE INTO vn.sectorCollectionSaleGroup
|
||||||
SET id = 9999,
|
SET id = 9999,
|
||||||
sectorCollectionFk = 99,
|
sectorCollectionFk = 99,
|
||||||
saleGroupFk = 999;
|
saleGroupFk = 999;
|
||||||
|
|
||||||
INSERT vn.saleGroupDetail
|
INSERT vn.saleGroupDetail
|
||||||
SET id = 99991,
|
SET id = 99991,
|
||||||
saleFk = 99996,
|
saleFk = 99996,
|
||||||
saleGroupFk = 999;
|
saleGroupFk = 999;
|
||||||
|
|
||||||
INSERT INTO vn.saleTracking
|
INSERT INTO vn.saleTracking
|
||||||
SET id = 7,
|
SET id = 7,
|
||||||
saleFk = 99996,
|
saleFk = 99996,
|
||||||
isChecked = TRUE,
|
isChecked = TRUE,
|
||||||
workerFk = 103,
|
workerFk = 103,
|
||||||
stateFk = 28;
|
stateFk = 28;
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.itemShelvingSale
|
INSERT IGNORE INTO vn.itemShelvingSale
|
||||||
SET id = 991,
|
SET id = 991,
|
||||||
itemShelvingFk = 9962,
|
itemShelvingFk = 9962,
|
||||||
saleFk = 99996,
|
saleFk = 99996,
|
||||||
quantity = 5,
|
quantity = 5,
|
||||||
userFk = 1;
|
userFk = 1;
|
||||||
|
|
||||||
UPDATE vn.ticket
|
UPDATE vn.ticket
|
||||||
|
@ -3729,4 +3727,10 @@ UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1;
|
||||||
|
|
||||||
UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
|
UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
|
||||||
|
|
||||||
INSERT INTO vn.report (name) VALUES ('LabelCollection');
|
INSERT INTO vn.report (name) VALUES ('LabelCollection');
|
||||||
|
|
||||||
|
INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue)
|
||||||
|
VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL);
|
||||||
|
|
||||||
|
INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,newInstance,changedModelId,changedModelValue)
|
||||||
|
VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `bi`.`v_clientes_jerarquia`
|
|
||||||
AS SELECT `c`.`id_cliente` AS `Id_Cliente`,
|
|
||||||
`c`.`cliente` AS `Cliente`,
|
|
||||||
`t`.`CodigoTrabajador` AS `Comercial`,
|
|
||||||
`tj`.`CodigoTrabajador` AS `Jefe`
|
|
||||||
FROM (
|
|
||||||
(
|
|
||||||
(
|
|
||||||
`vn2008`.`Clientes` `c`
|
|
||||||
JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `c`.`Id_Trabajador`)
|
|
||||||
)
|
|
||||||
JOIN `vn2008`.`jerarquia` ON(
|
|
||||||
`vn2008`.`jerarquia`.`worker_id` = `c`.`Id_Trabajador`
|
|
||||||
)
|
|
||||||
)
|
|
||||||
JOIN `vn2008`.`Trabajadores` `tj` ON(
|
|
||||||
`tj`.`Id_Trabajador` = `vn2008`.`jerarquia`.`boss_id`
|
|
||||||
)
|
|
||||||
)
|
|
|
@ -188,15 +188,23 @@ BEGIN
|
||||||
SELECT MAX(tl.id)ids
|
SELECT MAX(tl.id)ids
|
||||||
FROM ticket t
|
FROM ticket t
|
||||||
JOIN ticketLog tl ON tl.originFk = t.id
|
JOIN ticketLog tl ON tl.originFk = t.id
|
||||||
|
LEFT JOIN ticketWeekly tw ON tw.ticketFk = t.id
|
||||||
WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31'
|
WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31'
|
||||||
AND t.isDeleted
|
AND t.isDeleted
|
||||||
|
AND tw.ticketFk IS NULL
|
||||||
GROUP BY t.id
|
GROUP BY t.id
|
||||||
) sub ON sub.ids = tl.id
|
) sub ON sub.ids = tl.id
|
||||||
WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY;
|
WHERE tl.creationDate <= v2Months;
|
||||||
DELETE t
|
DELETE t
|
||||||
FROM ticket t
|
FROM ticket t
|
||||||
JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
|
JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
|
||||||
|
|
||||||
|
DELETE sl
|
||||||
|
FROM saleLabel sl
|
||||||
|
JOIN sale s ON s.id = sl.saleFk
|
||||||
|
JOIN ticket t ON t.id = s.ticketFk
|
||||||
|
WHERE t.shipped < v2Months;
|
||||||
|
|
||||||
-- Tickets Nulos PAK 11/10/2016
|
-- Tickets Nulos PAK 11/10/2016
|
||||||
SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
|
SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
|
||||||
UPDATE ticket
|
UPDATE ticket
|
||||||
|
|
|
@ -37,7 +37,7 @@ BEGIN
|
||||||
LEFT JOIN origin o ON o.id = i.originFk
|
LEFT JOIN origin o ON o.id = i.originFk
|
||||||
) ON it.id = i.typeFk
|
) ON it.id = i.typeFk
|
||||||
LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
|
LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
|
||||||
WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
|
WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
|
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
|
||||||
CREATE TEMPORARY TABLE tmp.lastEntryOk
|
CREATE TEMPORARY TABLE tmp.lastEntryOk
|
||||||
|
@ -94,11 +94,6 @@ BEGIN
|
||||||
JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
|
JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
|
||||||
SET b.price2 = eo.price2 WHERE b.price2 = 0 ;
|
SET b.price2 = eo.price2 WHERE b.price2 = 0 ;
|
||||||
|
|
||||||
UPDATE buy b
|
|
||||||
JOIN tmp.lastEntry lt ON lt.buyFk = b.id
|
|
||||||
JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
|
|
||||||
SET b.packing = eo.packing WHERE b.packing = 0;
|
|
||||||
|
|
||||||
UPDATE buy b
|
UPDATE buy b
|
||||||
JOIN tmp.lastEntry lt ON lt.buyFk = b.id
|
JOIN tmp.lastEntry lt ON lt.buyFk = b.id
|
||||||
JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
|
JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(vDuaFk INT)
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(
|
||||||
|
vDuaFk INT
|
||||||
|
)
|
||||||
BEGIN
|
BEGIN
|
||||||
/**
|
/**
|
||||||
* Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
|
* Borra los valores de duaTax y sus vctos. y los vuelve a
|
||||||
|
* crear en base a la tabla duaEntry.
|
||||||
*
|
*
|
||||||
* @param vDuaFk Id del dua a recalcular
|
* @param vDuaFk Id del dua a recalcular
|
||||||
*/
|
*/
|
||||||
|
@ -26,7 +29,7 @@ BEGIN
|
||||||
LEAVE l;
|
LEAVE l;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
CALL vn2008.recibidaIvaInsert(vInvoiceInFk);
|
CALL invoiceInTax_recalc(vInvoiceInFk);
|
||||||
CALL invoiceInDueDay_recalc(vInvoiceInFk);
|
CALL invoiceInDueDay_recalc(vInvoiceInFk);
|
||||||
|
|
||||||
END LOOP;
|
END LOOP;
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_recalc`(
|
||||||
|
vInvoiceInFk INT
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Recalcula y actualiza los impuestos de la factura
|
||||||
|
* usando la última tasa de cambio y detalles de compra.
|
||||||
|
*
|
||||||
|
* @param vInvoiceInFk Id de factura recibida
|
||||||
|
*/
|
||||||
|
DECLARE vRate DOUBLE DEFAULT 1;
|
||||||
|
DECLARE vDated DATE;
|
||||||
|
DECLARE vExpenseFk INT;
|
||||||
|
|
||||||
|
SELECT MAX(rr.dated) INTO vDated
|
||||||
|
FROM referenceRate rr
|
||||||
|
JOIN invoiceIn ii ON ii.id = vInvoiceInFk
|
||||||
|
WHERE rr.dated <= ii.issued
|
||||||
|
AND rr.currencyFk = ii.currencyFk;
|
||||||
|
|
||||||
|
IF vDated THEN
|
||||||
|
SELECT `value` INTO vRate
|
||||||
|
FROM referenceRate
|
||||||
|
WHERE dated = vDated;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;
|
||||||
|
|
||||||
|
SELECT id INTO vExpenseFk
|
||||||
|
FROM expense
|
||||||
|
WHERE code = 'extraCommGoodsAcquisition';
|
||||||
|
|
||||||
|
IF vExpenseFk IS NULL THEN
|
||||||
|
CALL util.throw('Expense extraCommGoodsAcquisition not exists');
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
INSERT INTO invoiceInTax(
|
||||||
|
invoiceInFk,
|
||||||
|
taxableBase,
|
||||||
|
expenseFk,
|
||||||
|
foreignValue,
|
||||||
|
taxTypeSageFk,
|
||||||
|
transactionTypeSageFk
|
||||||
|
)
|
||||||
|
SELECT ii.id,
|
||||||
|
SUM(b.buyingValue * b.quantity) / vRate bi,
|
||||||
|
vExpenseFk,
|
||||||
|
IF(c.code = 'EUR', NULL, SUM(b.buyingValue * b.quantity)),
|
||||||
|
s.taxTypeSageFk,
|
||||||
|
s.transactionTypeSageFk
|
||||||
|
FROM invoiceIn ii
|
||||||
|
JOIN currency c ON c.id = ii.currencyFk
|
||||||
|
JOIN `entry` e ON e.invoiceInFk = ii.id
|
||||||
|
JOIN supplier s ON s.id = e.supplierFk
|
||||||
|
JOIN buy b ON b.entryFk = e.id
|
||||||
|
LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk
|
||||||
|
AND rr.dated = ii.issued
|
||||||
|
WHERE ii.id = vInvoiceInFk
|
||||||
|
HAVING bi IS NOT NULL;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -19,93 +19,74 @@ BEGIN
|
||||||
DECLARE vTypeFk INT;
|
DECLARE vTypeFk INT;
|
||||||
DECLARE vPriority INT DEFAULT 1;
|
DECLARE vPriority INT DEFAULT 1;
|
||||||
|
|
||||||
DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
|
|
||||||
DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
|
||||||
|
|
||||||
SELECT typeFk,
|
|
||||||
tag5,
|
|
||||||
value5,
|
|
||||||
tag6,
|
|
||||||
value6,
|
|
||||||
tag7,
|
|
||||||
value7,
|
|
||||||
tag8,
|
|
||||||
value8,
|
|
||||||
t.name,
|
|
||||||
it.value
|
|
||||||
INTO vTypeFk,
|
|
||||||
vTag5,
|
|
||||||
vValue5,
|
|
||||||
vTag6,
|
|
||||||
vValue6,
|
|
||||||
vTag7,
|
|
||||||
vValue7,
|
|
||||||
vTag8,
|
|
||||||
vValue8,
|
|
||||||
vTag1,
|
|
||||||
vValue1
|
|
||||||
FROM item i
|
|
||||||
LEFT JOIN itemTag it ON it.itemFk = i.id
|
|
||||||
AND it.priority = vPriority
|
|
||||||
LEFT JOIN tag t ON t.id = it.tagFk
|
|
||||||
WHERE i.id = vSelf;
|
|
||||||
|
|
||||||
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
|
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
|
||||||
|
|
||||||
|
|
||||||
|
WITH itemTags AS (
|
||||||
|
SELECT i.id,
|
||||||
|
typeFk,
|
||||||
|
tag5,
|
||||||
|
value5,
|
||||||
|
tag6,
|
||||||
|
value6,
|
||||||
|
tag7,
|
||||||
|
value7,
|
||||||
|
tag8,
|
||||||
|
value8,
|
||||||
|
t.name,
|
||||||
|
it.value
|
||||||
|
FROM vn.item i
|
||||||
|
LEFT JOIN vn.itemTag it ON it.itemFk = i.id
|
||||||
|
AND it.priority = vPriority
|
||||||
|
LEFT JOIN vn.tag t ON t.id = it.tagFk
|
||||||
|
WHERE i.id = vSelf
|
||||||
|
)
|
||||||
SELECT i.id itemFk,
|
SELECT i.id itemFk,
|
||||||
i.longName,
|
i.longName,
|
||||||
i.subName,
|
i.subName,
|
||||||
i.tag5,
|
i.tag5,
|
||||||
i.value5,
|
i.value5,
|
||||||
(i.value5 <=> vValue5) match5,
|
(i.value5 <=> its.value5) match5,
|
||||||
i.tag6,
|
i.tag6,
|
||||||
i.value6,
|
i.value6,
|
||||||
(i.value6 <=> vValue6) match6,
|
(i.value6 <=> its.value6) match6,
|
||||||
i.tag7,
|
i.tag7,
|
||||||
i.value7,
|
i.value7,
|
||||||
(i.value7 <=> vValue7) match7,
|
(i.value7 <=> its.value7) match7,
|
||||||
i.tag8,
|
i.tag8,
|
||||||
i.value8,
|
i.value8,
|
||||||
(i.value8 <=> vValue8) match8,
|
(i.value8 <=> its.value8) match8,
|
||||||
a.available,
|
a.available,
|
||||||
IFNULL(ip.counter, 0) `counter`,
|
IFNULL(ip.counter, 0) `counter`,
|
||||||
IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
|
IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
|
||||||
iss.visible located
|
iss.visible located
|
||||||
FROM item i
|
FROM vn.item i
|
||||||
JOIN cache.available a ON a.item_id = i.id
|
JOIN cache.available a ON a.item_id = i.id
|
||||||
LEFT JOIN itemProposal ip ON ip.mateFk = i.id
|
AND a.calc_id = vCalcFk
|
||||||
|
LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
|
||||||
AND ip.itemFk = vSelf
|
AND ip.itemFk = vSelf
|
||||||
LEFT JOIN itemTag it ON it.itemFk = i.id
|
LEFT JOIN vn.itemTag it ON it.itemFk = i.id
|
||||||
AND it.priority = vPriority
|
AND it.priority = vPriority
|
||||||
LEFT JOIN tag t ON t.id = it.tagFk
|
LEFT JOIN vn.tag t ON t.id = it.tagFk
|
||||||
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
|
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
|
||||||
AND lb.warehouse_id = vWarehouseFk
|
AND lb.warehouse_id = vWarehouseFk
|
||||||
LEFT JOIN buy b ON b.id = lb.buy_id
|
LEFT JOIN vn.buy b ON b.id = lb.buy_id
|
||||||
LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
|
LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
|
||||||
AND iss.warehouseFk = vWarehouseFk
|
AND iss.warehouseFk = vWarehouseFk
|
||||||
WHERE a.calc_id = vCalcFk
|
JOIN itemTags its
|
||||||
AND a.available > 0
|
WHERE a.available > 0
|
||||||
AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
|
AND IF(vShowType, i.typeFk = its.typeFk, TRUE)
|
||||||
AND i.id <> vSelf
|
AND i.id <> vSelf
|
||||||
ORDER BY `counter` DESC,
|
ORDER BY `counter` DESC,
|
||||||
(t.name = vTag1) DESC,
|
(t.name = its.name) DESC,
|
||||||
(it.value = vValue1) DESC,
|
(it.value = its.value) DESC,
|
||||||
(i.tag5 = vTag5) DESC,
|
(i.tag5 = its.tag5) DESC,
|
||||||
match5 DESC,
|
match5 DESC,
|
||||||
(i.tag6 = vTag6) DESC,
|
(i.tag6 = its.tag6) DESC,
|
||||||
match6 DESC,
|
match6 DESC,
|
||||||
(i.tag7 = vTag7) DESC,
|
(i.tag7 = its.tag7) DESC,
|
||||||
match7 DESC,
|
match7 DESC,
|
||||||
(i.tag8 = vTag8) DESC,
|
(i.tag8 = its.tag8) DESC,
|
||||||
match8 DESC;
|
match8 DESC;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -18,7 +18,8 @@ BEGIN
|
||||||
WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
|
WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
|
||||||
AND t.id = vTicketFk
|
AND t.id = vTicketFk
|
||||||
AND t.refFk IS NULL
|
AND t.refFk IS NULL
|
||||||
GROUP BY t.id);
|
GROUP BY t.id
|
||||||
|
);
|
||||||
|
|
||||||
CALL ticket_close();
|
CALL ticket_close();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_afterDelete`
|
||||||
|
AFTER DELETE ON `parking`
|
||||||
|
FOR EACH ROW
|
||||||
|
BEGIN
|
||||||
|
INSERT INTO parkingLog
|
||||||
|
SET `action` = 'delete',
|
||||||
|
`changedModel` = 'Parking',
|
||||||
|
`changedModelId` = OLD.id,
|
||||||
|
`userFk` = account.myUser_getId();
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeInsert`
|
||||||
BEFORE INSERT ON `parking`
|
BEFORE INSERT ON `parking`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
|
-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeUpdate`
|
||||||
BEFORE UPDATE ON `parking`
|
BEFORE UPDATE ON `parking`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
|
-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn`.`unary`
|
|
||||||
AS SELECT `a`.`id` AS `id`,
|
|
||||||
`a`.`parent` AS `parent`
|
|
||||||
FROM `vn2008`.`unary` `a`
|
|
|
@ -1,8 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn`.`unaryScan`
|
|
||||||
AS SELECT `u`.`unary_id` AS `unaryFk`,
|
|
||||||
`u`.`name` AS `name`,
|
|
||||||
`u`.`odbc_date` AS `created`,
|
|
||||||
`u`.`type` AS `type`
|
|
||||||
FROM `vn2008`.`unary_scan` `u`
|
|
|
@ -1,8 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn`.`unaryScanLine`
|
|
||||||
AS SELECT `u`.`id` AS `id`,
|
|
||||||
`u`.`code` AS `code`,
|
|
||||||
`u`.`odbc_date` AS `created`,
|
|
||||||
`u`.`unary_id` AS `unaryScanFk`
|
|
||||||
FROM `vn2008`.`unary_scan_line` `u`
|
|
|
@ -1,25 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`ListaTicketsEncajados`(IN intId_Trabajador int)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
SELECT Agencia,
|
|
||||||
Consignatario,
|
|
||||||
ti.Id_Ticket,
|
|
||||||
ts.userFk Id_Trabajador,
|
|
||||||
IFNULL(ncajas,0) AS ncajas,
|
|
||||||
IFNULL(nbultos,0) AS nbultos,
|
|
||||||
IFNULL(notros,0) AS notros,
|
|
||||||
ts.code AS Estado
|
|
||||||
FROM Tickets ti
|
|
||||||
INNER JOIN Consignatarios ON ti.Id_Consigna = Consignatarios.Id_consigna
|
|
||||||
INNER JOIN Agencias ON ti.Id_Agencia = Agencias.Id_Agencia
|
|
||||||
LEFT JOIN (SELECT ticketFk,count(*) AS ncajas FROM vn.expedition WHERE packagingFk=94 GROUP BY ticketFk) sub1 ON ti.Id_Ticket=sub1.ticketFk
|
|
||||||
LEFT JOIN (SELECT ticketFk,count(*) AS nbultos FROM vn.expedition WHERE packagingFk IS NULL GROUP BY ticketFk) sub2 ON ti.Id_Ticket=sub2.ticketFk
|
|
||||||
LEFT JOIN (SELECT ticketFk,count(*) AS notros FROM vn.expedition WHERE packagingFk >0 GROUP BY ticketFk) sub3 ON ti.Id_Ticket=sub3.ticketFk
|
|
||||||
INNER JOIN vn.ticketState ts ON ti.Id_ticket = ts.ticketFk
|
|
||||||
WHERE ti.Fecha=util.VN_CURDATE() AND
|
|
||||||
ts.userFk=intId_Trabajador
|
|
||||||
GROUP BY ti.Id_Ticket;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,49 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`customerDebtEvolution`(IN vCustomer INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
SELECT * FROM
|
|
||||||
(
|
|
||||||
SELECT day, date, @s:= round(IFNULL(Euros,0) + @s,2) as Saldo, Euros, Credito, 0 as Cero
|
|
||||||
FROM
|
|
||||||
(
|
|
||||||
SELECT day, date, IFNULL(Euros,0) as Euros, Credito
|
|
||||||
FROM time
|
|
||||||
JOIN (SELECT @s:= 0, - Credito as Credito FROM Clientes WHERE Id_Cliente = vCustomer) c
|
|
||||||
LEFT JOIN
|
|
||||||
(SELECT Euros, date(Fecha) as Fecha FROM
|
|
||||||
(
|
|
||||||
SELECT Fechacobro as Fecha, Entregado as Euros
|
|
||||||
FROM Recibos
|
|
||||||
WHERE Id_Cliente = vCustomer
|
|
||||||
AND Fechacobro >= '2017-01-01'
|
|
||||||
UNION ALL
|
|
||||||
SELECT vn.getDueDate(io.issued,c.Vencimiento), - io.amount
|
|
||||||
FROM vn.invoiceOut io
|
|
||||||
JOIN Clientes c ON io.clientFk = c.Id_Cliente
|
|
||||||
WHERE io.clientFk = vCustomer
|
|
||||||
AND io.issued >= '2017-01-01'
|
|
||||||
UNION ALL
|
|
||||||
SELECT '2016-12-31', Debt
|
|
||||||
FROM bi.customerDebtInventory
|
|
||||||
WHERE Id_Cliente = vCustomer
|
|
||||||
UNION ALL
|
|
||||||
SELECT Fecha, - SUM(Cantidad * Preu * (100 - Descuento ) * 1.10 / 100)
|
|
||||||
FROM Tickets t
|
|
||||||
JOIN Movimientos m on m.Id_Ticket = t.Id_Ticket
|
|
||||||
WHERE Id_Cliente = vCustomer
|
|
||||||
AND Factura IS NULL
|
|
||||||
AND Fecha >= '2017-01-01'
|
|
||||||
GROUP BY Fecha
|
|
||||||
) sub2
|
|
||||||
ORDER BY Fecha
|
|
||||||
)sub ON time.date = sub.Fecha
|
|
||||||
WHERE time.date BETWEEN '2016-12-31' AND util.VN_CURDATE()
|
|
||||||
ORDER BY date
|
|
||||||
) sub3
|
|
||||||
)sub4
|
|
||||||
;
|
|
||||||
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,100 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`emailYesterdayPurchasesByConsigna`(IN v_Date DATE, IN v_Client_Id INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE MyIdTicket BIGINT;
|
|
||||||
DECLARE MyAlias VARCHAR(50);
|
|
||||||
DECLARE MyDomicilio VARCHAR(255);
|
|
||||||
DECLARE MyPoblacion VARCHAR(25);
|
|
||||||
DECLARE MyImporte DOUBLE;
|
|
||||||
DECLARE MyMailTo VARCHAR(250);
|
|
||||||
DECLARE MyMailReplyTo VARCHAR(250);
|
|
||||||
DECLARE done INT DEFAULT FALSE;
|
|
||||||
DECLARE emptyList INT DEFAULT 0;
|
|
||||||
DECLARE txt TEXT;
|
|
||||||
|
|
||||||
DECLARE rs CURSOR FOR
|
|
||||||
SELECT t.Id_Ticket, Alias, cast(amount as decimal(10,2)) Importe, Domicilio, POBLACION
|
|
||||||
FROM Tickets t
|
|
||||||
JOIN Consignatarios cs ON t.Id_Consigna = cs.Id_Consigna
|
|
||||||
JOIN (
|
|
||||||
SELECT `Movimientos`.`Id_Ticket` AS `Id_Ticket`,
|
|
||||||
sum(
|
|
||||||
`Movimientos`.`Cantidad` * `Movimientos`.`Preu` * (100 - `Movimientos`.`Descuento`) / 100
|
|
||||||
) AS `amount`
|
|
||||||
FROM (
|
|
||||||
`vn2008`.`Movimientos`
|
|
||||||
JOIN `vn2008`.`Tickets` ON(
|
|
||||||
`Movimientos`.`Id_Ticket` = `Tickets`.`Id_Ticket`
|
|
||||||
)
|
|
||||||
)
|
|
||||||
WHERE `Tickets`.`Fecha` >= `util`.`VN_CURDATE`() + INTERVAL -6 MONTH
|
|
||||||
GROUP BY `Movimientos`.`Id_Ticket`
|
|
||||||
) v ON v.Id_Ticket = t.Id_Ticket
|
|
||||||
WHERE t.Fecha BETWEEN v_Date AND util.dayEnd(v_Date)
|
|
||||||
AND t.Id_Cliente = v_Client_Id;
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
|
|
||||||
|
|
||||||
SET v_Date = IFNULL(v_Date, util.yesterday());
|
|
||||||
|
|
||||||
OPEN rs;
|
|
||||||
|
|
||||||
FETCH rs INTO MyIdTicket, MyAlias, MyImporte, MyDomicilio, MyPoblacion;
|
|
||||||
|
|
||||||
SET emptyList = done;
|
|
||||||
|
|
||||||
SET txt = CONCAT('<p><font face="verdana" >',
|
|
||||||
'<h2> Relación de envíos.</h2>',
|
|
||||||
'<h3><font color="green">Dia: ', v_Date, '</font></h3>');
|
|
||||||
|
|
||||||
WHILE NOT done DO
|
|
||||||
|
|
||||||
SET txt = CONCAT(txt, '<br><br>',
|
|
||||||
'<table>
|
|
||||||
<tr>
|
|
||||||
<th> <a href = "https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket=',MyIdTicket,'">
|
|
||||||
<font color="green"> Ticket ', MyIdTicket,'</font></th>
|
|
||||||
<th></th><th></th><th></th><th></th>
|
|
||||||
<th></th><th></th><th></th><th></th>
|
|
||||||
<th> <font color="orange"> ', MyImporte, ' € </a></font></th>
|
|
||||||
</tr>
|
|
||||||
</table>'
|
|
||||||
, ' ', MyAlias, '<br>'
|
|
||||||
, ' ', MyDomicilio, '(', MyPoblacion, ')');
|
|
||||||
|
|
||||||
FETCH rs INTO MyIdTicket, MyAlias, MyImporte, MyDomicilio, MyPoblacion;
|
|
||||||
|
|
||||||
END WHILE;
|
|
||||||
|
|
||||||
SET txt = CONCAT(
|
|
||||||
txt,
|
|
||||||
'<table>',
|
|
||||||
'<tr><th></th></tr>',
|
|
||||||
'</table>',
|
|
||||||
'<br><br>Puede acceder al detalle de los albaranes haciendo click sobre el número de Ticket',
|
|
||||||
'<br><h3> Muchas gracias por su confianza</h3>',
|
|
||||||
'</font></p>');
|
|
||||||
|
|
||||||
-- Envío del email
|
|
||||||
IF emptyList = 0 THEN
|
|
||||||
|
|
||||||
SELECT CONCAT(`e-mail`,',pako@verdnatura.es') INTO MyMailTo
|
|
||||||
FROM Clientes
|
|
||||||
WHERE Id_Cliente = v_Client_Id AND `e-mail`>'';
|
|
||||||
|
|
||||||
IF v_Client_Id = 7818 THEN -- LOEWE
|
|
||||||
SET MyMailTo = 'isabel@elisabethblumen.com,emunozca@loewe.es,pako@verdnatura.es';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
CALL vn.mail_insert(
|
|
||||||
IFNULL(MyMailTo,'pako.natek@gmail.com'),
|
|
||||||
'pako@verdnatura.es',
|
|
||||||
'Resumen de pedidos preparados',
|
|
||||||
txt
|
|
||||||
);
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,27 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`emailYesterdayPurchasesLauncher`()
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE done INT DEFAULT 0;
|
|
||||||
DECLARE vMyClientId INT;
|
|
||||||
|
|
||||||
DECLARE rs CURSOR FOR
|
|
||||||
SELECT Id_Cliente
|
|
||||||
FROM Clientes
|
|
||||||
WHERE EYPBC != 0;
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
|
|
||||||
|
|
||||||
OPEN rs;
|
|
||||||
|
|
||||||
FETCH rs INTO vMyClientId;
|
|
||||||
|
|
||||||
WHILE NOT done DO
|
|
||||||
|
|
||||||
CALL emailYesterdayPurchasesByConsigna(util.yesterday(), vMyClientId);
|
|
||||||
|
|
||||||
FETCH rs INTO vMyClientId;
|
|
||||||
|
|
||||||
END WHILE;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,51 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`embalajes_stocks`(IN idPEOPLE INT, IN bolCLIENT BOOLEAN)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
if bolCLIENT then
|
|
||||||
|
|
||||||
select m.Id_Article, Article, - cast(sum(m.Cantidad) as decimal) as Saldo
|
|
||||||
from Movimientos m
|
|
||||||
join Articles a on m.Id_Article = a.Id_Article
|
|
||||||
join Tipos tp on tp.tipo_id = a.tipo_id
|
|
||||||
join Tickets t using(Id_Ticket)
|
|
||||||
join Consignatarios cs using(Id_Consigna)
|
|
||||||
where cs.Id_Cliente = idPEOPLE
|
|
||||||
and Tipo = 'Contenedores'
|
|
||||||
and t.Fecha > '2010-01-01'
|
|
||||||
group by m.Id_Article;
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
select Id_Article, Article, sum(Cantidad) as Saldo
|
|
||||||
from
|
|
||||||
(select Id_Article, Cantidad
|
|
||||||
from Compres c
|
|
||||||
join Articles a using(Id_Article)
|
|
||||||
join Tipos tp using(tipo_id)
|
|
||||||
join Entradas e using(Id_Entrada)
|
|
||||||
join travel tr on tr.id = travel_id
|
|
||||||
where Id_Proveedor = idPEOPLE
|
|
||||||
and landing >= '2010-01-01'
|
|
||||||
and reino_id = 6
|
|
||||||
|
|
||||||
union all
|
|
||||||
|
|
||||||
select Id_Article, - Cantidad
|
|
||||||
from Movimientos m
|
|
||||||
join Articles a using(Id_Article)
|
|
||||||
join Tipos tp using(tipo_id)
|
|
||||||
join Tickets t using(Id_Ticket)
|
|
||||||
join Consignatarios cs using(Id_Consigna)
|
|
||||||
join proveedores_clientes pc on pc.Id_Cliente = cs.Id_Cliente
|
|
||||||
where Id_Proveedor = idPEOPLE
|
|
||||||
and reino_id = 6
|
|
||||||
and t.Fecha > '2010-01-01') mov
|
|
||||||
|
|
||||||
join Articles a using(Id_Article)
|
|
||||||
group by Id_Article;
|
|
||||||
|
|
||||||
end if;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,78 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`embalajes_stocks_detalle`(IN idPEOPLE INT, IN idARTICLE INT, IN bolCLIENT BOOLEAN)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
|
|
||||||
if bolCLIENT then
|
|
||||||
|
|
||||||
select m.Id_Article
|
|
||||||
, Article
|
|
||||||
, IF(Cantidad < 0, - Cantidad, NULL) as Entrada
|
|
||||||
, IF(Cantidad < 0, NULL, Cantidad) as Salida
|
|
||||||
, 'T' as Tabla
|
|
||||||
, t.Id_Ticket as Registro
|
|
||||||
, t.Fecha
|
|
||||||
, w.name as Almacen
|
|
||||||
, cast(Preu as Decimal(5,2)) Precio
|
|
||||||
, c.Cliente as Proveedor
|
|
||||||
, abbreviation as Empresa
|
|
||||||
from Movimientos m
|
|
||||||
join Articles a using(Id_Article)
|
|
||||||
join Tickets t using(Id_Ticket)
|
|
||||||
join empresa e on e.id = t.empresa_id
|
|
||||||
join warehouse w on w.id = t.warehouse_id
|
|
||||||
join Consignatarios cs using(Id_Consigna)
|
|
||||||
join Clientes c on c.Id_Cliente = cs.Id_Cliente
|
|
||||||
where cs.Id_Cliente = idPEOPLE
|
|
||||||
and m.Id_Article = idARTICLE
|
|
||||||
and t.Fecha > '2010-01-01';
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
select Id_Article, Tabla, Registro, Fecha, Article
|
|
||||||
, w.name as Almacen, Entrada, Salida, Proveedor, cast(Precio as Decimal(5,2)) Precio
|
|
||||||
|
|
||||||
from
|
|
||||||
|
|
||||||
(select Id_Article
|
|
||||||
, IF(Cantidad > 0, Cantidad, NULL) as Entrada
|
|
||||||
, IF(Cantidad > 0, NULL,- Cantidad) as Salida
|
|
||||||
, 'E' as Tabla
|
|
||||||
, Id_Entrada as Registro
|
|
||||||
, landing as Fecha
|
|
||||||
, tr.warehouse_id
|
|
||||||
, Costefijo as Precio
|
|
||||||
from Compres c
|
|
||||||
join Entradas e using(Id_Entrada)
|
|
||||||
join travel tr on tr.id = travel_id
|
|
||||||
where Id_Proveedor = idPEOPLE
|
|
||||||
and Id_Article = idARTICLE
|
|
||||||
and landing >= '2010-01-01'
|
|
||||||
|
|
||||||
union all
|
|
||||||
|
|
||||||
select Id_Article
|
|
||||||
, IF(Cantidad < 0, - Cantidad, NULL) as Entrada
|
|
||||||
, IF(Cantidad < 0, NULL, Cantidad) as Salida
|
|
||||||
, 'T'
|
|
||||||
, Id_Ticket
|
|
||||||
, Fecha
|
|
||||||
, t.warehouse_id
|
|
||||||
, Preu
|
|
||||||
from Movimientos m
|
|
||||||
join Tickets t using(Id_Ticket)
|
|
||||||
join Consignatarios cs using(Id_Consigna)
|
|
||||||
join proveedores_clientes pc on pc.Id_Cliente = cs.Id_Cliente
|
|
||||||
where Id_Proveedor = idPEOPLE
|
|
||||||
and Id_Article = idARTICLE
|
|
||||||
and t.Fecha > '2010-01-01') mov
|
|
||||||
|
|
||||||
join Articles a using(Id_Article)
|
|
||||||
join Proveedores p on Id_Proveedor = idPEOPLE
|
|
||||||
join warehouse w on w.id = mov.warehouse_id
|
|
||||||
;
|
|
||||||
|
|
||||||
end if;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,22 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`preOrdenarRuta`(IN vRutaId INT)
|
|
||||||
BEGIN
|
|
||||||
/* Usa los valores del ultimo año para adivinar el orden de los tickets en la ruta
|
|
||||||
* vRutaId id ruta
|
|
||||||
* DEPRECATED use vn.routeGressPriority
|
|
||||||
*/
|
|
||||||
|
|
||||||
UPDATE Tickets mt
|
|
||||||
JOIN (
|
|
||||||
SELECT tt.Id_Consigna, round(ifnull(avg(t.Prioridad),0),0) as Prioridad
|
|
||||||
from Tickets t
|
|
||||||
JOIN Tickets tt on tt.Id_Consigna = t.Id_Consigna
|
|
||||||
where t.Fecha > TIMESTAMPADD(YEAR,-1,util.VN_CURDATE())
|
|
||||||
AND tt.Id_Ruta = vRutaId
|
|
||||||
GROUP BY Id_Consigna
|
|
||||||
) sub ON sub.Id_Consigna = mt.Id_Consigna
|
|
||||||
SET mt.Prioridad = sub.Prioridad
|
|
||||||
WHERE mt.Id_Ruta = vRutaId;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,22 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`prepare_ticket_list`(vStartingDate DATETIME, vEndingDate DATETIME)
|
|
||||||
BEGIN
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
|
|
||||||
CREATE TEMPORARY TABLE tmp.ticket_list
|
|
||||||
(PRIMARY KEY (Id_Ticket))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT t.Id_Ticket, c.Id_Cliente
|
|
||||||
FROM Tickets t
|
|
||||||
LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.Id_Ticket
|
|
||||||
JOIN Clientes c ON c.Id_Cliente = t.Id_Cliente
|
|
||||||
WHERE c.typeFk IN ('normal','handMaking','internalUse')
|
|
||||||
AND (
|
|
||||||
Fecha BETWEEN util.today() AND vEndingDate
|
|
||||||
OR (
|
|
||||||
ts.alertLevel < 3
|
|
||||||
AND t.Fecha >= vStartingDate
|
|
||||||
AND t.Fecha < util.today()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,39 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`recibidaIvaInsert`(IN vId INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vRate DOUBLE DEFAULT 1;
|
|
||||||
DECLARE vDated DATE;
|
|
||||||
|
|
||||||
SELECT MAX(rr.date) INTO vDated
|
|
||||||
FROM reference_rate rr
|
|
||||||
JOIN recibida r ON r.id = vId
|
|
||||||
WHERE rr.date <= r.fecha
|
|
||||||
AND rr.moneda_id = r.moneda_id ;
|
|
||||||
|
|
||||||
IF vDated THEN
|
|
||||||
|
|
||||||
SELECT rate INTO vRate
|
|
||||||
FROM reference_rate
|
|
||||||
WHERE `date` = vDated;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
DELETE FROM recibida_iva WHERE recibida_id = vId;
|
|
||||||
|
|
||||||
INSERT INTO recibida_iva(recibida_id, bi, gastos_id, divisa, taxTypeSageFk, transactionTypeSageFk)
|
|
||||||
SELECT r.id,
|
|
||||||
SUM(Costefijo * Cantidad) / IFNULL(vRate,1) bi,
|
|
||||||
6003000000,
|
|
||||||
IF(r.moneda_id = 1,NULL,SUM(Costefijo * Cantidad )) divisa,
|
|
||||||
taxTypeSageFk,
|
|
||||||
transactionTypeSageFk
|
|
||||||
FROM recibida r
|
|
||||||
JOIN Entradas e ON e.recibida_id = r.id
|
|
||||||
JOIN Proveedores p ON p.Id_Proveedor = e.Id_Proveedor
|
|
||||||
JOIN Compres c ON c.Id_Entrada = e.Id_Entrada
|
|
||||||
LEFT JOIN reference_rate rr ON rr.moneda_id = r.moneda_id AND rr.date = r.fecha
|
|
||||||
WHERE r.id = vId
|
|
||||||
HAVING bi IS NOT NULL;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,58 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`unary_leaves`(v_top INT)
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* A partir de un nodo devuelve todos sus descendientes.
|
|
||||||
*
|
|
||||||
* @table tmp.tree Tabla con los ids de los nodos descendientes;
|
|
||||||
**/
|
|
||||||
DECLARE v_count INT;
|
|
||||||
DECLARE v_parent INT;
|
|
||||||
DECLARE v_depth INT DEFAULT 0;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.tree;
|
|
||||||
CREATE TEMPORARY TABLE tmp.tree
|
|
||||||
(INDEX (id))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT v_top id, v_parent parent, v_depth depth;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.parent;
|
|
||||||
CREATE TEMPORARY TABLE tmp.parent
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT v_top id;
|
|
||||||
|
|
||||||
l: LOOP
|
|
||||||
|
|
||||||
SET v_depth = v_depth + 1;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.child;
|
|
||||||
CREATE TEMPORARY TABLE tmp.child
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT c.`id`, c.parent
|
|
||||||
FROM `unary` c
|
|
||||||
JOIN tmp.parent p ON c.`parent` = p.id;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tmp.parent;
|
|
||||||
CREATE TEMPORARY TABLE tmp.parent
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT c.id, c.parent
|
|
||||||
FROM tmp.child c
|
|
||||||
LEFT JOIN tmp.tree t ON t.id = c.id
|
|
||||||
WHERE t.id IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO tmp.tree
|
|
||||||
SELECT id, parent, v_depth FROM tmp.parent;
|
|
||||||
|
|
||||||
SELECT COUNT(*) INTO v_count
|
|
||||||
FROM tmp.parent;
|
|
||||||
|
|
||||||
IF v_count = 0 THEN
|
|
||||||
LEAVE l;
|
|
||||||
END IF;
|
|
||||||
END LOOP;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE
|
|
||||||
tmp.parent,
|
|
||||||
tmp.child;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,19 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`unary_tops`()
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* Devuelve todos los nodos que no tienen padre.
|
|
||||||
*
|
|
||||||
* @table tmp.tree Tabla con los ids de los nodos que no tienen padre;
|
|
||||||
**/
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.tree;
|
|
||||||
CREATE TEMPORARY TABLE tmp.tree
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT s.`unary_id` AS id, s.name, s.odbc_date, s.type
|
|
||||||
FROM `unary_scan` s
|
|
||||||
INNER JOIN `unary` u ON s.unary_id = u.id
|
|
||||||
WHERE u.parent IS NULL;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,10 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn2008`.`v_jerarquia`
|
|
||||||
AS SELECT `vn2008`.`jerarquia`.`worker_id` AS `Id_Trabajador`,
|
|
||||||
`vn2008`.`jerarquia`.`boss_id` AS `boss_id`
|
|
||||||
FROM `vn2008`.`jerarquia`
|
|
||||||
UNION ALL
|
|
||||||
SELECT DISTINCT `vn2008`.`jerarquia`.`boss_id` AS `Id_Trabajador`,
|
|
||||||
`vn2008`.`jerarquia`.`boss_id` AS `boss_id`
|
|
||||||
FROM `vn2008`.`jerarquia`
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
SET @isTriggerDisabled := TRUE;
|
||||||
|
|
||||||
|
UPDATE vn.buy
|
||||||
|
SET packing = 1
|
||||||
|
WHERE packing IS NULL
|
||||||
|
OR packing <= 0;
|
||||||
|
|
||||||
|
UPDATE vn.itemShelving
|
||||||
|
SET packing = 1
|
||||||
|
WHERE packing IS NULL
|
||||||
|
OR NOT packing;
|
||||||
|
|
||||||
|
SET @isTriggerDisabled := FALSE;
|
||||||
|
|
||||||
|
ALTER TABLE vn.buy MODIFY COLUMN packing int(11) NOT NULL CHECK(packing > 0);
|
||||||
|
ALTER TABLE vn.itemShelving MODIFY COLUMN packing int(11) NOT NULL CHECK(packing > 0);
|
||||||
|
|
||||||
|
-- Antes tenia '0=sin obligar 1=groping 2=packing' (groping → grouping)
|
||||||
|
ALTER TABLE vn.buy MODIFY COLUMN groupingMode tinyint(4) DEFAULT 0 NOT NULL COMMENT '0=sin obligar 1=grouping 2=packing';
|
|
@ -0,0 +1,36 @@
|
||||||
|
USE vn;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TABLE vn.workerActivityType (
|
||||||
|
`code` varchar(20) NOT NULL,
|
||||||
|
`description` varchar(45) NOT NULL,
|
||||||
|
PRIMARY KEY (`code`)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
|
||||||
|
|
||||||
|
ALTER TABLE vn.department ADD workerActivityTypeFk varchar(20) NULL COMMENT 'Indica la actitividad que desempeña por defecto ese departamento';
|
||||||
|
ALTER TABLE vn.department ADD CONSTRAINT department_workerActivityType_FK FOREIGN KEY (workerActivityTypeFk) REFERENCES vn.workerActivityType(code) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('ON_CHECKING', 'REVISION');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('PREVIOUS_CAM', 'CAMARA');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('PREVIOUS_ART', 'ARTIFICIAL');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('ON_PREPARATION', 'SACADO');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('PACKING', 'ENCAJADO');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('FIELD', 'CAMPOS');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('DELIVERY', 'REPARTO');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('STORAGE', 'ALMACENAJE');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('PALLETIZING', 'PALETIZADO');
|
||||||
|
INSERT INTO vn.workerActivityType (code, description) VALUES('STOP', 'PARADA');
|
||||||
|
|
||||||
|
|
||||||
|
INSERT INTO salix.ACL ( model, property, accessType, permission, principalType, principalId) VALUES('WorkerActivityType', '*', 'READ', 'ALLOW', 'ROLE', 'production');
|
||||||
|
INSERT INTO salix.ACL ( model, property, accessType, permission, principalType, principalId) VALUES('WorkerActivity', '*', '*', 'ALLOW', 'ROLE', 'production');
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE vn.workerActivity MODIFY COLUMN event enum('open','close','insert','delete','update','refresh') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
|
||||||
|
ALTER TABLE vn.workerActivity MODIFY COLUMN model enum('COM','ENT','TPV','ENC','LAB','ETI','APP') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE vn.workerActivity ADD workerActivityTypeFk varchar(20) NULL;
|
||||||
|
ALTER TABLE vn.workerActivity ADD CONSTRAINT workerActivity_workerActivityType_FK FOREIGN KEY (workerActivityTypeFk) REFERENCES vn.workerActivityType(code) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
DELETE FROM bs.nightTask
|
||||||
|
WHERE `procedure` = 'emailYesterdayPurchasesLauncher';
|
|
@ -0,0 +1,60 @@
|
||||||
|
CREATE OR REPLACE TABLE vn.parkingLog (
|
||||||
|
|
||||||
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
|
||||||
|
`originFk` int(11) DEFAULT NULL,
|
||||||
|
|
||||||
|
`userFk` int(10) unsigned DEFAULT NULL,
|
||||||
|
|
||||||
|
`action` set('insert','update','delete','select') NOT NULL,
|
||||||
|
|
||||||
|
`creationDate` timestamp NULL DEFAULT current_timestamp(),
|
||||||
|
|
||||||
|
`description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
|
||||||
|
|
||||||
|
`changedModel` enum('Parking','SaleGroup','SaleGroupDetail') NOT NULL DEFAULT 'Parking',
|
||||||
|
|
||||||
|
`oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
|
||||||
|
|
||||||
|
`newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
|
||||||
|
|
||||||
|
`changedModelId` int(11) NOT NULL,
|
||||||
|
|
||||||
|
`changedModelValue` varchar(45) DEFAULT NULL,
|
||||||
|
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
|
||||||
|
KEY `logParkinguserFk` (`userFk`),
|
||||||
|
|
||||||
|
KEY `parkingLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
|
||||||
|
|
||||||
|
KEY `parkingLog_originFk` (`originFk`,`creationDate`),
|
||||||
|
|
||||||
|
CONSTRAINT `parkingOriginFk` FOREIGN KEY (`originFk`) REFERENCES `parking` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
|
||||||
|
CONSTRAINT `parkingUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
|
||||||
|
|
||||||
|
ALTER TABLE vn.parking DROP COLUMN IF EXISTS editorFk;
|
||||||
|
ALTER TABLE IF EXISTS vn.parking ADD COLUMN editorFk INT;
|
||||||
|
|
||||||
|
ALTER TABLE vn.saleGroupDetail DROP COLUMN IF EXISTS editorFk;
|
||||||
|
ALTER TABLE IF EXISTS vn.saleGroupDetail ADD COLUMN editorFk INT;
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE vn.ticketLog
|
||||||
|
MODIFY COLUMN changedModel ENUM(
|
||||||
|
'Ticket',
|
||||||
|
'Sale',
|
||||||
|
'TicketWeekly',
|
||||||
|
'TicketTracking',
|
||||||
|
'TicketService',
|
||||||
|
'TicketRequest',
|
||||||
|
'TicketRefund',
|
||||||
|
'TicketPackaging',
|
||||||
|
'TicketObservation',
|
||||||
|
'TicketDms',
|
||||||
|
'Expedition',
|
||||||
|
'Sms'
|
||||||
|
) NOT NULL DEFAULT 'Ticket';
|
|
@ -0,0 +1,2 @@
|
||||||
|
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
|
||||||
|
VALUES ('ParkingLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
|
|
@ -1,3 +0,0 @@
|
||||||
-- Place your SQL code here
|
|
||||||
ALTER TABLE IF EXISTS vn2008.unary__ RENAME vn2008.unary;
|
|
||||||
ALTER TABLE IF EXISTS vn2008.unary_scan__ RENAME vn2008.unary_scan;
|
|
|
@ -1,4 +0,0 @@
|
||||||
ALTER TABLE IF EXISTS vn2008.unary_scan__ RENAME vn2008.unary_scan;
|
|
||||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line__ RENAME vn2008.unary_scan_line;
|
|
||||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy__ RENAME vn2008.unary_scan_line_buy;
|
|
||||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition__ RENAME vn2008.unary_scan_line_expedition;
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
|
||||||
|
ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
|
||||||
|
ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
|
||||||
|
ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;
|
|
@ -324,7 +324,6 @@
|
||||||
"The response is not a PDF": "La respuesta no es un PDF",
|
"The response is not a PDF": "La respuesta no es un PDF",
|
||||||
"Booking completed": "Reserva completada",
|
"Booking completed": "Reserva completada",
|
||||||
"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
|
"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
|
||||||
"Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
|
|
||||||
"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
|
"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
|
||||||
"User disabled": "Usuario desactivado",
|
"User disabled": "Usuario desactivado",
|
||||||
"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
|
"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
|
||||||
|
@ -348,4 +347,4 @@
|
||||||
"Cmr file does not exist": "El archivo del cmr no existe",
|
"Cmr file does not exist": "El archivo del cmr no existe",
|
||||||
"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
|
"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
|
||||||
"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas"
|
"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas"
|
||||||
}
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
const print = require('vn-print');
|
const print = require('vn-print');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
require('../methods/invoiceOut/filter')(Self);
|
require('../methods/invoiceOut/filter')(Self);
|
||||||
|
@ -66,4 +67,24 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Self.getSerial = async function(clientId, companyId, addressId, type, myOptions) {
|
||||||
|
const [{serial}] = await Self.rawSql(
|
||||||
|
`SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
|
||||||
|
[
|
||||||
|
clientId,
|
||||||
|
companyId,
|
||||||
|
type
|
||||||
|
],
|
||||||
|
myOptions);
|
||||||
|
|
||||||
|
const invoiceOutSerial = await Self.app.models.InvoiceOutSerial.findById(serial);
|
||||||
|
if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
|
||||||
|
const address = await Self.app.models.Address.findById(addressId);
|
||||||
|
if (!address || !address.customsAgentFk || !address.incotermsFk)
|
||||||
|
throw new UserError('The address of the customer must have information about Incoterms and Customs Agent');
|
||||||
|
}
|
||||||
|
|
||||||
|
return serial;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -102,7 +102,7 @@
|
||||||
</vn-item>
|
</vn-item>
|
||||||
<vn-item class="dropdown"
|
<vn-item class="dropdown"
|
||||||
vn-click-stop="refundMenu.show($event, 'left')"
|
vn-click-stop="refundMenu.show($event, 'left')"
|
||||||
vn-tooltip="Create a single ticket with all the content of the current invoice"
|
vn-tooltip="Create a refund ticket for each ticket on the current invoice"
|
||||||
vn-acl="invoicing, claimManager, salesAssistant"
|
vn-acl="invoicing, claimManager, salesAssistant"
|
||||||
vn-acl-action="remove"
|
vn-acl-action="remove"
|
||||||
translate>
|
translate>
|
||||||
|
|
|
@ -118,11 +118,14 @@ class Controller extends Section {
|
||||||
const query = 'InvoiceOuts/refund';
|
const query = 'InvoiceOuts/refund';
|
||||||
const params = {ref: this.invoiceOut.ref, withWarehouse: withWarehouse};
|
const params = {ref: this.invoiceOut.ref, withWarehouse: withWarehouse};
|
||||||
this.$http.post(query, params).then(res => {
|
this.$http.post(query, params).then(res => {
|
||||||
const refundTicket = res.data;
|
const tickets = res.data;
|
||||||
this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
|
const refundTickets = tickets.map(ticket => ticket.id);
|
||||||
ticketId: refundTicket.id
|
|
||||||
|
this.vnApp.showSuccess(this.$t('The following refund tickets have been created', {
|
||||||
|
ticketId: refundTickets.join(',')
|
||||||
}));
|
}));
|
||||||
this.$state.go('ticket.card.sale', {id: refundTicket.id});
|
if (refundTickets.length == 1)
|
||||||
|
this.$state.go('ticket.card.sale', {id: refundTickets[0]});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ Are you sure you want to clone this invoice?: Estas seguro de clonar esta factur
|
||||||
InvoiceOut booked: Factura asentada
|
InvoiceOut booked: Factura asentada
|
||||||
Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
|
Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
|
||||||
Are you sure you want to refund this invoice?: Estas seguro de querer abonar esta factura?
|
Are you sure you want to refund this invoice?: Estas seguro de querer abonar esta factura?
|
||||||
Create a single ticket with all the content of the current invoice: Crear un ticket unico con todo el contenido de la factura actual
|
Create a refund ticket for each ticket on the current invoice: Crear un ticket abono por cada ticket de la factura actual
|
||||||
Regenerate PDF invoice: Regenerar PDF factura
|
Regenerate PDF invoice: Regenerar PDF factura
|
||||||
The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
|
The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
|
||||||
The email can't be empty: El correo no puede estar vacío
|
The email can't be empty: El correo no puede estar vacío
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"ParkingLog": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"name": "ParkingLog",
|
||||||
|
"base": "Log",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "parkingLog"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -30,9 +30,11 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
function validateDistance(err) {
|
function validateDistance(err) {
|
||||||
const routeTotalKm = this.kmEnd - this.kmStart;
|
if (this.kmEnd) {
|
||||||
const routeMaxKm = 4000;
|
const routeTotalKm = this.kmEnd - this.kmStart;
|
||||||
if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
|
const routeMaxKm = 4000;
|
||||||
err();
|
if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
|
||||||
|
err();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
name: parking
|
||||||
|
columns:
|
||||||
|
id: id
|
||||||
|
column: column
|
||||||
|
row: row
|
||||||
|
sectorFk: sector
|
||||||
|
code: code
|
||||||
|
pickingOrder: picking order
|
||||||
|
editorFk: editor
|
|
@ -0,0 +1,10 @@
|
||||||
|
name: parking
|
||||||
|
columns:
|
||||||
|
id: id
|
||||||
|
column: columna
|
||||||
|
row: fila
|
||||||
|
sectorFk: sector
|
||||||
|
code: código
|
||||||
|
pickingOrder: orden de recogida
|
||||||
|
editorFk: editor
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"required": true
|
"required": true
|
||||||
},
|
},
|
||||||
"sectorFk": {
|
|
||||||
"type": "number"
|
|
||||||
},
|
|
||||||
"code": {
|
"code": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
@ -35,6 +32,11 @@
|
||||||
"type": "hasMany",
|
"type": "hasMany",
|
||||||
"model": "saleGroup",
|
"model": "saleGroup",
|
||||||
"foreignKey": "parkingFk"
|
"foreignKey": "parkingFk"
|
||||||
|
},
|
||||||
|
"sector": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "Sector",
|
||||||
|
"foreignKey": "sectorFk"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
Self.remoteMethodCtx('newSupplier', {
|
Self.remoteMethodCtx('newSupplier', {
|
||||||
description: 'Creates a new supplier and returns it',
|
description: 'Creates a new supplier and returns it',
|
||||||
|
@ -19,12 +21,13 @@ module.exports = Self => {
|
||||||
Self.newSupplier = async(ctx, options) => {
|
Self.newSupplier = async(ctx, options) => {
|
||||||
const models = Self.app.models;
|
const models = Self.app.models;
|
||||||
const args = ctx.args;
|
const args = ctx.args;
|
||||||
const myOptions = {};
|
const myOptions = {validate: false};
|
||||||
|
|
||||||
if (typeof options == 'object')
|
if (typeof options == 'object')
|
||||||
Object.assign(myOptions, options);
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
delete args.ctx;
|
delete args.ctx;
|
||||||
|
if (!args.name) throw new UserError('The social name cannot be empty');
|
||||||
const data = {...args, ...{nickname: args.name}};
|
const data = {...args, ...{nickname: args.name}};
|
||||||
const supplier = await models.Supplier.create(data, myOptions);
|
const supplier = await models.Supplier.create(data, myOptions);
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,5 @@ Go to client: Ir al cliente
|
||||||
Verified supplier: Proveedor verificado
|
Verified supplier: Proveedor verificado
|
||||||
Unverified supplier: Proveedor no verificado
|
Unverified supplier: Proveedor no verificado
|
||||||
Inactive supplier: Proveedor inactivo
|
Inactive supplier: Proveedor inactivo
|
||||||
Create invoiceIn: Crear factura recibida
|
Create invoiceIn: Crear factura recibida
|
||||||
|
Supplier name: Razón social
|
||||||
|
|
|
@ -9,8 +9,8 @@ describe('ticketLog getChanges()', () => {
|
||||||
it('should return the changes in the sales of a ticket', async() => {
|
it('should return the changes in the sales of a ticket', async() => {
|
||||||
const ticketId = 16;
|
const ticketId = 16;
|
||||||
|
|
||||||
const changues = await models.TicketLog.getChanges(ctx, ticketId);
|
const changes = await models.TicketLog.getChanges(ctx, ticketId);
|
||||||
|
|
||||||
expect(changues).toContain(`Change quantity`);
|
expect(changes).toContain(`Change quantity`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -35,6 +35,7 @@ module.exports = Self => {
|
||||||
SELECT t.id,
|
SELECT t.id,
|
||||||
t.clientFk,
|
t.clientFk,
|
||||||
t.companyFk,
|
t.companyFk,
|
||||||
|
c.id clientFk,
|
||||||
c.name clientName,
|
c.name clientName,
|
||||||
c.email recipient,
|
c.email recipient,
|
||||||
c.salesPersonFk,
|
c.salesPersonFk,
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
/* eslint max-len: ["error", { "code": 150 }]*/
|
||||||
|
|
||||||
const Report = require('vn-print/core/report');
|
const Report = require('vn-print/core/report');
|
||||||
const Email = require('vn-print/core/email');
|
const Email = require('vn-print/core/email');
|
||||||
const smtp = require('vn-print/core/smtp');
|
const smtp = require('vn-print/core/smtp');
|
||||||
|
@ -11,19 +13,27 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
const failedtickets = [];
|
const failedtickets = [];
|
||||||
for (const ticket of tickets) {
|
for (const ticket of tickets) {
|
||||||
try {
|
try {
|
||||||
await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
|
await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
|
||||||
|
await Self.rawSql(
|
||||||
|
`CALL vn.ticket_closeByTicket(?)`,
|
||||||
|
[ticket.id],
|
||||||
|
{userId}
|
||||||
|
);
|
||||||
|
|
||||||
const [invoiceOut] = await Self.rawSql(`
|
const [invoiceOut] = await Self.rawSql(
|
||||||
|
`
|
||||||
SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
|
SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
|
||||||
FROM ticket t
|
FROM ticket t
|
||||||
JOIN invoiceOut io ON io.ref = t.refFk
|
JOIN invoiceOut io ON io.ref = t.refFk
|
||||||
JOIN company cny ON cny.id = io.companyFk
|
JOIN company cny ON cny.id = io.companyFk
|
||||||
WHERE t.id = ?
|
WHERE t.id = ?
|
||||||
`, [ticket.id]);
|
`,
|
||||||
|
[ticket.id],
|
||||||
|
);
|
||||||
|
|
||||||
const mailOptions = {
|
const mailOptions = {
|
||||||
overrideAttachments: true,
|
overrideAttachments: true,
|
||||||
attachments: []
|
attachments: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
|
const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
|
||||||
|
@ -33,7 +43,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
reference: invoiceOut.ref,
|
reference: invoiceOut.ref,
|
||||||
recipientId: ticket.clientFk,
|
recipientId: ticket.clientFk,
|
||||||
recipient: ticket.recipient,
|
recipient: ticket.recipient,
|
||||||
replyTo: ticket.salesPersonEmail
|
replyTo: ticket.salesPersonEmail,
|
||||||
};
|
};
|
||||||
|
|
||||||
const invoiceReport = new Report('invoice', args);
|
const invoiceReport = new Report('invoice', args);
|
||||||
|
@ -50,15 +60,19 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
await storage.write(stream, {
|
await storage.write(stream, {
|
||||||
type: 'invoice',
|
type: 'invoice',
|
||||||
path: `${year}/${month}/${day}`,
|
path: `${year}/${month}/${day}`,
|
||||||
fileName: fileName
|
fileName: fileName,
|
||||||
});
|
});
|
||||||
|
|
||||||
await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
|
await Self.rawSql(
|
||||||
|
'UPDATE invoiceOut SET hasPdf = true WHERE id = ?',
|
||||||
|
[invoiceOut.id],
|
||||||
|
{userId},
|
||||||
|
);
|
||||||
|
|
||||||
if (isToBeMailed) {
|
if (isToBeMailed) {
|
||||||
const invoiceAttachment = {
|
const invoiceAttachment = {
|
||||||
filename: fileName,
|
filename: fileName,
|
||||||
content: stream
|
content: stream,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
|
if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
|
||||||
|
@ -68,7 +82,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
|
|
||||||
mailOptions.attachments.push({
|
mailOptions.attachments.push({
|
||||||
filename: fileName,
|
filename: fileName,
|
||||||
content: stream
|
content: stream,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,7 +96,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
id: ticket.id,
|
id: ticket.id,
|
||||||
recipientId: ticket.clientFk,
|
recipientId: ticket.clientFk,
|
||||||
recipient: ticket.recipient,
|
recipient: ticket.recipient,
|
||||||
replyTo: ticket.salesPersonEmail
|
replyTo: ticket.salesPersonEmail,
|
||||||
};
|
};
|
||||||
|
|
||||||
const email = new Email('delivery-note-link', args);
|
const email = new Email('delivery-note-link', args);
|
||||||
|
@ -90,14 +104,17 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Incoterms authorization
|
// Incoterms authorization
|
||||||
const [{firstOrder}] = await Self.rawSql(`
|
const [{firstOrder}] = await Self.rawSql(
|
||||||
|
`
|
||||||
SELECT COUNT(*) as firstOrder
|
SELECT COUNT(*) as firstOrder
|
||||||
FROM ticket t
|
FROM ticket t
|
||||||
JOIN client c ON c.id = t.clientFk
|
JOIN client c ON c.id = t.clientFk
|
||||||
WHERE t.clientFk = ?
|
WHERE t.clientFk = ?
|
||||||
AND NOT t.isDeleted
|
AND NOT t.isDeleted
|
||||||
AND c.isVies
|
AND c.isVies
|
||||||
`, [ticket.clientFk]);
|
`,
|
||||||
|
[ticket.clientFk],
|
||||||
|
);
|
||||||
|
|
||||||
if (firstOrder == 1) {
|
if (firstOrder == 1) {
|
||||||
const args = {
|
const args = {
|
||||||
|
@ -106,7 +123,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
recipientId: ticket.clientFk,
|
recipientId: ticket.clientFk,
|
||||||
recipient: ticket.recipient,
|
recipient: ticket.recipient,
|
||||||
replyTo: ticket.salesPersonEmail,
|
replyTo: ticket.salesPersonEmail,
|
||||||
addressId: ticket.addressFk
|
addressId: ticket.addressFk,
|
||||||
};
|
};
|
||||||
|
|
||||||
const email = new Email('incoterms-authorization', args);
|
const email = new Email('incoterms-authorization', args);
|
||||||
|
@ -116,21 +133,25 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
`SELECT id
|
`SELECT id
|
||||||
FROM sample
|
FROM sample
|
||||||
WHERE code = 'incoterms-authorization'
|
WHERE code = 'incoterms-authorization'
|
||||||
`);
|
`,
|
||||||
|
);
|
||||||
|
|
||||||
await Self.rawSql(`
|
await Self.rawSql(
|
||||||
|
`
|
||||||
INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
|
INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
|
||||||
`, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
|
`,
|
||||||
|
[ticket.clientFk, sample.id, ticket.companyFk],
|
||||||
|
{userId},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Domain not found
|
// Domain not found
|
||||||
if (error.responseCode == 450)
|
if (error.responseCode == 450) return invalidEmail(ticket);
|
||||||
return invalidEmail(ticket);
|
|
||||||
|
|
||||||
// Save tickets on a list of failed ids
|
// Save tickets on a list of failed ids
|
||||||
failedtickets.push({
|
failedtickets.push({
|
||||||
id: ticket.id,
|
id: ticket.id,
|
||||||
stacktrace: error
|
stacktrace: error,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -147,24 +168,26 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
smtp.send({
|
smtp.send({
|
||||||
to: config.app.reportEmail,
|
to: config.app.reportEmail,
|
||||||
subject: '[API] Nightly ticket closure report',
|
subject: '[API] Nightly ticket closure report',
|
||||||
html: body
|
html: body,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function invalidEmail(ticket) {
|
async function invalidEmail(ticket) {
|
||||||
await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
|
await Self.rawSql(
|
||||||
ticket.clientFk
|
`UPDATE client SET email = NULL WHERE id = ?`,
|
||||||
], {userId});
|
[ticket.clientFk],
|
||||||
|
{userId},
|
||||||
|
);
|
||||||
|
|
||||||
const oldInstance = `{"email": "${ticket.recipient}"}`;
|
const oldInstance = `{"email": "${ticket.recipient}"}`;
|
||||||
const newInstance = `{"email": ""}`;
|
const newInstance = `{"email": ""}`;
|
||||||
await Self.rawSql(`
|
await Self.rawSql(
|
||||||
|
`
|
||||||
INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
|
INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
|
||||||
VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
|
VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`,
|
||||||
ticket.clientFk,
|
[ticket.clientFk, oldInstance, newInstance],
|
||||||
oldInstance,
|
{userId},
|
||||||
newInstance
|
);
|
||||||
], {userId});
|
|
||||||
|
|
||||||
const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
|
const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
|
||||||
al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
|
al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
|
||||||
|
@ -176,7 +199,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
smtp.send({
|
smtp.send({
|
||||||
to: ticket.salesPersonEmail,
|
to: ticket.salesPersonEmail,
|
||||||
subject: 'No se ha podido enviar el albarán',
|
subject: 'No se ha podido enviar el albarán',
|
||||||
html: body
|
html: body,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -77,22 +77,10 @@ module.exports = function(Self) {
|
||||||
if (!clientCanBeInvoiced)
|
if (!clientCanBeInvoiced)
|
||||||
throw new UserError(`This client can't be invoiced`);
|
throw new UserError(`This client can't be invoiced`);
|
||||||
|
|
||||||
const [{serial}] = invoiceCorrection ? [{serial: 'R'}] : await Self.rawSql(
|
const serial = !invoiceCorrection
|
||||||
`SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
|
? await models.InvoiceOut.getSerial(clientId, companyFk, firstTicket.addressFk, invoiceType, myOptions)
|
||||||
[
|
: 'R';
|
||||||
clientId,
|
|
||||||
companyFk,
|
|
||||||
invoiceType
|
|
||||||
],
|
|
||||||
myOptions);
|
|
||||||
|
|
||||||
const invoiceOutSerial = await models.InvoiceOutSerial.findById(serial);
|
|
||||||
if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
|
|
||||||
const address = await models.Address.findById(firstTicket.addressFk);
|
|
||||||
|
|
||||||
if (!address || !address.customsAgentFk || !address.incotermsFk)
|
|
||||||
throw new UserError('Incoterms data for consignee is missing');
|
|
||||||
}
|
|
||||||
await Self.rawSql('CALL invoiceOut_new(?, ?, null, @invoiceId)', [serial, invoiceDate], myOptions);
|
await Self.rawSql('CALL invoiceOut_new(?, ?, null, @invoiceId)', [serial, invoiceDate], myOptions);
|
||||||
|
|
||||||
const [resultInvoice] = await Self.rawSql('SELECT @invoiceId id', [], myOptions);
|
const [resultInvoice] = await Self.rawSql('SELECT @invoiceId id', [], myOptions);
|
||||||
|
|
|
@ -29,6 +29,15 @@ module.exports = Self => {
|
||||||
if (typeof options == 'object')
|
if (typeof options == 'object')
|
||||||
Object.assign(myOptions, options);
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
|
const ticketLog = await models.TicketLog.findOne({
|
||||||
|
fields: ['originFk', 'creationDate', 'newInstance'],
|
||||||
|
where: {
|
||||||
|
originFk: id,
|
||||||
|
newInstance: {like: '%"isDeleted":true%'}
|
||||||
|
},
|
||||||
|
order: 'creationDate DESC'
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
const ticket = await models.Ticket.findById(id, {
|
const ticket = await models.Ticket.findById(id, {
|
||||||
include: [{
|
include: [{
|
||||||
relation: 'client',
|
relation: 'client',
|
||||||
|
@ -39,10 +48,9 @@ module.exports = Self => {
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
const now = Date.vnNew();
|
const now = Date.vnNew();
|
||||||
const maxDate = new Date(ticket.updated);
|
const maxDate = new Date(ticketLog?.creationDate);
|
||||||
maxDate.setHours(maxDate.getHours() + 1);
|
maxDate.setHours(maxDate.getHours() + 1);
|
||||||
|
if (!ticketLog || now > maxDate)
|
||||||
if (now > maxDate)
|
|
||||||
throw new UserError(`You can only restore a ticket within the first hour after deletion`);
|
throw new UserError(`You can only restore a ticket within the first hour after deletion`);
|
||||||
|
|
||||||
// Send notification to salesPerson
|
// Send notification to salesPerson
|
||||||
|
|
|
@ -77,6 +77,6 @@ describe('ticket makeInvoice()', () => {
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(error.message).toEqual(`Incoterms data for consignee is missing`);
|
expect(error.message).toEqual(`The address of the customer must have information about Incoterms and Customs Agent`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -4,7 +4,7 @@ const models = app.models;
|
||||||
|
|
||||||
describe('ticket restore()', () => {
|
describe('ticket restore()', () => {
|
||||||
const employeeUser = 1110;
|
const employeeUser = 1110;
|
||||||
const ticketId = 18;
|
const ticketId = 9;
|
||||||
const activeCtx = {
|
const activeCtx = {
|
||||||
accessToken: {userId: employeeUser},
|
accessToken: {userId: employeeUser},
|
||||||
headers: {
|
headers: {
|
||||||
|
@ -30,10 +30,21 @@ describe('ticket restore()', () => {
|
||||||
try {
|
try {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
const ticket = await models.Ticket.findById(ticketId, null, options);
|
const ticket = await models.Ticket.findById(ticketId, null, options);
|
||||||
|
|
||||||
await ticket.updateAttributes({
|
await ticket.updateAttributes({
|
||||||
isDeleted: true,
|
isDeleted: true,
|
||||||
updated: now
|
updated: now
|
||||||
}, options);
|
}, options);
|
||||||
|
|
||||||
|
await models.TicketLog.create({
|
||||||
|
originFk: ticketId,
|
||||||
|
userFk: employeeUser,
|
||||||
|
action: 'update',
|
||||||
|
changedModel: 'Ticket',
|
||||||
|
creationDate: new Date('2001-01-01 10:59:00'),
|
||||||
|
newInstance: '{"isDeleted":true}'
|
||||||
|
}, options);
|
||||||
|
|
||||||
await app.models.Ticket.restore(ctx, ticketId, options);
|
await app.models.Ticket.restore(ctx, ticketId, options);
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -52,11 +63,21 @@ describe('ticket restore()', () => {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
const ticketBeforeUpdate = await models.Ticket.findById(ticketId, null, options);
|
const ticketBeforeUpdate = await models.Ticket.findById(ticketId, null, options);
|
||||||
|
|
||||||
await ticketBeforeUpdate.updateAttributes({
|
await ticketBeforeUpdate.updateAttributes({
|
||||||
isDeleted: true,
|
isDeleted: true,
|
||||||
updated: now
|
updated: now
|
||||||
}, options);
|
}, options);
|
||||||
|
|
||||||
|
await models.TicketLog.create({
|
||||||
|
originFk: ticketId,
|
||||||
|
userFk: employeeUser,
|
||||||
|
action: 'update',
|
||||||
|
changedModel: 'Ticket',
|
||||||
|
creationDate: new Date('2001-01-01 11:01:00'),
|
||||||
|
newInstance: '{"isDeleted":true}'
|
||||||
|
}, options);
|
||||||
|
|
||||||
const ticketAfterUpdate = await models.Ticket.findById(ticketId, null, options);
|
const ticketAfterUpdate = await models.Ticket.findById(ticketId, null, options);
|
||||||
|
|
||||||
expect(ticketAfterUpdate.isDeleted).toBeTruthy();
|
expect(ticketAfterUpdate.isDeleted).toBeTruthy();
|
||||||
|
@ -65,7 +86,9 @@ describe('ticket restore()', () => {
|
||||||
const ticketAfterRestore = await models.Ticket.findById(ticketId, null, options);
|
const ticketAfterRestore = await models.Ticket.findById(ticketId, null, options);
|
||||||
|
|
||||||
const fullYear = now.getFullYear();
|
const fullYear = now.getFullYear();
|
||||||
|
|
||||||
const shippedFullYear = ticketAfterRestore.shipped.getFullYear();
|
const shippedFullYear = ticketAfterRestore.shipped.getFullYear();
|
||||||
|
|
||||||
const landedFullYear = ticketAfterRestore.landed.getFullYear();
|
const landedFullYear = ticketAfterRestore.landed.getFullYear();
|
||||||
|
|
||||||
expect(ticketAfterRestore.isDeleted).toBeFalsy();
|
expect(ticketAfterRestore.isDeleted).toBeFalsy();
|
||||||
|
|
|
@ -5,5 +5,40 @@
|
||||||
"mysql": {
|
"mysql": {
|
||||||
"table": "ticketLog"
|
"table": "ticketLog"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"originFk": {
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"userFk": {
|
||||||
|
"type":"number"
|
||||||
|
},
|
||||||
|
"action": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"creationDate": {
|
||||||
|
"type": "date"
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"changedModel": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"oldInstance": {
|
||||||
|
"type": "any"
|
||||||
|
},
|
||||||
|
"newInstance": {
|
||||||
|
"type": "any"
|
||||||
|
},
|
||||||
|
"changedModelId": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"changedModelValue": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,29 @@ class Controller extends Section {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const filter = {
|
||||||
|
fields: ['originFk', 'creationDate', 'newInstance'],
|
||||||
|
where: {
|
||||||
|
originFk: value,
|
||||||
|
newInstance: {like: '%"isDeleted":true%'}
|
||||||
|
},
|
||||||
|
order: 'creationDate DESC'
|
||||||
|
};
|
||||||
|
this.$http.get(`TicketLogs/findOne`, {filter})
|
||||||
|
.then(res => {
|
||||||
|
if (res && res.data) {
|
||||||
|
const now = Date.vnNew();
|
||||||
|
const maxDate = new Date(res.data.creationDate);
|
||||||
|
maxDate.setHours(maxDate.getHours() + 1);
|
||||||
|
if (now <= maxDate)
|
||||||
|
return this.canRestoreTicket = true;
|
||||||
|
}
|
||||||
|
this.canRestoreTicket = false;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
this.canRestoreTicket = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
get isInvoiced() {
|
get isInvoiced() {
|
||||||
|
@ -171,15 +194,6 @@ class Controller extends Section {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
get canRestoreTicket() {
|
|
||||||
const isDeleted = this.ticket.isDeleted;
|
|
||||||
const now = Date.vnNew();
|
|
||||||
const maxDate = new Date(this.ticket.updated);
|
|
||||||
maxDate.setHours(maxDate.getHours() + 1);
|
|
||||||
|
|
||||||
return isDeleted && (now <= maxDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
restoreTicket() {
|
restoreTicket() {
|
||||||
return this.$http.post(`Tickets/${this.id}/restore`)
|
return this.$http.post(`Tickets/${this.id}/restore`)
|
||||||
.then(() => this.reload())
|
.then(() => this.reload())
|
||||||
|
|
|
@ -40,29 +40,6 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
|
||||||
controller.ticket = ticket;
|
controller.ticket = ticket;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe('canRestoreTicket() getter', () => {
|
|
||||||
it('should return true for a ticket deleted within the last hour', () => {
|
|
||||||
controller.ticket.isDeleted = true;
|
|
||||||
controller.ticket.updated = Date.vnNew();
|
|
||||||
|
|
||||||
const result = controller.canRestoreTicket;
|
|
||||||
|
|
||||||
expect(result).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return false for a ticket deleted more than one hour ago', () => {
|
|
||||||
const pastHour = Date.vnNew();
|
|
||||||
pastHour.setHours(pastHour.getHours() - 2);
|
|
||||||
|
|
||||||
controller.ticket.isDeleted = true;
|
|
||||||
controller.ticket.updated = pastHour;
|
|
||||||
|
|
||||||
const result = controller.canRestoreTicket;
|
|
||||||
|
|
||||||
expect(result).toBeFalsy();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('addTurn()', () => {
|
describe('addTurn()', () => {
|
||||||
it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
|
it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
|
||||||
controller.$.addTurn = {hide: () => {}};
|
controller.$.addTurn = {hide: () => {}};
|
||||||
|
@ -105,20 +82,6 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('restoreTicket()', () => {
|
|
||||||
it('should make a query to restore the ticket and call vnApp.showSuccess()', () => {
|
|
||||||
jest.spyOn(controller, 'reload').mockReturnThis();
|
|
||||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
|
||||||
|
|
||||||
$httpBackend.expectPOST(`Tickets/${ticket.id}/restore`).respond();
|
|
||||||
controller.restoreTicket();
|
|
||||||
$httpBackend.flush();
|
|
||||||
|
|
||||||
expect(controller.reload).toHaveBeenCalled();
|
|
||||||
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('showPdfDeliveryNote()', () => {
|
describe('showPdfDeliveryNote()', () => {
|
||||||
it('should open a new window showing a delivery note PDF document', () => {
|
it('should open a new window showing a delivery note PDF document', () => {
|
||||||
jest.spyOn(window, 'open').mockReturnThis();
|
jest.spyOn(window, 'open').mockReturnThis();
|
||||||
|
|
|
@ -14,7 +14,8 @@ Refund all...: Abonar todo...
|
||||||
with warehouse: con almacén
|
with warehouse: con almacén
|
||||||
without warehouse: sin almacén
|
without warehouse: sin almacén
|
||||||
Invoice sent: Factura enviada
|
Invoice sent: Factura enviada
|
||||||
The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
|
The following refund ticket have been created: "Se ha creado el siguiente ticket de abono: {{ticketId}}"
|
||||||
|
The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketId}}"
|
||||||
Transfer client: Transferir cliente
|
Transfer client: Transferir cliente
|
||||||
Send SMS...: Enviar SMS...
|
Send SMS...: Enviar SMS...
|
||||||
Notify changes: Notificar cambios
|
Notify changes: Notificar cambios
|
||||||
|
|
|
@ -62,6 +62,11 @@
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
"model": "Worker",
|
"model": "Worker",
|
||||||
"foreignKey": "workerFk"
|
"foreignKey": "workerFk"
|
||||||
|
},
|
||||||
|
"workerActivity": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "Worker",
|
||||||
|
"foreignKey": "workerActivityTypeFk"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-back",
|
"name": "salix-back",
|
||||||
"version": "24.12.0",
|
"version": "24.14.0",
|
||||||
"author": "Verdnatura Levante SL",
|
"author": "Verdnatura Levante SL",
|
||||||
"description": "Salix backend",
|
"description": "Salix backend",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
|
|
Loading…
Reference in New Issue