diff --git a/back/methods/chat/sendQueued.js b/back/methods/chat/sendQueued.js
index cf80817e5..ab94a1746 100644
--- a/back/methods/chat/sendQueued.js
+++ b/back/methods/chat/sendQueued.js
@@ -33,14 +33,14 @@ module.exports = Self => {
await Self.sendCheckingUserStatus(chat);
await updateChat(chat, sentStatus);
} catch (error) {
- await updateChat(chat, errorStatus);
+ await updateChat(chat, errorStatus, error);
}
} else {
try {
await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
await updateChat(chat, sentStatus);
} catch (error) {
- await updateChat(chat, errorStatus);
+ await updateChat(chat, errorStatus, error);
}
}
}
@@ -75,7 +75,7 @@ module.exports = Self => {
const channelName = department && department.chatName;
if (channelName)
- return Self.sendMessage(chat.senderFk, `#${channelName}`, `@${recipient.name} ➔ ${message}`);
+ return Self.sendMessage(chat.senderFk, `#${channelName}`, `@${recipient.name} ➔ ${chat.message}`);
else
return Self.sendMessage(chat.senderFk, `@${recipient.name}`, chat.message);
} else
@@ -127,12 +127,14 @@ module.exports = Self => {
*
* @param {object} chat - The chat
* @param {string} status - The new status
+ * @param {string} error - The error
* @return {Promise} - The request promise
*/
- async function updateChat(chat, status) {
+ async function updateChat(chat, status, error) {
return chat.updateAttributes({
status: status,
- attempts: ++chat.attempts
+ attempts: ++chat.attempts,
+ error: error
});
}
diff --git a/back/methods/edi/updateData.js b/back/methods/edi/updateData.js
index 3dae2d47d..86a9e1f31 100644
--- a/back/methods/edi/updateData.js
+++ b/back/methods/edi/updateData.js
@@ -20,83 +20,93 @@ module.exports = Self => {
const models = Self.app.models;
// Get files checksum
- const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig');
+ const tx = await Self.beginTransaction({});
- const updatableFiles = [];
- for (const file of files) {
- const fileChecksum = await getChecksum(file);
+ try {
+ const options = {transaction: tx};
+ const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
- if (file.checksum != fileChecksum) {
- updatableFiles.push({
- name: file.name,
- checksum: fileChecksum
- });
- } else
- console.debug(`File already updated, skipping...`);
- }
+ const updatableFiles = [];
+ for (const file of files) {
+ const fileChecksum = await getChecksum(file);
- if (updatableFiles.length === 0)
- return false;
-
- // Download files
- const container = await models.TempContainer.container('edi');
- const tempPath = path.join(container.client.root, container.name);
-
- let remoteFile;
- let tempDir;
- let tempFile;
-
- const fileNames = updatableFiles.map(file => file.name);
-
- const tables = await Self.rawSql(`
- SELECT fileName, toTable, file
- FROM edi.tableConfig
- WHERE file IN (?)`, [fileNames]);
-
- for (const table of tables) {
- const fileName = table.file;
-
- console.debug(`Downloading file ${fileName}...`);
-
- remoteFile = `codes/${fileName}.ZIP`;
- tempDir = `${tempPath}/${fileName}`;
- tempFile = `${tempPath}/${fileName}.zip`;
-
- try {
- await fs.readFile(tempFile);
- } catch (error) {
- if (error.code === 'ENOENT') {
- const downloadOutput = await downloadFile(remoteFile, tempFile);
- if (downloadOutput.error)
- continue;
- }
+ if (file.checksum != fileChecksum) {
+ updatableFiles.push({
+ name: file.name,
+ checksum: fileChecksum
+ });
+ } else
+ console.debug(`File already updated, skipping...`);
}
- console.debug(`Extracting file ${fileName}...`);
- await extractFile(tempFile, tempDir);
+ if (updatableFiles.length === 0)
+ return false;
- console.debug(`Updating table ${table.toTable}...`);
- await dumpData(tempDir, table);
- }
+ // Download files
+ const container = await models.TempContainer.container('edi');
+ const tempPath = path.join(container.client.root, container.name);
- // Update files checksum
- for (const file of updatableFiles) {
- await Self.rawSql(`
- UPDATE edi.fileConfig
- SET checksum = ?
- WHERE name = ?`,
- [file.checksum, file.name]);
- }
+ let remoteFile;
+ let tempDir;
+ let tempFile;
- // Clean files
- try {
- await fs.remove(tempPath);
+ const fileNames = updatableFiles.map(file => file.name);
+
+ const tables = await Self.rawSql(`
+ SELECT fileName, toTable, file
+ FROM edi.tableConfig
+ WHERE file IN (?)`, [fileNames], options);
+
+ for (const table of tables) {
+ const fileName = table.file;
+
+ remoteFile = `codes/${fileName}.ZIP`;
+ tempDir = `${tempPath}/${fileName}`;
+ tempFile = `${tempPath}/${fileName}.zip`;
+
+ try {
+ await fs.readFile(tempFile);
+ } catch (error) {
+ if (error.code === 'ENOENT') {
+ console.debug(`Downloading file ${fileName}...`);
+ const downloadOutput = await downloadFile(remoteFile, tempFile);
+ if (downloadOutput.error)
+ continue;
+ }
+ }
+
+ await extractFile(fileName, tempFile, tempDir);
+
+ console.debug(`Updating table ${table.toTable}...`);
+ await dumpData(tempDir, table, options);
+ }
+
+ // Update files checksum
+ for (const file of updatableFiles) {
+ console.log(`Updating file ${file.name} checksum...`);
+ await Self.rawSql(`
+ UPDATE edi.fileConfig
+ SET checksum = ?
+ WHERE name = ?`,
+ [file.checksum, file.name], options);
+ }
+
+ await tx.commit();
+
+ // Clean files
+ try {
+ console.debug(`Cleaning files...`);
+ await fs.remove(tempPath);
+ } catch (error) {
+ if (error.code !== 'ENOENT')
+ throw e;
+ }
+
+ return true;
} catch (error) {
- if (error.code !== 'ENOENT')
- throw e;
+ await tx.rollback();
+ throw error;
}
-
- return true;
};
let ftpClient;
@@ -126,9 +136,9 @@ module.exports = Self => {
const response = await new Promise((resolve, reject) => {
ftpClient.exec((err, response) => {
- if (response.error) {
+ if (err || response.error) {
console.debug(`Error downloading checksum file... ${response.error}`);
- reject(err);
+ return reject(err);
}
resolve(response);
@@ -159,9 +169,9 @@ module.exports = Self => {
return new Promise((resolve, reject) => {
ftpClient.exec((err, response) => {
- if (response.error) {
+ if (err || response.error) {
console.debug(`Error downloading file... ${response.error}`);
- reject(err);
+ return reject(err);
}
resolve(response);
@@ -169,11 +179,12 @@ module.exports = Self => {
});
}
- async function extractFile(tempFile, tempDir) {
+ async function extractFile(fileName, tempFile, tempDir) {
const JSZip = require('jszip');
try {
await fs.mkdir(tempDir);
+ console.debug(`Extracting file ${fileName}...`);
} catch (error) {
if (error.code !== 'EEXIST')
throw e;
@@ -196,66 +207,32 @@ module.exports = Self => {
}
}
- async function dumpData(tempDir, table) {
+ async function dumpData(tempDir, table, options) {
const toTable = table.toTable;
const baseName = table.fileName;
- const firstEntry = entries[0];
- const entryName = firstEntry.entryName;
- const startIndex = (entryName.length - 10);
- const endIndex = (entryName.length - 4);
- const dateString = entryName.substring(startIndex, endIndex);
+ console.log(`Emptying table ${toTable}...`);
+ const tableName = `edi.${toTable}`;
+ await Self.rawSql(`DELETE FROM ??`, [tableName]);
- const lastUpdated = new Date();
+ const dirFiles = await fs.readdir(tempDir);
+ const files = dirFiles.filter(file => file.startsWith(baseName));
- let updated = null;
- if (file.updated) {
- updated = new Date(file.updated);
- updated.setHours(0, 0, 0, 0);
- }
+ for (const file of files) {
+ console.log(`Dumping data from file ${file}...`);
- // Format string date to a date object
- lastUpdated.setFullYear(`20${dateString.substring(4, 6)}`);
- lastUpdated.setMonth(parseInt(dateString.substring(2, 4)) - 1);
- lastUpdated.setDate(dateString.substring(0, 2));
- lastUpdated.setHours(0, 0, 0, 0);
+ const templatePath = path.join(__dirname, `./sql/${toTable}.sql`);
+ const sqlTemplate = await fs.readFile(templatePath, 'utf8');
+ const filePath = path.join(tempDir, file);
- if (updated && lastUpdated <= updated) {
- console.debug(`Table ${toTable} already updated, skipping...`);
- return;
- }
-
- const tx = await Self.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const tableName = `edi.${toTable}`;
- await Self.rawSql(`DELETE FROM ??`, [tableName], options);
-
- const dirFiles = await fs.readdir(tempDir);
- const files = dirFiles.filter(file => file.startsWith(baseName));
-
- for (const file of files) {
- console.log(`Dumping data from file ${file}...`);
-
- const templatePath = path.join(__dirname, `./sql/${toTable}.sql`);
- const sqlTemplate = await fs.readFile(templatePath, 'utf8');
- const filePath = path.join(tempDir, file);
-
- await Self.rawSql(sqlTemplate, [filePath], options);
- await Self.rawSql(`
+ await Self.rawSql(sqlTemplate, [filePath], options);
+ await Self.rawSql(`
UPDATE edi.tableConfig
SET updated = ?
WHERE fileName = ?
`, [new Date(), baseName], options);
- }
-
- tx.commit();
- } catch (error) {
- tx.rollback();
- throw error;
}
+
console.log(`Updated table ${toTable}\n`);
}
};
diff --git a/back/models/chat.json b/back/models/chat.json
index 8fc3a6304..0d6328544 100644
--- a/back/models/chat.json
+++ b/back/models/chat.json
@@ -32,6 +32,9 @@
},
"attempts": {
"type": "number"
+ },
+ "error": {
+ "type": "string"
}
},
"acls": [{
diff --git a/back/nodemonConfig.json b/back/nodemonConfig.json
index a1c9ca84f..5138bc30e 100644
--- a/back/nodemonConfig.json
+++ b/back/nodemonConfig.json
@@ -18,6 +18,7 @@
"modules/supplier/front/**/*",
"modules/ticket/front/**/*",
"modules/travel/front/**/*",
+ "modules/shelving/front/**/*",
"modules/worker/front/**/*",
"modules/zone/front/**/*"
]
diff --git a/db/changes/10411-january/00-acl.sql b/db/changes/10411-january/00-acl.sql
deleted file mode 100644
index fad50d15d..000000000
--- a/db/changes/10411-january/00-acl.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
- VALUES('InvoiceInDueDay', '*', '*', 'ALLOW', 'ROLE', 'administrative');
\ No newline at end of file
diff --git a/db/changes/10411-january/00-booking.sql b/db/changes/10411-january/00-booking.sql
deleted file mode 100644
index b89234139..000000000
--- a/db/changes/10411-january/00-booking.sql
+++ /dev/null
@@ -1,248 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.invoiceInBookingMain;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`invoiceInBookingMain`(vInvoiceInId INT)
-BEGIN
- DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
- DECLARE vBookNumber,vSerialNumber INT;
- DECLARE vRate DECIMAL(10,4);
-
- CALL invoiceInBookingCommon(vInvoiceInId,vSerialNumber);
-
- SELECT SUM(iit.taxableBase * IF( i.serial= 'R' AND ti.Iva <> 'HP DEVENGADO 21 ISP', 1 +(ti.PorcentajeIva/100),1)),
- SUM(iit.foreignValue * IF( i.serial= 'R', 1 + (ti.PorcentajeIva/100),1)),
- iit.taxableBase/iit.foreignValue
- INTO vTotalAmount, vTotalAmountDivisa, vRate
- FROM newInvoiceIn i
- JOIN invoiceInTax iit ON iit.invoiceInFk = i.id
- LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk;
-
- CALL vn.ledger_next(vBookNumber);
-
- -- Apunte del proveedor
-
- INSERT INTO XDiario(ASIEN,
- FECHA,
- SUBCTA,
- EUROHABER,
- CONCEPTO,
- CAMBIO,
- HABERME,
- NFACTICK,
- CLAVE,
- empresa_id
- )
- SELECT
- vBookNumber,
- n.bookEntried,
- s.supplierAccount,
- vTotalAmount EUROHABER,
- n.conceptWithSupplier,
- vRate,
- vTotalAmountDivisa,
- n.invoicesCount,
- vInvoiceInId,
- n.companyFk
- FROM newInvoiceIn n
- JOIN newSupplier s;
-
- -- Línea de Gastos
- INSERT INTO XDiario ( ASIEN,
- FECHA,
- SUBCTA,
- CONTRA,
- EURODEBE,
- EUROHABER,
- CONCEPTO,
- CAMBIO,
- DEBEME,
- HABERME,
- NFACTICK,
- empresa_id
- )
- SELECT vBookNumber ASIEN,
- n.bookEntried FECHA,
- IF(e.isWithheld , LPAD(RIGHT(s.supplierAccount,5),10,iit.expenceFk),iit.expenceFk) SUBCTA,
- s.supplierAccount CONTRA,
- IF(e.isWithheld AND iit.taxableBase < 0, NULL, ROUND(SUM(iit.taxableBase),2)) EURODEBE,
- IF(e.isWithheld AND iit.taxableBase < 0,ROUND(SUM(-iit.taxableBase),2),NULL) EUROHABER,
- n.conceptWithSupplier CONCEPTO,
- vRate,
- IF(e.isWithheld,NULL,ABS(ROUND(SUM(iit.foreignValue),2))) DEBEME,
- IF(e.isWithheld,ABS(ROUND(SUM(iit.foreignValue),2)),NULL) HABERME,
- n.invoicesCount NFACTICK,
- n.companyFk empresa_id
- FROM newInvoiceIn n
- JOIN newSupplier s
- JOIN invoiceInTax iit ON iit.invoiceInFk = n.id
- JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = iit.expenceFk
- WHERE e.name != 'Suplidos Transitarios nacionales'
- GROUP BY iit.expenceFk;
-
- -- Líneas de IVA
-
- INSERT INTO XDiario( ASIEN,
- FECHA,
- SUBCTA,
- CONTRA,
- EURODEBE,
- BASEEURO,
- CONCEPTO,
- FACTURA,
- IVA,
- AUXILIAR,
- SERIE,
- TIPOOPE,
- FECHA_EX,
- FECHA_OP,
- NFACTICK,
- FACTURAEX,
- L340,
- LRECT349,
- TIPOCLAVE,
- TIPOEXENCI,
- TIPONOSUJE,
- TIPOFACT,
- TIPORECTIF,
- TERIDNIF,
- TERNIF,
- TERNOM,
- FECREGCON,
- empresa_id
- )
- SELECT vBookNumber ASIEN,
- n.bookEntried FECHA,
- IF(n.expenceFkDeductible>0, n.expenceFkDeductible, ti.CuentaIvaSoportado) SUBCTA,
- s.supplierAccount CONTRA,
- SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100 /* + 0.0001*/ , 2)) EURODEBE,
- SUM(it.taxableBase) BASEEURO,
- GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
- vSerialNumber FACTURA,
- ti.PorcentajeIva IVA,
- IF(isUeeMember AND eWithheld.id IS NULL,'','*') AUXILIAR,
- n.serial SERIE,
- ttr.ClaveOperacionDefecto,
- n.issued FECHA_EX,
- n.operated FECHA_OP,
- n.invoicesCount NFACTICK,
- n.supplierRef FACTURAEX,
- TRUE L340,
- (isSameCountry OR NOT isUeeMember) LRECT349,
- n.cplusTrascendency472Fk TIPOCLAVE,
- n.cplusTaxBreakFk TIPOEXENCI,
- n.cplusSubjectOpFk TIPONOSUJE,
- n.cplusInvoiceType472Fk TIPOFACT,
- n.cplusRectificationTypeFk TIPORECTIF,
- iis.cplusTerIdNifFk TERIDNIF,
- s.nif AS TERNIF,
- s.name AS TERNOM,
- n.booked FECREGCON,
- n.companyFk
- FROM newInvoiceIn n
- JOIN newSupplier s
- JOIN invoiceInTax it ON n.id = it.invoiceInFk
- JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
- JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
- JOIN invoiceInSerial iis ON iis.code = n.serial
- JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
- LEFT JOIN (
- SELECT eWithheld.id
- FROM invoiceInTax hold
- JOIN expence eWithheld ON eWithheld.id = hold.expenceFk AND eWithheld.isWithheld
- WHERE hold.invoiceInFk = vInvoiceInId LIMIT 1
- ) eWithheld ON TRUE
- WHERE it.taxTypeSageFk IS NOT NULL
- AND it.taxTypeSageFk NOT IN (22, 90)
- GROUP BY ti.PorcentajeIva, e.id;
-
- -- Línea iva inversor sujeto pasivo
-
- INSERT INTO XDiario( ASIEN,
- FECHA,
- SUBCTA,
- CONTRA,
- EUROHABER,
- BASEEURO,
- CONCEPTO,
- FACTURA,
- IVA,
- AUXILIAR,
- SERIE,
- TIPOOPE,
- FECHA_EX,
- FECHA_OP,
- NFACTICK,
- FACTURAEX,
- L340,
- LRECT349,
- TIPOCLAVE,
- TIPOEXENCI,
- TIPONOSUJE,
- TIPOFACT,
- TIPORECTIF,
- TERIDNIF,
- TERNIF,
- TERNOM,
- empresa_id
- )
- SELECT vBookNumber ASIEN,
- n.bookEntried FECHA,
- ti.CuentaIvaRepercutido SUBCTA,
- s.supplierAccount CONTRA,
- SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100,2)) EUROHABER,
- ROUND(SUM(it.taxableBase),2) BASEEURO,
- GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
- vSerialNumber FACTURA,
- ti.PorcentajeIva IVA,
- '*' AUXILIAR,
- n.serial SERIE,
- ttr.ClaveOperacionDefecto,
- n.issued FECHA_EX,
- n.operated FECHA_OP,
- n.invoicesCount NFACTICK,
- n.supplierRef FACTURAEX,
- FALSE L340,
- (isSameCountry OR NOT isUeeMember) LRECT349,
- 1 TIPOCLAVE,
- n.cplusTaxBreakFk TIPOEXENCI,
- n.cplusSubjectOpFk TIPONOSUJE,
- n.cplusInvoiceType472Fk TIPOFACT,
- n.cplusRectificationTypeFk TIPORECTIF,
- iis.cplusTerIdNifFk TERIDNIF,
- s.nif AS TERNIF,
- s.name AS TERNOM,
- n.companyFk
- FROM newInvoiceIn n
- JOIN newSupplier s
- JOIN invoiceInTax it ON n.id = it.invoiceInFk
- JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
- JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
- JOIN invoiceInSerial iis ON iis.code = n.serial
- JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
- WHERE ti.Iva = 'HP DEVENGADO 21 ISP' OR MID(s.account, 4, 1) = '1'
- GROUP BY ti.PorcentajeIva, e.id;
-
- -- Actualización del registro original
- UPDATE invoiceIn ii
- JOIN newInvoiceIn ni ON ii.id = ni.id
- SET ii.serialNumber = vSerialNumber,
- ii.isBooked = TRUE;
-
- -- Problemas derivados de la precisión en los decimales al calcular los impuestos
- UPDATE XDiario
- SET EURODEBE = EURODEBE -
- (SELECT IF(ABS(sub.difference) = 0.01, sub.difference, 0)
- FROM(
- SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference
- FROM XDiario
- WHERE ASIEN = vBookNumber
- )sub
- )
- WHERE ASIEN = vBookNumber
- AND EURODEBE <> 0
- ORDER BY id DESC
- LIMIT 1;
-
-END$$
-DELIMITER ;
diff --git a/db/changes/10411-january/00-companyGroup.sql b/db/changes/10411-january/00-companyGroup.sql
deleted file mode 100644
index 2c5477e63..000000000
--- a/db/changes/10411-january/00-companyGroup.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-UPDATE `vn`.`companyGroup`
- SET `code`='verdnatura'
- WHERE `id`=1;
-UPDATE `vn`.`companyGroup`
- SET `code`='ornamental'
- WHERE `id`=2;
-UPDATE `vn`.`companyGroup`
- SET `code`='other'
- WHERE `id`=3;
-UPDATE `vn`.`companyGroup`
- SET `code`='provisional'
- WHERE `id`=4;
diff --git a/db/changes/10411-january/00-saleVolume.sql b/db/changes/10411-january/00-saleVolume.sql
deleted file mode 100644
index e8a5e3433..000000000
--- a/db/changes/10411-january/00-saleVolume.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-USE vn;
-DELIMITER $$
-$$
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `vn`.`saleVolume` AS
-select
- `s`.`ticketFk` AS `ticketFk`,
- `s`.`id` AS `saleFk`,
- round(`ic`.`cm3delivery` * `s`.`quantity` / 1000, 0) AS `litros`,
- `t`.`routeFk` AS `routeFk`,
- `t`.`shipped` AS `shipped`,
- `t`.`landed` AS `landed`,
- `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `volume`,
- `s`.`quantity` * `ic`.`grams` / 1000 AS `physicalWeight`,
- `s`.`quantity` * `ic`.`cm3delivery` * greatest(`i`.`density`, 167) / 1000000 AS `weight`,
- `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `physicalVolume`,
- `s`.`quantity` * `ic`.`cm3delivery` * ifnull(`t`.`zonePrice`, `z`.`price`) / (`vc`.`standardFlowerBox` * 1000) AS `freight`,
- `t`.`zoneFk` AS `zoneFk`,
- `t`.`clientFk` AS `clientFk`,
- `s`.`isPicked` AS `isPicked`,
- `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 AS `eurosValue`,
- `i`.`itemPackingTypeFk` AS `itemPackingTypeFk`
-from
- (((((`sale` `s`
-join `item` `i` on
- (`i`.`id` = `s`.`itemFk`))
-join `ticket` `t` on
- (`t`.`id` = `s`.`ticketFk`))
-join `zone` `z` on
- (`z`.`id` = `t`.`zoneFk`))
-join `volumeConfig` `vc`)
-join `itemCost` `ic` on
- (`ic`.`itemFk` = `s`.`itemFk`
- and `ic`.`warehouseFk` = `t`.`warehouseFk`))
-where
- `s`.`quantity` > 0;
-$$
-DELIMITER ;
diff --git a/db/changes/10411-january/00-workerLabour.sql b/db/changes/10411-january/00-workerLabour.sql
deleted file mode 100644
index 8630eee22..000000000
--- a/db/changes/10411-january/00-workerLabour.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-ALTER TABLE `postgresql`.`business` ADD payedHolidays INT NULL;
-ALTER TABLE `postgresql`.`business` CHANGE payedHolidays payedHolidays INT NULL AFTER reasonEndFk;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `vn`.`workerLabour` AS
-select
-`b`.`business_id` AS `businessFk`,
-`p`.`id_trabajador` AS `workerFk`,
-`bl`.`workcenter_id` AS `workCenterFk`,
-`b`.`date_start` AS `started`,
-`b`.`date_end` AS `ended`,
-`d`.`id` AS `departmentFk`,
-`b`.`payedHolidays` AS `payedHolidays`
-from
-((((`postgresql`.`person` `p`
-join `postgresql`.`profile` `pr` on
-((`pr`.`person_id` = `p`.`person_id`)))
-join `postgresql`.`business` `b` on
-((`b`.`client_id` = `pr`.`profile_id`)))
-join `postgresql`.`business_labour` `bl` on
-((`b`.`business_id` = `bl`.`business_id`)))
-join `vn`.`department` `d` on
-((`d`.`id` = `bl`.`department_id`)))
-order by
-`b`.`date_start` desc
\ No newline at end of file
diff --git a/db/changes/10420-valentines/00-ImportTicketAcl.sql b/db/changes/10420-valentines/00-ImportTicketAcl.sql
deleted file mode 100644
index df61fd5b8..000000000
--- a/db/changes/10420-valentines/00-ImportTicketAcl.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `salix`.`ACL`
-WHERE model = 'ClaimEnd' AND property = 'importTicketSales';
diff --git a/db/changes/10420-valentines/00-aclCollection.sql b/db/changes/10420-valentines/00-aclCollection.sql
deleted file mode 100644
index 57774ba29..000000000
--- a/db/changes/10420-valentines/00-aclCollection.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL`
-(model, property, accessType, permission, principalType, principalId)
-VALUES('Collection', 'setSaleQuantity', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10420-valentines/00-aclDocuware.sql b/db/changes/10420-valentines/00-aclDocuware.sql
deleted file mode 100644
index c2d47d4ea..000000000
--- a/db/changes/10420-valentines/00-aclDocuware.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL`
-(model, property, accessType, permission, principalType, principalId)
-VALUES('Docuware', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10420-valentines/00-defaultViewConfig.sql b/db/changes/10420-valentines/00-defaultViewConfig.sql
deleted file mode 100644
index e0d75e9d4..000000000
--- a/db/changes/10420-valentines/00-defaultViewConfig.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `salix`.`defaultViewConfig`
- SET `columns`='{"intrastat":false,"stemMultiplier":false,"landed":false,"producer":false}'
- WHERE tableCode ='itemsIndex';
diff --git a/db/changes/10420-valentines/00-docuware.sql b/db/changes/10420-valentines/00-docuware.sql
deleted file mode 100644
index 7cabd135f..000000000
--- a/db/changes/10420-valentines/00-docuware.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE `vn`.`docuware` (
- `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
- `code` varchar(50) NULL,
- `fileCabinetName` varchar(50) NULL,
- `dialogName` varchar(255) DEFAULT NULL,
- `find` varchar(50) DEFAULT NULL
-);
-
-INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `dialogName` , `find`)
- VALUES
- ('deliveryClient', 'Albaranes cliente', 'findTicket', 'N__ALBAR_N');
\ No newline at end of file
diff --git a/db/changes/10420-valentines/00-docuwareConfig.sql b/db/changes/10420-valentines/00-docuwareConfig.sql
deleted file mode 100644
index 1ba19af6d..000000000
--- a/db/changes/10420-valentines/00-docuwareConfig.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE `vn`.`docuwareConfig` (
- `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
- `url` varchar(75) NULL,
- `token` varchar(1000) DEFAULT NULL
-);
-
-INSERT INTO `vn`.`docuwareConfig` (`url`)
- VALUES
- ('https://verdnatura.docuware.cloud/docuware/platform');
\ No newline at end of file
diff --git a/db/changes/10420-valentines/00-state.sql b/db/changes/10420-valentines/00-state.sql
deleted file mode 100644
index 590be6964..000000000
--- a/db/changes/10420-valentines/00-state.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-ALTER TABLE `vn`.`state` ADD classColor varchar(12) NULL;
-
-UPDATE `vn`.`state` s
- SET s.classColor = 'warning'
- WHERE s.alertLevel = 1;
-
-UPDATE `vn`.`state` s
- SET s.classColor = 'alert'
- WHERE s.alertLevel = 0;
-
-UPDATE `vn`.`state` s
- SET s.classColor = 'success'
- WHERE s.code LIKE 'OK';
-
-UPDATE `vn`.`state` s
- SET s.classColor = 'notice'
- WHERE s.code LIKE 'FREE';
-
-UPDATE `vn`.`state` s
- SET s.classColor = 'success'
- WHERE s.order >= 4
- AND (s.alertLevel = 0 OR s.alertLevel = 1);
-
-UPDATE `vn`.`state` s
- SET s.classColor = 'warning'
- WHERE s.code IN ('PREVIOUS_PREPARATION', 'PREPARED', 'ON_PREPARATION', 'ON_CHECKING', 'CHECKED');
diff --git a/db/changes/10420-valentines/00-ticket_getMovable.sql b/db/changes/10420-valentines/00-ticket_getMovable.sql
deleted file mode 100644
index eb5c722c4..000000000
--- a/db/changes/10420-valentines/00-ticket_getMovable.sql
+++ /dev/null
@@ -1,46 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_getMovable`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
-BEGIN
-/**
- * Cálcula el stock movible para los artículos de un ticket
- * vDatedNew debe ser menor que vDatedOld, en los otros casos se
- * asume que siempre es posible
- *
- * @param vTicketFk -> Ticket
- * @param vDatedNew -> Nueva fecha
- * @return Sales con Movible
-*/
- DECLARE vDatedOld DATETIME;
- SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
-
- SELECT t.shipped INTO vDatedOld
- FROM ticket t
- WHERE t.id = vTicketFk;
-
- CALL itemStock(vWarehouseFk, vDatedNew, NULL);
- CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
-
- SELECT s.id,
- s.itemFk,
- s.quantity,
- s.concept,
- s.price,
- s.reserved,
- s.discount,
- i.image,
- i.subName,
- il.stock + IFNULL(im.amount, 0) AS movable
- FROM ticket t
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
- LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
- WHERE t.id = vTicketFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
- DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
-END$$
-DELIMITER ;
diff --git a/db/changes/10430-ash/00-aclAgencyTerm.sql b/db/changes/10430-ash/00-aclAgencyTerm.sql
deleted file mode 100644
index c43965ed0..000000000
--- a/db/changes/10430-ash/00-aclAgencyTerm.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,principalId)
- VALUES ('AgencyTerm','*','*','administrative');
diff --git a/db/changes/10430-ash/00-aclClaimLog.sql b/db/changes/10430-ash/00-aclClaimLog.sql
deleted file mode 100644
index cad88a6ab..000000000
--- a/db/changes/10430-ash/00-aclClaimLog.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
- VALUES
- ('ClaimLog', '*', 'READ', 'ALLOW', 'ROLE', 'claimManager');
diff --git a/db/changes/10430-ash/00-deliveryBoss.sql b/db/changes/10430-ash/00-deliveryBoss.sql
deleted file mode 100644
index ac07bfa31..000000000
--- a/db/changes/10430-ash/00-deliveryBoss.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `account`.`user` SET `role` = 57 WHERE id IN (2294, 4365, 7294);
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-ACL.sql b/db/changes/10440-fallas/00-ACL.sql
deleted file mode 100644
index 051a851f7..000000000
--- a/db/changes/10440-fallas/00-ACL.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-VALUES ('Edi', 'updateData', 'WRITE', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/changes/10440-fallas/00-aclAgency.sql b/db/changes/10440-fallas/00-aclAgency.sql
deleted file mode 100644
index 9e5bb6382..000000000
--- a/db/changes/10440-fallas/00-aclAgency.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES(304, 'Agency', '*', '*', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/changes/10440-fallas/00-aclEducationLevel.sql b/db/changes/10440-fallas/00-aclEducationLevel.sql
deleted file mode 100644
index 26bf9d16f..000000000
--- a/db/changes/10440-fallas/00-aclEducationLevel.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES('EducationLevel', '*', '*', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/changes/10440-fallas/00-aclIntrastat.sql b/db/changes/10440-fallas/00-aclIntrastat.sql
deleted file mode 100644
index 16410814d..000000000
--- a/db/changes/10440-fallas/00-aclIntrastat.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL`
-(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('InvoiceInIntrastat', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-aclSupplierAgencyTerms.sql b/db/changes/10440-fallas/00-aclSupplierAgencyTerms.sql
deleted file mode 100644
index fa57c1d64..000000000
--- a/db/changes/10440-fallas/00-aclSupplierAgencyTerms.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES
- ('SupplierAgencyTerm', '*', '*', 'ALLOW', 'ROLE', 'administrative');
diff --git a/db/changes/10440-fallas/00-agencyTermConfig.sql b/db/changes/10440-fallas/00-agencyTermConfig.sql
deleted file mode 100644
index 9822b160b..000000000
--- a/db/changes/10440-fallas/00-agencyTermConfig.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE `vn`.`agencyTermConfig` (
- `expenceFk` varchar(10) DEFAULT NULL,
- `vatAccountSupported` varchar(15) DEFAULT NULL,
- `vatPercentage` decimal(28,10) DEFAULT NULL,
- `transaction` varchar(50) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-INSERT INTO `vn`.`agencyTermConfig`
-(`expenceFk`, `vatAccountSupported`, `vatPercentage`, `transaction`)
-VALUES('6240000000', '4721000015', 21.0000000000, 'Adquisiciones intracomunitarias de servicios');
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-claimConfig.sql b/db/changes/10440-fallas/00-claimConfig.sql
deleted file mode 100644
index 905dea484..000000000
--- a/db/changes/10440-fallas/00-claimConfig.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE `vn`.`claimConfig` (
- `id` int(11) NOT NULL,
- `pickupContact` varchar(250),
- PRIMARY KEY (`id`)
-);
-
-INSERT INTO vn.claimConfig (id, pickupContact)
- VALUES(1, 'Email: cmorenoa@logista.com Telf: 961594250 Extensión: 206');
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-claimState.sql b/db/changes/10440-fallas/00-claimState.sql
deleted file mode 100644
index 329a9b977..000000000
--- a/db/changes/10440-fallas/00-claimState.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`claimState` ADD `hasToNotify` TINYINT DEFAULT 0 NULL;
-UPDATE `vn`.`claimState` SET `hasToNotify` = 1 WHERE `code` IN ('canceled', 'incomplete');
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-claim_packages.sql b/db/changes/10440-fallas/00-claim_packages.sql
deleted file mode 100644
index 3d82eb7b6..000000000
--- a/db/changes/10440-fallas/00-claim_packages.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `vn`.`claim` ADD packages smallint(10) unsigned DEFAULT 0 NULL COMMENT 'packages received by the client';
diff --git a/db/changes/10440-fallas/00-component.sql b/db/changes/10440-fallas/00-component.sql
deleted file mode 100644
index 8d2dd6517..000000000
--- a/db/changes/10440-fallas/00-component.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`component` (`name`,`typeFk`,`classRate`,`isRenewable`,`code`,`isRequired`)
- VALUES ('maná reclamacion',7,4,0,'manaClaim',0);
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-country.sql b/db/changes/10440-fallas/00-country.sql
deleted file mode 100644
index 6cc4ce1f9..000000000
--- a/db/changes/10440-fallas/00-country.sql
+++ /dev/null
@@ -1,90 +0,0 @@
-ALTER TABLE `vn`.`country` ADD `a3Code` INT NULL COMMENT 'Código país para a3';
-
-UPDATE `vn`.`country` c
-JOIN `vn2008`.`payroll_pais` `p` ON `p`.`pais` = `c`.`country`
-SET `c`.`a3Code` = `p`.`codpais`;
-
-UPDATE `vn`.`country`
-SET `a3Code` = 710
-WHERE `country` = 'Sud-Africa'; -- ÁFRICA DEL SUR
-
-UPDATE `vn`.`country`
-SET `a3Code` = 643
-WHERE `country` = 'Rusia'; -- FEDERACIÓN DE RUSIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 28
-WHERE `country` = 'Antigua'; -- ANTIGUA Y BARBUDA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 840
-WHERE `country` = 'USA'; -- ESTADOS UNIDOS
-
-UPDATE `vn`.`country`
-SET `a3Code` = 404
-WHERE `country` = 'Kenya'; -- KENIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 498
-WHERE `country` = 'Moldavia'; -- REPÚBLICA DE MOLDAVIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 826
-WHERE `country` = 'Gran Bretaña'; -- REINO UNIDO
-
-UPDATE `vn`.`country`
-SET `a3Code` = 484
-WHERE `country` = 'Mexico'; -- MÉJICO
-
-UPDATE `vn`.`country`
-SET `a3Code` = 716
-WHERE `country` = 'Zimbawe'; -- ZINBABWE
-
-UPDATE `vn`.`country`
-SET `a3Code` = 203
-WHERE `country` = 'Chequia'; -- REPÚBLICA CHECA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 764
-WHERE `country` = 'Thailandia'; -- TAILANDIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 276
-WHERE `country` = 'Alemania'; -- REPÚBLICA FEDERAL DE ALEMANIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 112
-WHERE `country` = 'Bielorrusia'; -- BELARUS
-
-UPDATE `vn`.`country`
-SET `a3Code` = 528
-WHERE `country` = 'Holanda'; -- PAÍSES BAJOS
-
-UPDATE `vn`.`country`
-SET `a3Code` = 410
-WHERE `country` = 'Corea del Sur'; -- COREA (REPÚBLICA)
-
-UPDATE `vn`.`country`
-SET `a3Code` = 724
-WHERE `country` = 'España exento'; -- ESPAÑA
-
--- Borrar registro USA de country:
-UPDATE `vn`.`supplier` `s`
- SET `s`.`countryFk` = 62
- WHERE `s`.`countryFk` = 12;
-
-UPDATE `vn`.`bankEntity`
- SET `countryFk` = 62
- WHERE `countryFk` = 12;
-
-DELETE FROM `vn`.`country`
- WHERE `id`= 12;
-
-UPDATE `vn2008`.`payroll_pais`
-SET `pais`='COREA NORTE (REPÚBLICA DEM. POPULAR)'
-WHERE `codpais`=408;
-UPDATE `vn2008`.`payroll_pais`
-SET `pais`='COREA SUR (REPÚBLICA) '
-WHERE `codpais`=410;
-
-RENAME TABLE `vn2008`.`payroll_pais` TO `vn2008`.`payroll_pais__`;
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-invoiceInIntrastat.sql b/db/changes/10440-fallas/00-invoiceInIntrastat.sql
deleted file mode 100644
index 8f65fac29..000000000
--- a/db/changes/10440-fallas/00-invoiceInIntrastat.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
- VALUES ('InvoiceInIntrastat','*','*','ALLOW','ROLE','employee');
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-manaCustomerUpdate.sql b/db/changes/10440-fallas/00-manaCustomerUpdate.sql
deleted file mode 100644
index 80838bca2..000000000
--- a/db/changes/10440-fallas/00-manaCustomerUpdate.sql
+++ /dev/null
@@ -1,106 +0,0 @@
-DROP PROCEDURE IF EXISTS `bs`.`manaCustomerUpdate`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaCustomerUpdate`()
-BEGIN
- DECLARE vToDated DATE;
- DECLARE vFromDated DATE;
- DECLARE vForDeleteDated DATE;
- DECLARE vManaId INT;
- DECLARE vManaAutoId INT;
- DECLARE vClaimManaId INT;
- DECLARE vManaBankId INT;
- DECLARE vManaGreugeTypeId INT;
-
- SELECT id INTO vManaId
- FROM `component` WHERE code = 'mana';
-
- SELECT id INTO vManaAutoId
- FROM `component` WHERE code = 'autoMana';
-
- SELECT id INTO vClaimManaId
- FROM `component` WHERE code = 'manaClaim';
-
- SELECT id INTO vManaBankId
- FROM `bank` WHERE code = 'mana';
-
- SELECT id INTO vManaGreugeTypeId
- FROM `greugeType` WHERE code = 'mana';
-
- SELECT IFNULL(max(dated), '2016-01-01')
- INTO vFromDated
- FROM bs.manaCustomer;
-
- DELETE
- FROM bs.manaCustomer
- WHERE dated = vFromDated;
-
- SELECT IFNULL(max(dated), '2016-01-01')
- INTO vFromDated
- FROM bs.manaCustomer;
-
- WHILE timestampadd(DAY,30,vFromDated) < CURDATE() DO
-
- SELECT
- timestampadd(DAY,30,vFromDated),
- timestampadd(DAY,-90,vFromDated)
- INTO
- vToDated,
- vForDeleteDated;
-
- DELETE FROM bs.manaCustomer
- WHERE dated <= vForDeleteDated;
-
-
- INSERT INTO bs.manaCustomer(Id_Cliente, Mana, dated)
-
- SELECT
- Id_Cliente,
- cast(sum(mana) as decimal(10,2)) as mana,
- vToDated as dated
- FROM
-
- (
- SELECT cs.Id_Cliente, Cantidad * Valor as mana
- FROM vn2008.Tickets t
- JOIN vn2008.Consignatarios cs using(Id_Consigna)
- JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
- JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
- WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
- AND t.Fecha > vFromDated
- AND date(t.Fecha) <= vToDated
-
-
- UNION ALL
-
- SELECT r.Id_Cliente, - Entregado
- FROM vn2008.Recibos r
- WHERE Id_Banco = vManaBankId
- AND Fechacobro > vFromDated
- AND Fechacobro <= vToDated
-
- UNION ALL
-
- SELECT g.Id_Cliente, g.Importe
- FROM vn2008.Greuges g
- WHERE Greuges_type_id = vManaGreugeTypeId
- AND Fecha > vFromDated
- AND Fecha <= vToDated
-
- UNION ALL
-
- SELECT Id_Cliente, mana
- FROM bs.manaCustomer
- WHERE dated = vFromDated
- ) sub
-
- GROUP BY Id_Cliente
- HAVING Id_Cliente;
-
- SET vFromDated = vToDated;
-
- END WHILE;
-
-END$$
-DELIMITER ;
diff --git a/db/changes/10440-fallas/00-manaSpellersRequery.sql b/db/changes/10440-fallas/00-manaSpellersRequery.sql
deleted file mode 100644
index 9c1a10c6a..000000000
--- a/db/changes/10440-fallas/00-manaSpellersRequery.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`manaSpellersRequery`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`manaSpellersRequery`(vWorkerFk INTEGER)
-BEGIN
-/**
- * Recalcula el mana consumido por un trabajador
- *
- * @param vWorkerFk Id Trabajador
- */
- DECLARE vWorkerIsExcluded BOOLEAN;
- DECLARE vFromDated DATE;
- DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
- DECLARE vMana INT;
- DECLARE vAutoMana INT;
- DECLARE vClaimMana INT;
- DECLARE vManaBank INT;
- DECLARE vManaGreugeType INT;
-
- SELECT COUNT(*) INTO vWorkerIsExcluded
- FROM workerManaExcluded
- WHERE workerFk = vWorkerFk;
-
- IF NOT vWorkerIsExcluded THEN
- SELECT id INTO vMana
- FROM `component` WHERE code = 'mana';
-
- SELECT id INTO vAutoMana
- FROM `component` WHERE code = 'autoMana';
-
- SELECT id INTO vClaimMana
- FROM `component` WHERE code = 'manaClaim';
-
- SELECT id INTO vManaBank
- FROM `bank` WHERE code = 'mana';
-
- SELECT id INTO vManaGreugeType
- FROM `greugeType` WHERE code = 'mana';
-
- SELECT max(dated) INTO vFromDated
- FROM clientManaCache;
-
- REPLACE workerMana (workerFk, amount)
- SELECT vWorkerFk, sum(mana) FROM
- (
- SELECT s.quantity * sc.value as mana
- FROM ticket t
- JOIN address a ON a.id = t.addressFk
- JOIN client c ON c.id = a.clientFk
- JOIN sale s ON s.ticketFk = t.id
- JOIN saleComponent sc ON sc.saleFk = s.id
- WHERE c.salesPersonFk = vWorkerFk AND sc.componentFk IN (vMana, vAutoMana, vClaimMana)
- AND t.shipped > vFromDated AND t.shipped < vToDated
- UNION ALL
- SELECT - r.amountPaid
- FROM receipt r
- JOIN client c ON c.id = r.clientFk
- WHERE c.salesPersonFk = vWorkerFk AND bankFk = vManaBank
- AND payed > vFromDated
- UNION ALL
- SELECT g.amount
- FROM greuge g
- JOIN client c ON c.id = g.clientFk
- WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
- AND g.shipped > vFromDated and g.shipped < CURDATE()
- UNION ALL
- SELECT cc.mana
- FROM clientManaCache cc
- JOIN client c ON c.id = cc.clientFk
- WHERE c.salesPersonFk = vWorkerFk AND cc.dated = vFromDated
- ) sub;
- END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10440-fallas/00-supplierAgencyTerm.sql b/db/changes/10440-fallas/00-supplierAgencyTerm.sql
deleted file mode 100644
index f8539f607..000000000
--- a/db/changes/10440-fallas/00-supplierAgencyTerm.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-ALTER TABLE `vn`.`agencyTerm` ADD `supplierFk` INT NULL;
-ALTER TABLE `vn`.`agencyTerm` CHANGE `supplierFk` `supplierFk` INT NULL AFTER `agencyFk`;
-
-UPDATE `vn`.`agencyTerm` `at`
- JOIN `vn`.`agency` `a` ON `a`.`id` = `at`.`agencyFk`
-SET `at`.`supplierFk` = `a`.`supplierFk`;
-
-ALTER TABLE `vn`.`agencyTerm` ADD CONSTRAINT `agencyTerm_FK` FOREIGN KEY (`agencyFk`) REFERENCES `vn`.`agency`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`agencyTerm` ADD CONSTRAINT `agencyTerm_FK_1` FOREIGN KEY (`supplierFk`) REFERENCES `vn`.`supplier`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-RENAME TABLE `vn`.`agencyTerm` TO `vn`.`supplierAgencyTerm`;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED
-DEFINER=`root`@`localhost`
-VIEW `vn`.`agencyTerm` AS
-SELECT
- `sat`.`agencyFk` AS `agencyFk`,
- `sat`.`minimumPackages` AS `minimumPackages`,
- `sat`.`kmPrice` AS `kmPrice`,
- `sat`.`packagePrice` AS `packagePrice`,
- `sat`.`routePrice` AS `routePrice`,
- `sat`.`minimumKm` AS `minimumKm`,
- `sat`.`minimumM3` AS `minimumM3`,
- `sat`.`m3Price` AS `m3Price`
-FROM
- `vn`.`supplierAgencyTerm` `sat`;
-
-ALTER TABLE `vn`.`agency` DROP FOREIGN KEY `agency_ibfk_4`;
-ALTER TABLE `vn`.`agency` CHANGE `supplierFk` `supplierFk__` int(11) DEFAULT NULL NULL;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED
-DEFINER=`root`@`localhost`
-VIEW `vn2008`.`agency` AS
-SELECT
- `a`.`id` AS `agency_id`,
- `a`.`name` AS `name`,
- `a`.`warehouseFk` AS `warehouse_id`,
- `a`.`isVolumetric` AS `por_volumen`,
- `a`.`bankFk` AS `Id_Banco`,
- `a`.`warehouseAliasFk` AS `warehouse_alias_id`,
- `a`.`isOwn` AS `propios`,
- `a`.`labelZone` AS `zone_label`,
- `a`.`workCenterFk` AS `workCenterFk`,
- `a`.`supplierFk__` AS `supplierFk__`
-FROM
- `vn`.`agency` `a`;
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-ticketRefund.sql b/db/changes/10440-fallas/00-ticketRefund.sql
deleted file mode 100644
index 66de21e91..000000000
--- a/db/changes/10440-fallas/00-ticketRefund.sql
+++ /dev/null
@@ -1,149 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
-BEGIN
-
- DECLARE vDone BIT DEFAULT 0;
- DECLARE vCustomer MEDIUMINT;
- DECLARE vWarehouse TINYINT;
- DECLARE vCompany MEDIUMINT;
- DECLARE vAddress MEDIUMINT;
- DECLARE vRefundAgencyMode INT;
- DECLARE vItemFk INT;
- DECLARE vQuantity DECIMAL (10,2);
- DECLARE vConcept VARCHAR(50);
- DECLARE vPrice DECIMAL (10,2);
- DECLARE vDiscount TINYINT;
- DECLARE vSaleNew INT;
- DECLARE vSaleMain INT;
- DECLARE vZoneFk INT;
-
- DECLARE vRsMainTicket CURSOR FOR
- SELECT *
- FROM tmp.sale;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-
- SELECT id INTO vRefundAgencyMode
- FROM agencyMode WHERE `name` = 'ABONO';
-
- SELECT clientFk, warehouseFk, companyFk, addressFk
- INTO vCustomer, vWarehouse, vCompany, vAddress
- FROM ticket
- WHERE id = vOriginTicket;
-
- SELECT id INTO vZoneFk
- FROM zone WHERE agencyModeFk = vRefundAgencyMode
- LIMIT 1;
-
- INSERT INTO vn.ticket (
- clientFk,
- shipped,
- addressFk,
- agencyModeFk,
- nickname,
- warehouseFk,
- companyFk,
- landed,
- zoneFk
- )
- SELECT
- vCustomer,
- CURDATE(),
- vAddress,
- vRefundAgencyMode,
- a.nickname,
- vWarehouse,
- vCompany,
- CURDATE(),
- vZoneFk
- FROM address a
- WHERE a.id = vAddress;
-
- SET vNewTicket = LAST_INSERT_ID();
-
- SET vDone := 0;
- OPEN vRsMainTicket ;
- FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
- WHILE NOT vDone DO
-
- INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
- VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
- SET vSaleNew = LAST_INSERT_ID();
-
- INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
- SELECT vSaleNew,componentFk,`value`
- FROM vn.saleComponent
- WHERE saleFk = vSaleMain;
-
- FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
- END WHILE;
- CLOSE vRsMainTicket;
-
- INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
- VALUES(vNewTicket, vOriginTicket);
-
-END$$
-DELIMITER ;
-
-CREATE TABLE `vn`.`ticketRefund` (
- `id` INT auto_increment NULL,
- `refundTicketFk` INT NOT NULL,
- `originalTicketFk` INT NOT NULL,
- CONSTRAINT `ticketRefund_PK` PRIMARY KEY (id)
-)
-ENGINE=InnoDB
-DEFAULT CHARSET=utf8
-COLLATE=utf8_unicode_ci;
-
-ALTER TABLE `vn`.`ticketRefund` ADD CONSTRAINT `ticketRefund_FK` FOREIGN KEY (`refundTicketFk`) REFERENCES `vn`.`ticket`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`ticketRefund` ADD CONSTRAINT `ticketRefund_FK_1` FOREIGN KEY (`originalTicketFk`) REFERENCES `vn`.`ticket`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeInsert`
- BEFORE INSERT ON `ticketRefund`
- FOR EACH ROW
-BEGIN
- DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE;
-
- IF NEW.refundTicketFk = NEW.originalTicketFk THEN
- CALL util.throw('Original ticket and refund ticket has same id');
- END IF;
-
- SELECT COUNT(*) INTO vAlreadyExists
- FROM ticketRefund
- WHERE refundTicketFk = NEW.originalTicketFk;
-
- IF vAlreadyExists > 0 THEN
- CALL util.throw('This ticket is already a refund');
- END IF;
-END$$
-DELIMITER ;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeUpdate`
- BEFORE UPDATE ON `ticketRefund`
- FOR EACH ROW
-BEGIN
- DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE;
-
- IF NEW.refundTicketFk = NEW.originalTicketFk THEN
- CALL util.throw('Original ticket and refund ticket has same id');
- END IF;
-
- SELECT COUNT(*) INTO vAlreadyExists
- FROM ticketRefund
- WHERE refundTicketFk = NEW.originalTicketFk;
-
- IF vAlreadyExists > 0 THEN
- CALL util.throw('This ticket is already a refund');
- END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10440-fallas/00-travelThermograph.sql b/db/changes/10440-fallas/00-travelThermograph.sql
deleted file mode 100644
index f76f070a0..000000000
--- a/db/changes/10440-fallas/00-travelThermograph.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-DROP TRIGGER `vn`.`travelThermograph_beforeInsert`;
-
-ALTER TABLE `vn`.`travelThermograph` CHANGE `temperature` `temperature__` enum('COOL','WARM','DRY') CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `vn2008`.`travel_thermograph` AS
-select
- `tt`.`thermographFk` AS `thermograph_id`,
- `tt`.`created` AS `odbc_date`,
- `tt`.`warehouseFk` AS `warehouse_id`,
- `tt`.`travelFk` AS `travel_id`,
- `tt`.`temperatureFk` AS `temperature`,
- `tt`.`result` AS `result`,
- `tt`.`dmsFk` AS `gestdoc_id`
-from
- `vn`.`travelThermograph` `tt`;
\ No newline at end of file
diff --git a/db/changes/10440-fallas/00-worker.sql b/db/changes/10440-fallas/00-worker.sql
deleted file mode 100644
index 0e0def841..000000000
--- a/db/changes/10440-fallas/00-worker.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-
-ALTER TABLE `vn`.`worker` MODIFY COLUMN `maritalStatus__` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-UPDATE `vn`.`worker` `w`
- SET `w`.`maritalStatus__` = NULL;
-
-UPDATE `vn`.`worker` `w`
- JOIN `vn`.`person` `p` ON `p`.`workerFk` = `w`.`id`
- JOIN `postgresql`.`profile` `pr` ON `pr`.`person_id` = `p`.`id`
- JOIN `vn2008`.`profile_labour_payroll` `pl` ON `pl`.`profile_id` = `pr`.`profile_id`
- SET `w`.`maritalStatus__` = `pl`.`estadocivil`;
-
-ALTER TABLE `vn`.`worker` ADD `originCountryFk` mediumint(8) unsigned NULL COMMENT 'País de origen';
-ALTER TABLE `vn`.`worker` ADD `educationLevelFk` SMALLINT NULL;
-ALTER TABLE `vn`.`worker` ADD `SSN` varchar(15) NULL;
-ALTER TABLE `vn`.`worker` CHANGE `maritalStatus__` `maritalStatus` enum('S','M') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-ALTER TABLE `vn`.`worker` MODIFY COLUMN `maritalStatus` enum('S','M') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-ALTER TABLE `vn`.`worker` CHANGE `maritalStatus` maritalStatus enum('S','M') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER sectorFk;
-ALTER TABLE `vn`.`worker` ADD CONSTRAINT `worker_FK_2` FOREIGN KEY (`educationLevelFk`) REFERENCES `vn`.`educationLevel`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`worker` ADD CONSTRAINT `worker_FK_1` FOREIGN KEY (`originCountryFk`) REFERENCES `vn`.`country`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-INSERT INTO `vn`.`country` (`country`, `CEE`, `code`, `politicalCountryFk`, `isUeeMember`, `a3Code`)
- VALUES
- ('Argentina',2,'AR',80,0,32),
- ('Cuba',2,'CU',81,0,192),
- ('Guinea Ecuatorial',2,'GQ',82,0,226),
- ('Guinea',2,'GN',83,0,324),
- ('Honduras',2,'HN',84,0,340),
- ('Mali',2,'ML',85,0,466),
- ('Nicaragua',2,'NI',86,0,558),
- ('Pakistán',2,'PK',87,0,586),
- ('Paraguay',2,'PY',88,0,600),
- ('Senegal',2,'SN',89,0,686),
- ('Uruguay',2,'UY',90,0,858),
- ('Venezuela',2,'VE',91,0,862),
- ('Bulgaria',2,'BG',92,1,100),
- ('Georgia',2,'GE',93,0,268);
-
-UPDATE `vn`.`worker` `w`
- JOIN `vn`.`person` `p` ON `p`.`workerFk` = `w`.`id`
- JOIN `postgresql`.`profile` `pr` ON `pr`.`person_id` = `p`.`id`
- JOIN `vn2008`.`profile_labour_payroll` `pl` ON `pl`.`profile_id` = `pr`.`profile_id`
- JOIN `vn`.`country` `co` ON `co`.`a3Code` = `pl`.`codpais`
- SET `w`.`originCountryFk` = `co`.`id`;
-
-UPDATE `vn`.`worker` `w`
- JOIN `vn`.`person` `p` ON `p`.`workerFk` = `w`.`id`
- JOIN `postgresql`.`profile` `pr` ON `pr`.`person_id` = `p`.`id`
- JOIN `vn2008`.`profile_labour_payroll` pl ON `pl`.`profile_id` = `pr`.`profile_id`
- SET `w`.`SSN` = CONCAT(`pl`.`NSSProvincia`, `pl`.`NssNumero`, `pl`.`NssDC`);
-
-RENAME TABLE `vn2008`.`profile_labour_payroll` TO `vn2008`.`profile_labour_payroll__`;
diff --git a/db/changes/10440-fallas/00-workerBusinessType.sql b/db/changes/10440-fallas/00-workerBusinessType.sql
deleted file mode 100644
index 489caa6c9..000000000
--- a/db/changes/10440-fallas/00-workerBusinessType.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `postgresql`.`business_labour_payroll` DROP FOREIGN KEY `business_labour_payroll_cod_contrato`;
-ALTER TABLE `vn`.`workerBusinessType` MODIFY COLUMN `id` int(11) NOT NULL;
-ALTER TABLE `postgresql`.`business_labour_payroll` ADD CONSTRAINT `business_labour_payroll_FK` FOREIGN KEY (cod_contrato) REFERENCES `vn`.`workerBusinessType`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/changes/10450-april/00-timeControl_getError.sql b/db/changes/10450-april/00-timeControl_getError.sql
deleted file mode 100644
index 0caf8ab62..000000000
--- a/db/changes/10450-april/00-timeControl_getError.sql
+++ /dev/null
@@ -1,73 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.timeControl_getError;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeControl_getError`(vDatedFrom DATETIME, vDatedTo DATETIME)
-BEGIN
-/*
- * @param vDatedFrom
- * @param vDatedTo
- * @table tmp.`user`(userFk)
- * Fichadas incorrectas de las cuales no se puede calcular horas trabajadas
- * @return tmp.timeControlError (id)
- */
- DECLARE vDayMaxTime INTEGER;
-
- SET @journeyCounter := 0;
- SET @lastUserFk := NULL;
-
- SELECT dayMaxTime INTO vDayMaxTime
- FROM workerTimeControlConfig LIMIT 1;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
- CREATE TEMPORARY TABLE tmp.timeControl
- (INDEX(id), INDEX(journeyCounter))
- ENGINE = MEMORY
- SELECT sub.id,
- sub.direction,
- sub.timed,
- IF(sub.direction = 'in' OR @hasOut OR sub.userFk <> @lastUserFk, @journeyCounter := @journeyCounter + 1, @journeyCounter) journeyCounter,
- @lastUserFk := sub.userFk workerFk,
- IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE)
- FROM (
- SELECT DISTINCT wtc.id,
- wtc.direction,
- wtc.timed,
- wtc.userFk
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- WHERE wtc.timed BETWEEN DATE_SUB(vDatedFrom, INTERVAL 1 DAY) AND DATE_ADD(vDatedTo, INTERVAL 1 DAY)
- ORDER BY wtc.userFk, wtc.timed
- ) sub;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
- CREATE TEMPORARY TABLE tmp.timeControlAux
- (INDEX(id), INDEX(journeyCounter))
- ENGINE = MEMORY
- SELECT * FROM tmp.timeControl;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError;
- CREATE TEMPORARY TABLE tmp.timeControlError
- (INDEX(id))
- ENGINE = MEMORY
- SELECT id
- FROM tmp.timeControlAux tca
- JOIN (SELECT journeyCounter,
- UNIX_TIMESTAMP(MAX(timed)) - UNIX_TIMESTAMP(MIN(timed)) timeWork,
- SUM(direction = 'in') totalIn,
- SUM(direction = 'out') totalOut,
- timed
- FROM tmp.timeControl
- GROUP BY journeyCounter
- HAVING COUNT(*) MOD 2 = 1
- OR totalIn <> 1
- OR totalOut <> 1
- OR timeWork >= vDayMaxTime
- )sub ON sub.journeyCounter = tca.journeyCounter
- WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
-
-END$$
-DELIMITER ;
diff --git a/db/changes/10451-april/00-account_user.sql b/db/changes/10451-april/00-account_user.sql
deleted file mode 100644
index 2988c310e..000000000
--- a/db/changes/10451-april/00-account_user.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `vn`.`userConfig` ADD darkMode tinyint(1) DEFAULT 1 NOT NULL COMMENT 'Salix interface dark mode';
\ No newline at end of file
diff --git a/db/changes/10451-april/00-aclExpeditionState.sql b/db/changes/10451-april/00-aclExpeditionState.sql
deleted file mode 100644
index d26117bbf..000000000
--- a/db/changes/10451-april/00-aclExpeditionState.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('ExpeditionState', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10451-april/00-aclExpense.sql b/db/changes/10451-april/00-aclExpense.sql
deleted file mode 100644
index 55ca8c389..000000000
--- a/db/changes/10451-april/00-aclExpense.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES('Expense', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES('Expense', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
diff --git a/db/changes/10451-april/00-aclSaleRefund.sql b/db/changes/10451-april/00-aclSaleRefund.sql
deleted file mode 100644
index 79baba63d..000000000
--- a/db/changes/10451-april/00-aclSaleRefund.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE `salix`.`ACL`
- SET `property`='refund'
-WHERE `model`='Sale' AND `property`='payBack';
-
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('Sale', 'refundAll', 'WRITE', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/changes/10451-april/00-aclSupplierActivity.sql b/db/changes/10451-april/00-aclSupplierActivity.sql
deleted file mode 100644
index bf73a1506..000000000
--- a/db/changes/10451-april/00-aclSupplierActivity.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('SupplierActivity', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('SupplierActivity', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
diff --git a/db/changes/10460-mother/00-clientConfig.sql b/db/changes/10460-mother/00-clientConfig.sql
deleted file mode 100644
index cd67a5797..000000000
--- a/db/changes/10460-mother/00-clientConfig.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`clientConfig` ADD `maxCreditRows` int(11) NULL COMMENT 'Máximo número de registros a mantener en la tabla clientCredit';
-
-UPDATE `vn`.`clientConfig`
- SET `maxCreditRows` = 10
- WHERE `id` = 1;
\ No newline at end of file
diff --git a/db/changes/10460-mother/00-dmsForeignKey.sql b/db/changes/10460-mother/00-dmsForeignKey.sql
deleted file mode 100644
index 6a4736fdd..000000000
--- a/db/changes/10460-mother/00-dmsForeignKey.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`propertyDms` DROP FOREIGN KEY propertyDms_FK;
-ALTER TABLE `vn`.`propertyDms` ADD CONSTRAINT propertyDms_FK FOREIGN KEY (dmsFk) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `vn`.`clientDms` DROP FOREIGN KEY clientDms_ibfk_2;
-ALTER TABLE `vn`.`clientDms` ADD CONSTRAINT clientDms_ibfk_2 FOREIGN KEY (dmsFk) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `vn`.`workerDocument` DROP FOREIGN KEY workerDocument_ibfk_2;
-ALTER TABLE `vn`.`workerDocument` ADD CONSTRAINT workerDocument_ibfk_2 FOREIGN KEY (document) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/changes/10460-mother/01-dmsType.sql b/db/changes/10460-mother/01-dmsType.sql
deleted file mode 100644
index 649ffbc71..000000000
--- a/db/changes/10460-mother/01-dmsType.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`dmsType` ADD monthToDelete INT UNSIGNED DEFAULT NULL NULL;
-ALTER TABLE `vn`.`dmsType` MODIFY COLUMN monthToDelete int(10) unsigned DEFAULT NULL NULL COMMENT 'Meses en el pasado para ir borrando registros, dejar a null para no borrarlos nunca';
-UPDATE `vn`.`dmsType`
- SET monthToDelete=6
- WHERE id=20;
diff --git a/db/changes/10460-mother/02-dmsTrigger.sql b/db/changes/10460-mother/02-dmsTrigger.sql
deleted file mode 100644
index d4525440b..000000000
--- a/db/changes/10460-mother/02-dmsTrigger.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-DELIMITER $$
-$$
-CREATE TRIGGER `vn`.`dms_beforeDelete`
-BEFORE DELETE
-ON dms FOR EACH ROW
-BEGIN
- DECLARE vCanNotBeDeleted INT;
- SELECT COUNT(*) INTO vCanNotBeDeleted
- FROM dmsType dt
- WHERE NOT (code <=> 'trash')
- AND dt.id = OLD.dmsTypeFk;
-
- IF vCanNotBeDeleted THEN
- CALL util.throw('A dms can not be deleted');
- END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10460-mother/03-clean.sql b/db/changes/10460-mother/03-clean.sql
deleted file mode 100644
index 13951394f..000000000
--- a/db/changes/10460-mother/03-clean.sql
+++ /dev/null
@@ -1,175 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.clean;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
-BEGIN
- DECLARE vDateShort DATETIME;
- DECLARE vOneYearAgo DATE;
- DECLARE vFourYearsAgo DATE;
- DECLARE v18Month DATE;
- DECLARE v26Month DATE;
- DECLARE v3Month DATE;
- DECLARE vTrashId varchar(15);
-
- SET vDateShort = TIMESTAMPADD(MONTH, -2, CURDATE());
- SET vOneYearAgo = TIMESTAMPADD(YEAR,-1,CURDATE());
- SET vFourYearsAgo = TIMESTAMPADD(YEAR,-4,CURDATE());
- SET v18Month = TIMESTAMPADD(MONTH, -18,CURDATE());
- SET v26Month = TIMESTAMPADD(MONTH, -26,CURDATE());
- SET v3Month = TIMESTAMPADD(MONTH, -3, CURDATE());
-
- DELETE FROM ticketParking WHERE created < vDateShort;
- DELETE FROM routesMonitor WHERE dated < vDateShort;
- DELETE FROM workerTimeControlLog WHERE created < vDateShort;
- DELETE FROM `message` WHERE sendDate < vDateShort;
- DELETE FROM messageInbox WHERE sendDate < vDateShort;
- DELETE FROM messageInbox WHERE sendDate < vDateShort;
- DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
- DELETE FROM itemShelving WHERE created < CURDATE() AND visible = 0;
- DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,CURDATE());
- DELETE FROM entryLog WHERE creationDate < vDateShort;
- DELETE IGNORE FROM expedition WHERE created < v26Month;
- DELETE FROM sms WHERE created < v18Month;
- DELETE FROM saleTracking WHERE created < vOneYearAgo;
- DELETE tobs FROM ticketObservation tobs
- JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,CURDATE());
- DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
- DELETE FROM sharingCart where ended < vDateShort;
- DELETE FROM sharingClient where ended < vDateShort;
- DELETE tw.* FROM ticketWeekly tw
- LEFT JOIN sale s ON s.ticketFk = tw.ticketFk WHERE s.itemFk IS NULL;
- DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
- DELETE FROM message WHERE sendDate < vDateShort;
- -- Robert ubicacion anterior de trevelLog comentario para debug
- DELETE sc FROM saleChecked sc
- JOIN sale s ON sc.saleFk = s.id WHERE s.created < vDateShort;
- DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
- DELETE bm
- FROM buyMark bm
- JOIN buy b ON b.id = bm.id
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed <= vDateShort;
- DELETE FROM stowaway WHERE created < v3Month;
- DELETE FROM vn.buy WHERE created < vDateShort AND entryFk = 9200;
- DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
- DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
-
-
- -- Equipos duplicados
- DELETE w.*
- FROM workerTeam w
- JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
- FROM workerTeam
- GROUP BY team,workerFk
- HAVING duplicated
- ) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
-
- DELETE sc
- FROM saleComponent sc
- JOIN sale s ON s.id= sc.saleFk
- JOIN ticket t ON t.id= s.ticketFk
- WHERE t.shipped < v18Month;
-
- DELETE c
- FROM vn.claim c
- JOIN vn.claimState cs ON cs.id = c.claimStateFk
- WHERE cs.description = "Anulado" AND
- c.created < vDateShort;
- DELETE
- FROM vn.expeditionTruck
- WHERE ETD < v3Month;
-
- -- borrar travels sin entradas
- DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
- CREATE TEMPORARY TABLE tmp.thermographToDelete
- SELECT th.id,th.dmsFk
- FROM vn.travel t
- LEFT JOIN vn.entry e ON e.travelFk = t.id
- JOIN vn.travelThermograph th ON th.travelFk = t.id
- WHERE t.shipped < TIMESTAMPADD(MONTH, -3, CURDATE()) AND e.travelFk IS NULL;
-
- SELECT dt.id into vTrashId
- FROM vn.dmsType dt
- WHERE dt.code = 'trash';
-
- UPDATE tmp.thermographToDelete th
- JOIN vn.dms d ON d.id = th.dmsFk
- SET d.dmsTypeFk = vTrashId;
-
- DELETE th
- FROM tmp.thermographToDelete tmp
- JOIN vn.travelThermograph th ON th.id = tmp.id;
-
- DELETE t
- FROM vn.travel t
- LEFT JOIN vn.entry e ON e.travelFk = t.id
- WHERE t.shipped < TIMESTAMPADD(MONTH, -3, CURDATE()) AND e.travelFk IS NULL;
-
- UPDATE dms d
- JOIN dmsType dt ON dt.id = d.dmsTypeFk
- SET d.dmsTypeFk = vTrashId
- WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, CURDATE());
-
- -- borrar entradas sin compras
- DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
- CREATE TEMPORARY TABLE tmp.entryToDelete
- SELECT e.*
- FROM vn.entry e
- LEFT JOIN vn.buy b ON b.entryFk = e.id
- JOIN vn.entryConfig ec ON e.id != ec.defaultEntry
- WHERE e.dated < TIMESTAMPADD(MONTH, -3, CURDATE()) AND b.entryFK IS NULL;
-
- DELETE e
- FROM vn.entry e
- JOIN tmp.entryToDelete tmp ON tmp.id = e.id;
-
- -- borrar de route registros menores a 4 años
- DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
- CREATE TEMPORARY TABLE tmp.routeToDelete
- SELECT *
- FROM vn.route r
- WHERE created < TIMESTAMPADD(YEAR,-4,CURDATE());
-
- UPDATE tmp.routeToDelete tmp
- JOIN vn.dms d ON d.id = tmp.gestdocFk
- SET d.dmsTypeFk = vTrashId;
-
- DELETE r
- FROM tmp.routeToDelete tmp
- JOIN vn.route r ON r.id = tmp.id;
-
- -- borrar registros de dua y awb menores a 2 años
- DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
- CREATE TEMPORARY TABLE tmp.duaToDelete
- SELECT *
- FROM vn.dua
- WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE());
-
- UPDATE tmp.duaToDelete tm
- JOIN vn.dms d ON d.id = tm.gestdocFk
- SET d.dmsTypeFk = vTrashId;
-
- DELETE d
- FROM tmp.duaToDelete tmp
- JOIN vn.dua d ON d.id = tmp.id;
-
- DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,CURDATE());
-
- -- Borra los ficheros gestDoc
- INSERT INTO vn.printServerQueue(priorityFk, labelReportFk)VALUES(1,11);
-
- -- Borra los registros de collection y ticketcollection
- DELETE FROM vn.collection WHERE created < vDateShort;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
- DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
- DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-
- DELETE FROM travelLog WHERE creationDate < v3Month;
-
- CALL shelving_clean;
-
-END$$
-DELIMITER ;
diff --git a/db/changes/10461-mother/00-ClientUnpaid.sql b/db/changes/10461-mother/00-ClientUnpaid.sql
deleted file mode 100644
index 16deedace..000000000
--- a/db/changes/10461-mother/00-ClientUnpaid.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE `vn`.`clientUnpaid` (
- `clientFk` int(11) NOT NULL,
- `dated` date NOT NULL,
- `amount` double DEFAULT 0,
- PRIMARY KEY (`clientFk`),
- CONSTRAINT `clientUnpaid_clientFk` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON UPDATE CASCADE
-);
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES('ClientUnpaid', '*', '*', 'ALLOW', 'ROLE', 'administrative');
diff --git a/db/changes/10461-mother/00-invoiceOut_queue.sql b/db/changes/10461-mother/00-invoiceOut_queue.sql
deleted file mode 100644
index 2b9f45e0f..000000000
--- a/db/changes/10461-mother/00-invoiceOut_queue.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE `vn`.`invoiceOut_queue` (
- `invoiceFk` int(10) unsigned not null,
- `queued` datetime default now() not null,
- `printed` datetime null,
- `status` VARCHAR(50) DEFAULT '' NULL,
- CONSTRAINT `invoiceOut_queue_pk` PRIMARY KEY (`invoiceFk`),
- CONSTRAINT `invoiceOut_queue_invoiceOut_id_fk` FOREIGN KEY (`invoiceFk`) REFERENCES `vn`.`invoiceOut` (`id`) ON UPDATE CASCADE ON DELETE CASCADE
-) comment 'Queue for PDF invoicing';
diff --git a/db/changes/10460-mother/04-acl.sql b/db/changes/10480-june/00-aclShelvingLog.sql
similarity index 57%
rename from db/changes/10460-mother/04-acl.sql
rename to db/changes/10480-june/00-aclShelvingLog.sql
index c1dc4f6ed..dc75142d1 100644
--- a/db/changes/10460-mother/04-acl.sql
+++ b/db/changes/10480-june/00-aclShelvingLog.sql
@@ -1,2 +1,3 @@
INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
- VALUES ('Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee')
\ No newline at end of file
+ VALUES
+ ('ShelvingLog','*','READ','ALLOW','ROLE','employee');
\ No newline at end of file
diff --git a/db/changes/10480-june/00-aclZoneExclusionGeos.sql b/db/changes/10480-june/00-aclZoneExclusionGeos.sql
new file mode 100644
index 000000000..4c0f6c991
--- /dev/null
+++ b/db/changes/10480-june/00-aclZoneExclusionGeos.sql
@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+ VALUES
+ ('ZoneExclusionGeo', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+ ('ZoneExclusionGeo', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
\ No newline at end of file
diff --git a/db/changes/10480-june/00-itemType.sql b/db/changes/10480-june/00-itemType.sql
new file mode 100644
index 000000000..d201acf37
--- /dev/null
+++ b/db/changes/10480-june/00-itemType.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`itemType` CHANGE `transaction` transaction__ tinyint(4) DEFAULT 0 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE location location__ varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+ALTER TABLE `vn`.`itemType` CHANGE hasComponents hasComponents__ tinyint(1) DEFAULT 1 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE warehouseFk warehouseFk__ smallint(6) unsigned DEFAULT 60 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE compression compression__ decimal(5,2) DEFAULT 1.00 NULL;
\ No newline at end of file
diff --git a/db/changes/10480-june/00-route.sql b/db/changes/10480-june/00-route.sql
new file mode 100644
index 000000000..beb7d5e41
--- /dev/null
+++ b/db/changes/10480-june/00-route.sql
@@ -0,0 +1,10 @@
+UPDATE `vn`.`route` r
+ JOIN(SELECT r.id, wl.workcenterFk
+ FROM `vn`.`route` r
+ JOIN `vn`.`routeLog` rl ON rl.originFk = r.id
+ JOIN `vn`.`workerLabour` wl ON wl.workerFk = rl.userFk
+ AND r.created BETWEEN wl.started AND IFNULL(wl.ended, r.created)
+ WHERE r.created BETWEEN '2021-12-01' AND CURDATE()
+ AND rl.action = 'insert'
+ )sub ON sub.id = r.id
+ SET r.commissionWorkCenterFk = sub.workcenterFk;
\ No newline at end of file
diff --git a/db/changes/10480-june/00-shelving.sql b/db/changes/10480-june/00-shelving.sql
new file mode 100644
index 000000000..c66d164c4
--- /dev/null
+++ b/db/changes/10480-june/00-shelving.sql
@@ -0,0 +1,18 @@
+ALTER TABLE `vn`.`itemShelving` DROP FOREIGN KEY itemShelving_fk2;
+ALTER TABLE `vn`.`shelvingLog` DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
+ALTER TABLE `vn`.`smartTag` DROP FOREIGN KEY smartTag_shelving_fk;
+ALTER TABLE `vn`.`workerShelving` DROP FOREIGN KEY workerShelving_shelving_fk;
+
+ALTER TABLE `vn`.`shelving` DROP PRIMARY KEY;
+ALTER TABLE `vn`.`shelving` ADD id INT auto_increment PRIMARY KEY NULL;
+ALTER TABLE `vn`.`shelving` CHANGE id id int(11) auto_increment NOT NULL FIRST;
+ALTER TABLE `vn`.`shelving` ADD CONSTRAINT shelving_UN UNIQUE KEY (code);
+
+ALTER TABLE `vn`.`itemShelving` ADD CONSTRAINT itemShelving_fk2 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
+ALTER TABLE vn.shelvingLog MODIFY COLUMN originFk INT NOT NULL;
+ALTER TABLE vn.shelvingLog ADD CONSTRAINT shelvingLog_FK FOREIGN KEY (originFk) REFERENCES vn.shelving(id) ON DELETE CASCADE ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/changes/10480-june/04-aclParking.sql b/db/changes/10480-june/04-aclParking.sql
new file mode 100644
index 000000000..05acd68b1
--- /dev/null
+++ b/db/changes/10480-june/04-aclParking.sql
@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+ VALUES ('Parking','*','*','ALLOW','ROLE','employee')
\ No newline at end of file
diff --git a/db/changes/10480-june/04-aclShelving.sql b/db/changes/10480-june/04-aclShelving.sql
new file mode 100644
index 000000000..b237dfe0d
--- /dev/null
+++ b/db/changes/10480-june/04-aclShelving.sql
@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+ VALUES ('Shelving','*','*','ALLOW','ROLE','employee')
\ No newline at end of file
diff --git a/db/changes/10490-august/00-sale_afterUpdate.sql b/db/changes/10490-august/00-sale_afterUpdate.sql
new file mode 100644
index 000000000..407fb52c9
--- /dev/null
+++ b/db/changes/10490-august/00-sale_afterUpdate.sql
@@ -0,0 +1,100 @@
+DROP TRIGGER IF EXISTS vn.sale_afterUpdate;
+USE vn;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterUpdate`
+ AFTER UPDATE ON `sale`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsToSendMail BOOL;
+ DECLARE vPickedLines INT;
+ DECLARE vCollectionFk INT;
+ DECLARE vUserRole VARCHAR(255);
+
+ IF !(NEW.id <=> OLD.id)
+ OR !(NEW.ticketFk <=> OLD.ticketFk)
+ OR !(NEW.itemFk <=> OLD.itemFk)
+ OR !(NEW.quantity <=> OLD.quantity)
+ OR !(NEW.created <=> OLD.created)
+ OR !(NEW.isPicked <=> OLD.isPicked) THEN
+ CALL stock.log_add('sale', NEW.id, OLD.id);
+ END IF;
+
+ IF !(NEW.price <=> OLD.price)
+ OR !(NEW.ticketFk <=> OLD.ticketFk)
+ OR !(NEW.itemFk <=> OLD.itemFk)
+ OR !(NEW.quantity <=> OLD.quantity)
+ OR !(NEW.discount <=> OLD.discount) THEN
+ CALL ticket_requestRecalc(NEW.ticketFk);
+ CALL ticket_requestRecalc(OLD.ticketFk);
+ END IF;
+
+ IF !(OLD.ticketFk <=> NEW.ticketFk) THEN
+ UPDATE ticketRequest SET ticketFk = NEW.ticketFk
+ WHERE saleFk = NEW.id;
+ END IF;
+
+ SELECT account.myUser_getName() INTO vUserRole;
+ SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole;
+
+ IF !(OLD.quantity <=> NEW.quantity) THEN
+ SELECT COUNT(*) INTO vIsToSendMail
+ FROM vncontrol.inter i
+ JOIN vn.state s ON s.id = i.state_id
+ WHERE s.code='PACKED'
+ AND i.Id_Ticket = OLD.ticketFk
+ AND vUserRole IN ('salesPerson', 'salesTeamBoss')
+ LIMIT 1;
+
+ IF vIsToSendMail THEN
+ CALL vn.mail_insert('jefesventas@verdnatura.es',
+ 'noreply@verdnatura.es',
+ CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'),
+ CONCAT('Ticket ', OLD.ticketFk ,' .
- ', vType ,'
- ', REPLACE(vValues, ',', ' ') ,'
-
- ');
- ELSE
- SET vRow = '';
- END IF;
+ IF vValues IS NOT NULL THEN
+ SET vRow = CONCAT('
+
+ ', vType ,'
+ ', REPLACE(vValues, ',', ' ') ,'
+
+ ');
+ ELSE
+ SET vRow = '';
+ END IF;
- RETURN vRow;
+ RETURN vRow;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -21204,22 +20883,22 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` FUNCTION `formatTable`(vFields VARCHAR(512), vOldValues VARCHAR(512), vNewValues VARCHAR(512)) RETURNS text CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
BEGIN
- DECLARE vTable TEXT;
+ DECLARE vTable TEXT;
- SET vTable = CONCAT('
-
-
- type
- ', REPLACE(vFields, ',', ' ') ,'
-
- ', formatRow('old', vOldValues) ,'
- ', formatRow('new', vNewValues) ,'
-
-
- ');
+ SET vTable = CONCAT('
+
+
+ type
+ ', REPLACE(vFields, ',', ' ') ,'
+
+ ', formatRow('old', vOldValues) ,'
+ ', formatRow('new', vNewValues) ,'
+
+
+ ');
- RETURN vTable;
+ RETURN vTable;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -21381,7 +21060,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `midnight`() RETURNS datetime
READS SQL DATA
BEGIN
- RETURN TIMESTAMP(util.VN_CURDATE(), '23:59:59');
+ RETURN TIMESTAMP(CURDATE(), '23:59:59');
END ;;
DELIMITER ;
@@ -21491,12 +21170,12 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `today`() RETURNS date
BEGIN
/**
* Devuelve la fecha actual. Usar en lugar de la función nativa
- * util.VN_CURDATE() en aquellos que se necesite rendimiento ya que la
+ * CURDATE() en aquellos que se necesite rendimiento ya que la
* la última no es determinista.
*
* @return La fecha actual
*/
- RETURN util.VN_CURDATE();
+ RETURN CURDATE();
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -21521,7 +21200,7 @@ BEGIN
*
* @return La fecha de mañana
*/
- RETURN TIMESTAMPADD(DAY, 1, util.VN_CURDATE());
+ RETURN TIMESTAMPADD(DAY, 1, CURDATE());
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -21546,7 +21225,7 @@ BEGIN
*
* @return La fecha de antes de ayer
*/
- RETURN TIMESTAMPADD(DAY, -2, util.VN_CURDATE());
+ RETURN TIMESTAMPADD(DAY, -2, CURDATE());
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -21573,7 +21252,7 @@ BEGIN
* @param vYear Año a evaluar
* @return La posicion relativa del año
*/
- DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE());
+ DECLARE vCurYear INT DEFAULT YEAR(CURDATE());
IF vYear = vCurYear THEN
RETURN 'curYear';
@@ -21612,7 +21291,7 @@ BEGIN
*
* @return La fecha de ayer
*/
- RETURN TIMESTAMPADD(DAY, -1, util.VN_CURDATE());
+ RETURN TIMESTAMPADD(DAY, -1, CURDATE());
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -21991,14 +21670,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `slowLog_prune` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `slowLog_prune`()
BEGIN
@@ -22006,15 +21685,20 @@ BEGIN
* Prunes MySQL slow query log table deleting all records older than one week.
*/
DECLARE vSlowQueryLog INT DEFAULT @@slow_query_log;
+ DECLARE vSqlLogBin INT DEFAULT @@SESSION.sql_log_bin;
+
+ SET sql_log_bin = OFF;
+ SET GLOBAL slow_query_log = OFF;
- SET GLOBAL slow_query_log = 'OFF';
RENAME TABLE `mysql`.`slow_log` TO `mysql`.`slow_log_temp`;
DELETE FROM `mysql`.`slow_log_temp`
- WHERE start_time < TIMESTAMPADD(WEEK, -1, util.VN_NOW());
+ WHERE start_time < TIMESTAMPADD(WEEK, -1, NOW());
RENAME TABLE `mysql`.`slow_log_temp` TO `mysql`.`slow_log`;
+
SET GLOBAL slow_query_log = vSlowQueryLog;
+ SET sql_log_bin = vSqlLogBin;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -22216,34 +21900,40 @@ DELIMITER ;;
BEFORE INSERT ON `XDiario`
FOR EACH ROW
BEGIN
-/*
- IF NEW.EURODEBE < 0 THEN
-
- SET NEW.EUROHABER = - NEW.EURODEBE;
- SET NEW.EURODEBE = NULL;
-
+ IF (NOT isDateRangeAccounting(NEW.FECHA) AND NEW.FECHA IS NOT NULL) OR
+ (NOT isDateRangeAccounting(NEW.FECHA_EX) AND NEW.FECHA_EX IS NOT NULL) OR
+ (NOT isDateRangeAccounting(NEW.FECHA_OP) AND NEW.FECHA_OP IS NOT NULL) OR
+ (NOT isDateRangeAccounting(NEW.FECHA_RT) AND NEW.FECHA_RT IS NOT NULL) OR
+ (NOT isDateRangeAccounting(NEW.FECREGCON) AND NEW.FECREGCON IS NOT NULL) THEN
+ CALL util.throw ('Fecha fuera de rango');
+ END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`XDiario_beforeUpdate`
+ BEFORE UPDATE ON `XDiario`
+ FOR EACH ROW
+BEGIN
+ IF (!(NEW.FECHA <=> OLD.FECHA) AND NOT isDateRangeAccounting(NEW.FECHA)) OR
+ (!(NEW.FECHA_EX <=> OLD.FECHA_EX) AND NOT isDateRangeAccounting(NEW.FECHA_EX)) OR
+ (!(NEW.FECHA_OP <=> OLD.FECHA_OP) AND NOT isDateRangeAccounting(NEW.FECHA_OP)) OR
+ (!(NEW.FECHA_RT <=> OLD.FECHA_RT) AND NOT isDateRangeAccounting(NEW.FECHA_RT)) OR
+ (!(NEW.FECREGCON <=> OLD.FECREGCON) AND NOT isDateRangeAccounting(NEW.FECREGCON)) THEN
+ CALL util.throw ('Fecha fuera de rango');
END IF;
- IF NEW.EUROHABER < 0 THEN
-
- SET NEW.EURODEBE = - NEW.EUROHABER;
- SET NEW.EUROHABER = NULL;
-
- END IF;
-
- IF NEW.DEBEME < 0 THEN
-
- SET NEW.HABERME = - NEW.DEBEME;
- SET NEW.DEBEME = NULL;
-
- END IF;
-
- IF NEW.HABERME < 0 THEN
-
- SET NEW.DEBEME = - NEW.HABERME;
- SET NEW.HABERME = NULL;
- END IF;
- */
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -22284,6 +21974,8 @@ CREATE TABLE `absenceType` (
`isPrintable` tinyint(1) NOT NULL DEFAULT '0',
`discountRate` decimal(3,2) DEFAULT NULL,
`holidayEntitlementRate` decimal(3,2) DEFAULT '1.00',
+ `isNaturalDay` tinyint(1) DEFAULT '0' COMMENT 'Para el cálculo de los salarios de los repartidores',
+ `isCalculate` tinyint(1) DEFAULT '0' COMMENT 'Para el cálculo de los salarios de los repartidores',
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -22315,6 +22007,21 @@ CREATE TABLE `accounting` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Apunta a la vista vn.Accounting\nLa columna cash es la FK de vn.AccountingType';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `accountingConfig`
+--
+
+DROP TABLE IF EXISTS `accountingConfig`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `accountingConfig` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `minDate` date NOT NULL,
+ `maxDate` date NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `accountingType`
--
@@ -22329,6 +22036,7 @@ CREATE TABLE `accountingType` (
`code` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
`isAutoConciliated` tinyint(1) DEFAULT '1' COMMENT 'Si hay que marcar como conciliado el recibo al usar este tipo',
`maxAmount` int(11) DEFAULT NULL,
+ `daysInFuture` int(11) DEFAULT '0',
PRIMARY KEY (`id`),
KEY `accountingType_code_IDX` (`code`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='descripcio dels valors de la columna "cash" de la taula vn2008.Bancios';
@@ -22970,6 +22678,7 @@ CREATE TABLE `awb` (
`year` int(4) DEFAULT NULL,
`observation` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`hasFreightPrepaid` tinyint(3) DEFAULT '0',
+ `invoiceInPaletizedFk` mediumint(8) unsigned DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `codigo_UNIQUE` (`code`,`year`),
KEY `proveedor_id` (`transitoryFk`),
@@ -22978,11 +22687,13 @@ CREATE TABLE `awb` (
KEY `flight_id` (`flightFk`),
KEY `awbInvoiceIn` (`invoiceInFk`),
KEY `awb_FK` (`docFk`),
+ KEY `awb_FK_3` (`invoiceInPaletizedFk`),
CONSTRAINT `awbInvoiceIn` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `awbTransitoryFk` FOREIGN KEY (`transitoryFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
CONSTRAINT `awb_FK` FOREIGN KEY (`docFk`) REFERENCES `dms` (`id`) ON UPDATE CASCADE,
CONSTRAINT `awb_FK_1` FOREIGN KEY (`flightFk`) REFERENCES `vn2008`.`flight` (`flight_id`) ON UPDATE CASCADE,
CONSTRAINT `awb_FK_2` FOREIGN KEY (`freightFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `awb_FK_3` FOREIGN KEY (`invoiceInPaletizedFk`) REFERENCES `invoiceIn` (`id`) ON UPDATE CASCADE,
CONSTRAINT `awb_ibfk_1` FOREIGN KEY (`taxFk`) REFERENCES `taxCode` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -23000,7 +22711,7 @@ DELIMITER ;;
FOR EACH ROW
BEGIN
- SET NEW.year= year(util.VN_CURDATE());
+ SET NEW.year= year(CURDATE());
END */;;
@@ -23663,7 +23374,6 @@ trig: BEGIN
DECLARE vBuyerFk INT;
DECLARE vIsBuyerToBeEmailed BOOL;
DECLARE vItemName VARCHAR(50);
- DECLARE vIsInventory BOOL;
DECLARE vNewValues VARCHAR(255);
DECLARE vOldValues VARCHAR(255);
@@ -23707,7 +23417,7 @@ trig: BEGIN
IF vIsBuyerToBeEmailed AND
vBuyerFk != account.myUser_getId() AND
- vLanded = util.VN_CURDATE() THEN
+ vLanded = CURDATE() THEN
IF !(NEW.itemFk <=> OLD.itemFk) OR
!(NEW.quantity <=> OLD.quantity) OR
!(NEW.packing <=> OLD.packing) OR
@@ -23798,6 +23508,8 @@ trig: BEGIN
CALL stock.log_add('buy', NULL, OLD.id);
+ CALL util.debugAdd('buy_deleted', CONCAT(OLD.id,' ', OLD.itemFk,' ', vn.getWorkerCode()));
+
/*IF entry_isInventoryOrPrevious(OLD.entryFk) THEN
SET vValues = CONCAT_WS(',',
OLD.entryFk,
@@ -23988,6 +23700,29 @@ CREATE TABLE `chain` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Grupos de clientes';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `chat`
+--
+
+DROP TABLE IF EXISTS `chat`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chat` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `senderFk` int(10) unsigned DEFAULT NULL,
+ `recipient` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `dated` datetime DEFAULT NULL,
+ `checkUserStatus` tinyint(1) DEFAULT NULL,
+ `message` text COLLATE utf8_unicode_ci,
+ `status` tinyint(1) DEFAULT NULL,
+ `attempts` int(1) DEFAULT NULL,
+ `error` text COLLATE utf8_unicode_ci,
+ PRIMARY KEY (`id`),
+ KEY `chat_FK` (`senderFk`),
+ CONSTRAINT `chat_FK` FOREIGN KEY (`senderFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `chatConfig`
--
@@ -24552,21 +24287,26 @@ DELIMITER ;;
AFTER UPDATE ON `client`
FOR EACH ROW
BEGIN
- IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN
- UPDATE `address` SET isDefaultAddress = 0
- WHERE clientFk = NEW.id;
-
+ IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN
+ UPDATE `address` SET isDefaultAddress = 0
+ WHERE clientFk = NEW.id;
+
UPDATE `address` SET isDefaultAddress = 1
- WHERE id = NEW.defaultAddressFk;
- END IF;
-
- IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN
- INSERT IGNORE INTO ticketRecalc (ticketFk)
- SELECT id FROM ticket t
- WHERE t.clientFk = NEW.id
- AND t.refFk IS NULL;
+ WHERE id = NEW.defaultAddressFk;
END IF;
+ IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN
+ INSERT IGNORE INTO ticketRecalc (ticketFk)
+ SELECT id FROM ticket t
+ WHERE t.clientFk = NEW.id
+ AND t.refFk IS NULL;
+ END IF;
+
+ IF NOT NEW.isActive THEN
+ UPDATE account.`user`
+ SET active = FALSE
+ WHERE id = NEW.id;
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -24836,49 +24576,6 @@ CREATE TABLE `clientObservation` (
CONSTRAINT `clientObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
/*!40101 SET character_set_client = @saved_cs_client */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`clientObservation_AFTER_INSERT`
- AFTER INSERT ON `clientObservation`
- FOR EACH ROW
-BEGIN
-/* DECLARE vMailSender VARCHAR(90);
- DECLARE vUserName VARCHAR(30);
- DECLARE vUserId INT ;
-
- SELECT u.name, u.id INTO vUserName, vUserId
- FROM account.user u
- JOIN vn.worker w ON w.userFk = u.id
- WHERE w.id = NEW.workerFk;
-
- SELECT CONCAT(salesPerson.name, '@verdnatura.es, ',vUserName, '@verdnatura.es') INTO vMailSender
- FROM vn.client c
- JOIN vn.worker w ON w.id = c.salesPersonFk
- JOIN account.user salesPerson ON salesPerson.id = w.userFk
- WHERE c.id = NEW.clientFk
- AND salesPerson.id <> vUserId;
-
- IF vMailSender >'' THEN
- INSERT INTO vn.mail SET
- `sender` = vMailSender,
- `replyTo` = CONCAT(vUserName, '@verdnatura.es'),
- `subject` = CONCAT ('Nota añadida al cliente ', NEW.clientFk) ,
- `body` = CONCAT(vUserName, ' ha añadido la siguiente nota: ', NEW.`text`);
- END IF;
-*/
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
--
-- Table structure for table `clientPackagingGifts`
@@ -25402,6 +25099,7 @@ CREATE TABLE `company` (
`phytosanitary` longtext COLLATE utf8_unicode_ci,
`fhAdminNumber` int(11) DEFAULT NULL COMMENT 'número de cliente en FloraHolland',
PRIMARY KEY (`id`),
+ UNIQUE KEY `companyCode_UNIQUE` (`code`),
KEY `gerente_id` (`workerManagerFk`),
KEY `empresa_cliente_idx` (`clientFk`),
KEY `Id_Proveedores_account` (`supplierAccountFk`),
@@ -25428,6 +25126,21 @@ CREATE TABLE `companyGroup` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `comparativeFilterType`
+--
+
+DROP TABLE IF EXISTS `comparativeFilterType`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `comparativeFilterType` (
+ `comparativeFilterFk` int(11) NOT NULL,
+ `itemTypeFk` int(11) NOT NULL,
+ PRIMARY KEY (`comparativeFilterFk`,`itemTypeFk`),
+ CONSTRAINT `comparativeFilterType_FK` FOREIGN KEY (`comparativeFilterFk`) REFERENCES `comparativeFilter` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `component`
--
@@ -26071,14 +25784,39 @@ CREATE TABLE `creditInsurance` (
`credit` int(11) DEFAULT NULL,
`creationDate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`grade` tinyint(1) DEFAULT NULL,
+ `creditClassificationFk` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `CreditInsurance_Fk1_idx` (`creditClassification`),
- CONSTRAINT `CreditInsurance_Fk1` FOREIGN KEY (`creditClassification`) REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+ KEY `creditInsurance_creditClassificationFk` (`creditClassificationFk`),
+ CONSTRAINT `CreditInsurance_Fk1` FOREIGN KEY (`creditClassification`) REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito';
/*!40101 SET character_set_client = @saved_cs_client */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`creditInsurance_beforeInsert`
+ BEFORE INSERT ON `creditInsurance`
+ FOR EACH ROW
+BEGIN
+ IF NEW.creditClassificationFk THEN
+ SET NEW.creditClassification = NEW.creditClassificationFk;
+ END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
@@ -26546,10 +26284,12 @@ DROP TABLE IF EXISTS `deviceProductionUser`;
CREATE TABLE `deviceProductionUser` (
`deviceProductionFk` int(11) NOT NULL,
`userFk` int(10) unsigned NOT NULL,
- PRIMARY KEY (`deviceProductionFk`,`userFk`),
+ `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`deviceProductionFk`),
+ UNIQUE KEY `deviceProductionUser_UN` (`userFk`),
KEY `userFgn_idx` (`userFk`),
- CONSTRAINT `deviceProductionFgn` FOREIGN KEY (`deviceProductionFk`) REFERENCES `deviceProduction` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `userFgn` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+ CONSTRAINT `deviceProductionUser_FK` FOREIGN KEY (`deviceProductionFk`) REFERENCES `deviceProduction` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `deviceProductionUser_PK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -27013,6 +26753,7 @@ CREATE TABLE `ektEntryAssign` (
`kop` int(11) DEFAULT NULL,
`sub` mediumint(8) unsigned DEFAULT NULL,
`pro` mediumint(8) unsigned DEFAULT NULL,
+ `auction` int(11) DEFAULT NULL,
`warehouseOutFk` int(11) DEFAULT NULL,
`warehouseInFk` int(11) DEFAULT NULL,
`agencyModeFk` int(11) DEFAULT NULL,
@@ -27102,7 +26843,7 @@ CREATE TABLE `entry` (
`dated` datetime NOT NULL,
`ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`isBooked` tinyint(1) NOT NULL DEFAULT '0',
- `isExcludedFromAvailable` tinyint(1) NOT NULL DEFAULT 0,
+ `isExcludedFromAvailable` tinyint(1) NOT NULL DEFAULT '0',
`notes` longtext COLLATE utf8_unicode_ci,
`isConfirmed` tinyint(1) NOT NULL DEFAULT '0',
`isOrdered` tinyint(1) NOT NULL DEFAULT '0',
@@ -27120,6 +26861,7 @@ CREATE TABLE `entry` (
`kop` int(11) DEFAULT NULL,
`sub` mediumint(8) unsigned DEFAULT NULL,
`pro` mediumint(8) unsigned DEFAULT NULL,
+ `auction` int(11) DEFAULT NULL,
`invoiceAmount` decimal(10,2) DEFAULT NULL,
`buyerFk` int(10) unsigned DEFAULT NULL,
PRIMARY KEY (`id`),
@@ -27341,28 +27083,6 @@ CREATE TABLE `entryConfig` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
---
--- Temporary table structure for view `entryList`
---
-
-DROP TABLE IF EXISTS `entryList`;
-/*!50001 DROP VIEW IF EXISTS `entryList`*/;
-SET @saved_cs_client = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE TABLE `entryList` (
- `entryFk` tinyint NOT NULL,
- `isHere` tinyint NOT NULL,
- `landed` tinyint NOT NULL,
- `supplier` tinyint NOT NULL,
- `entryRef` tinyint NOT NULL,
- `agency` tinyint NOT NULL,
- `travelRef` tinyint NOT NULL,
- `appointment` tinyint NOT NULL,
- `supplierFk` tinyint NOT NULL,
- `warehouseInFk` tinyint NOT NULL
-) ENGINE=MyISAM */;
-SET character_set_client = @saved_cs_client;
-
--
-- Table structure for table `entryLog`
--
@@ -28383,6 +28103,21 @@ DROP TABLE IF EXISTS `expence`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `expence` (
+ `id` varchar(10) NOT NULL,
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+ `isWithheld` tinyint(4) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `expence__`
+--
+
+DROP TABLE IF EXISTS `expence__`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `expence__` (
`id` varchar(10) NOT NULL,
`taxTypeFk` tinyint(4) NOT NULL,
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -28628,6 +28363,7 @@ CREATE TABLE `greuge` (
KEY `greuges_type_fk_idx` (`greugeTypeFk`),
KEY `Id_Ticket_Greuge_Ticket_idx` (`ticketFk`),
KEY `Greuges_cliente_idx` (`clientFk`),
+ KEY `greuge_shipped_IDX` (`shipped`) USING BTREE,
CONSTRAINT `Id_Ticket_Greuge_Ticket` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `greuges_type_fk` FOREIGN KEY (`greugeTypeFk`) REFERENCES `greugeType` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT;
@@ -28645,7 +28381,7 @@ DELIMITER ;;
BEFORE UPDATE ON `greuge`
FOR EACH ROW
BEGIN
- DECLARE vMaxDate DATETIME DEFAULT TIMESTAMPADD(YEAR,1,util.VN_CURDATE());
+ DECLARE vMaxDate DATETIME DEFAULT TIMESTAMPADD(YEAR,1,CURDATE());
IF NEW.shipped > vMaxDate THEN
SET NEW.shipped = vMaxDate;
@@ -28667,6 +28403,7 @@ DROP TABLE IF EXISTS `greugeConfig`;
CREATE TABLE `greugeConfig` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`freightPickUpPrice` decimal(10,2) NOT NULL,
+ `yearsToDelete` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -28737,7 +28474,7 @@ DELIMITER ;;
BEFORE UPDATE ON `host`
FOR EACH ROW
BEGIN
- SET new.updated = util.VN_NOW();
+ SET new.updated = NOW();
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -28745,6 +28482,38 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
+--
+-- Table structure for table `improvedGeneralLog`
+--
+
+DROP TABLE IF EXISTS `improvedGeneralLog`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `improvedGeneralLog` (
+ `user` char(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `db` char(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `tables` char(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `type` set('Select','Insert','Update','Delete') COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`user`,`db`,`tables`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `improvedGeneralLogProcedures`
+--
+
+DROP TABLE IF EXISTS `improvedGeneralLogProcedures`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `improvedGeneralLogProcedures` (
+ `user` char(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `db` varchar(250) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `routine` char(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `type` enum('FUNCTION','PROCEDURE') COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`user`,`db`,`routine`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `incoterms`
--
@@ -28981,7 +28750,7 @@ CREATE TABLE `invoiceIn` (
KEY `recibida_ibfk_6` (`cplusRectificationTypeFk`),
KEY `recibida_ibfk_7` (`cplusTrascendency472Fk`),
KEY `invoiceIn_withholdingFk_idx` (`withholdingSageFk`),
- KEY `invoiceIn_expenceFkDeductible` (`expenceFkDeductible`),
+ KEY `invoiceIn_expenceFkDeductible_idx` (`expenceFkDeductible`),
CONSTRAINT `invoiceIn_expenceFkDeductible` FOREIGN KEY (`expenceFkDeductible`) REFERENCES `expence` (`id`) ON UPDATE CASCADE,
CONSTRAINT `invoiceIn_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
CONSTRAINT `invoiceIn_ibfk_2` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
@@ -29184,7 +28953,7 @@ BEGIN
JOIN vn.payMethod pm ON pm.id = s.payMethodFk
WHERE ii.id = NEW.invoiceInFk;
- IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified)
+ IF (NEW.dueDated <= CURDATE() AND vIsNotified)
THEN
CALL mail_insert(
'begonya@verdnatura.es',
@@ -29224,7 +28993,7 @@ BEGIN
JOIN vn.payMethod pm ON pm.id = s.payMethodFk
WHERE ii.id = NEW.invoiceInFk;
- IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified)
+ IF (NEW.dueDated <= CURDATE() AND vIsNotified)
THEN
CALL mail_insert(
'begonya@verdnatura.es',
@@ -29333,12 +29102,12 @@ CREATE TABLE `invoiceInSage` (
`withholdingSageFk` smallint(6) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `invoiceInSafe_unique` (`taxClassFk`,`invoiceInSerialFk`,`isService`,`withholdingSageFk`),
- KEY `invoiceInSage_expenceFk` (`expenceFk`),
KEY `invoiceInSage_withholdingSageFk` (`withholdingSageFk`),
KEY `invoiceInSage_taxClassFk` (`taxClassFk`),
KEY `invoiceInSage_invoiceInSerialFk` (`invoiceInSerialFk`),
KEY `invoiceInSage_taxTypeSageFk` (`taxTypeSageFk`),
KEY `invoiceInSage_transactionTypeSageFk` (`transactionTypeSageFk`),
+ KEY `invoiceInSage_idx` (`expenceFk`),
CONSTRAINT `invoiceInSage_expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON UPDATE CASCADE,
CONSTRAINT `invoiceInSage_invoiceInSerialFk` FOREIGN KEY (`invoiceInSerialFk`) REFERENCES `invoiceInSerial` (`code`) ON UPDATE CASCADE,
CONSTRAINT `invoiceInSage_taxClassFk` FOREIGN KEY (`taxClassFk`) REFERENCES `taxClass` (`code`) ON UPDATE CASCADE,
@@ -29388,12 +29157,12 @@ CREATE TABLE `invoiceInTax` (
PRIMARY KEY (`id`),
KEY `recibida_id` (`invoiceInFk`),
KEY `recibida_iva_ibfk_2` (`taxCodeFk`),
- KEY `recibida_iva_gastos_id` (`expenceFk`),
KEY `recibida_iva_taxTypeSageFk` (`taxTypeSageFk`),
KEY `invoiceInTax_transactionTypeSageFk_idx` (`transactionTypeSageFk`),
+ KEY `invoiceInTax_idx` (`expenceFk`),
+ CONSTRAINT `invoiceInTax_expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON UPDATE CASCADE,
CONSTRAINT `invoiceInTax_ibfk_5` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `invoiceInTax_transactionTypeSageFk` FOREIGN KEY (`transactionTypeSageFk`) REFERENCES `sage`.`TiposTransacciones` (`CodigoTransaccion`) ON UPDATE CASCADE,
- CONSTRAINT `recibida_iva_gastos_id` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `recibida_iva_taxTypeSageFk` FOREIGN KEY (`taxTypeSageFk`) REFERENCES `sage`.`TiposIva` (`CodigoIva`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -29497,7 +29266,7 @@ BEGIN
SELECT CONCAT(NEW.serial,
IFNULL(RIGHT(MAX(i.ref), LENGTH(i.ref)-1) ,
- RPAD(CONCAT(c.sage200Company, RIGHT(YEAR(util.VN_CURDATE()), 2)), 7,'0')) + 1) INTO vRef
+ RPAD(CONCAT(c.sage200Company, RIGHT(YEAR(CURDATE()), 2)), 7,'0')) + 1) INTO vRef
FROM invoiceOut i
LEFT JOIN company c ON c.id = i.companyFk
WHERE i.serial = NEW.serial
@@ -29507,7 +29276,7 @@ BEGIN
SELECT CONCAT(NEW.serial,
IFNULL(RIGHT(MAX(i.ref), LENGTH(i.ref)-1) ,
- RPAD(CONCAT(c.sage200Company, RIGHT(YEAR(util.VN_CURDATE()), 2)), 8,'0')) + 1) INTO vRef
+ RPAD(CONCAT(c.sage200Company, RIGHT(YEAR(CURDATE()), 2)), 8,'0')) + 1) INTO vRef
FROM invoiceOut i
LEFT JOIN company c ON c.id = i.companyFk
WHERE i.serial = NEW.serial
@@ -29612,7 +29381,7 @@ CREATE TABLE `invoiceOutExpence` (
`created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
KEY `invoiceOutExpence_FK_1_idx` (`invoiceOutFk`),
- KEY `invoiceOutExpence_FK_2_idx` (`expenceFk`),
+ KEY `invoiceOutExpence_expenceFk_idx` (`expenceFk`),
CONSTRAINT `invoiceOutExpence_FK_1` FOREIGN KEY (`invoiceOutFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `invoiceOutExpence_expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta';
@@ -29786,7 +29555,6 @@ CREATE TABLE `item` (
KEY `producer_id` (`producerFk`),
KEY `ArticlesIsActive_idx` (`isActive`),
KEY `item_ibfk_6_idx` (`sectorFk__`),
- KEY `item_expenceFk` (`expenceFk`),
KEY `Article` (`name`,`subName`,`value5`,`value6`,`value7`,`value8`,`value9`,`value10`),
KEY `item_id10` (`embalageCode`),
KEY `item_id11` (`numberOfItemsPerCask`),
@@ -29796,6 +29564,7 @@ CREATE TABLE `item` (
KEY `item_size_IDX` (`size`) USING BTREE,
KEY `item_size_IDX2` (`longName`) USING BTREE,
KEY `item_lastUsed_IDX` (`lastUsed`) USING BTREE,
+ KEY `item_expenceFk_idx` (`expenceFk`),
CONSTRAINT `item_FK` FOREIGN KEY (`genericFk`) REFERENCES `item` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `item_expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON UPDATE CASCADE,
CONSTRAINT `item_family` FOREIGN KEY (`family`) REFERENCES `itemFamily` (`code`) ON UPDATE CASCADE,
@@ -30250,7 +30019,7 @@ BEGIN
JOIN vn.route r ON r.id = t.routeFk
WHERE r.isOk = FALSE
AND ic.itemFk = NEW.itemFk
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
CALL mail_insert(
@@ -31933,6 +31702,7 @@ CREATE TABLE `mdbVersion` (
`app` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`branchFk` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`version` int(11) DEFAULT NULL,
+ PRIMARY KEY (`app`,`branchFk`),
KEY `mdbVersion_branchFk` (`branchFk`),
CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -32111,6 +31881,39 @@ CREATE TABLE `mrw` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `mrwService`
+--
+
+DROP TABLE IF EXISTS `mrwService`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mrwService` (
+ `agencyModeCodeFk` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+ `clientType` int(11) unsigned NOT NULL,
+ `serviceType` int(11) unsigned DEFAULT NULL,
+ PRIMARY KEY (`agencyModeCodeFk`),
+ CONSTRAINT `mrwService_agencyModeCodeFk` FOREIGN KEY (`agencyModeCodeFk`) REFERENCES `agencyMode` (`code`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Configuración de los servicios de MRW';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mrwServiceWeekday`
+--
+
+DROP TABLE IF EXISTS `mrwServiceWeekday`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mrwServiceWeekday` (
+ `agencyModeCodeFk` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+ `weekdays` set('mon','tue','wed','thu','fri','sat','sun') COLLATE utf8_unicode_ci NOT NULL,
+ `serviceType` int(11) unsigned NOT NULL,
+ `params` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`agencyModeCodeFk`),
+ CONSTRAINT `mrwServiceWeekday_agencyModeCodeFk` FOREIGN KEY (`agencyModeCodeFk`) REFERENCES `agencyMode` (`code`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Configuración de los servicios en relación con el día de la semana para MRW';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `newBornSales`
--
@@ -32424,12 +32227,15 @@ CREATE TABLE `packingSite` (
`code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
`hostFk` int(11) NOT NULL,
`printerFk` tinyint(3) unsigned DEFAULT NULL,
+ `collectionFk` int(11) DEFAULT NULL COMMENT 'Last collection packed on this site',
PRIMARY KEY (`id`),
UNIQUE KEY `packingSite_UN` (`code`),
KEY `packingSite_FK_1` (`printerFk`),
KEY `packingSite_FK` (`hostFk`),
+ KEY `packingSite_FK_2` (`collectionFk`),
CONSTRAINT `packingSite_FK` FOREIGN KEY (`hostFk`) REFERENCES `host` (`id`),
- CONSTRAINT `packingSite_FK_1` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`)
+ CONSTRAINT `packingSite_FK_1` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`),
+ CONSTRAINT `packingSite_FK_2` FOREIGN KEY (`collectionFk`) REFERENCES `collection` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -32873,13 +32679,27 @@ CREATE TABLE `periodicityType` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `person`
+-- Temporary table structure for view `personMedia`
--
-DROP TABLE IF EXISTS `person`;
+DROP TABLE IF EXISTS `personMedia`;
+/*!50001 DROP VIEW IF EXISTS `personMedia`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `personMedia` (
+ `workerFk` tinyint NOT NULL,
+ `mediaValue` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `person__`
+--
+
+DROP TABLE IF EXISTS `person__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `person` (
+CREATE TABLE `person__` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`firstname` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
`surnames` varchar(60) COLLATE utf8_unicode_ci NOT NULL,
@@ -32903,18 +32723,18 @@ CREATE TABLE `person` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Temporary table structure for view `personMedia`
+-- Table structure for table `personalProtectionEquipment`
--
-DROP TABLE IF EXISTS `personMedia`;
-/*!50001 DROP VIEW IF EXISTS `personMedia`*/;
-SET @saved_cs_client = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE TABLE `personMedia` (
- `workerFk` tinyint NOT NULL,
- `mediaValue` tinyint NOT NULL
-) ENGINE=MyISAM */;
-SET character_set_client = @saved_cs_client;
+DROP TABLE IF EXISTS `personalProtectionEquipment`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `personalProtectionEquipment` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `pgc`
@@ -33153,7 +32973,7 @@ CREATE TABLE `ppe` (
`endowment` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
`elementAccount` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
`nature` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
- `location` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `location` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
`discharged` date DEFAULT NULL,
`cause` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`photo` blob,
@@ -33169,6 +32989,8 @@ CREATE TABLE `ppe` (
KEY `ppe_fk5_idx` (`account`),
KEY `ppe_fk6` (`endowment`),
KEY `ppe_fk7` (`elementAccount`),
+ KEY `ppe_FK` (`location`),
+ CONSTRAINT `ppe_FK` FOREIGN KEY (`location`) REFERENCES `ppeLocation` (`code`) ON UPDATE CASCADE,
CONSTRAINT `ppe_fk1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `ppe_fk2` FOREIGN KEY (`planFk`) REFERENCES `ppePlan` (`id`) ON UPDATE CASCADE,
CONSTRAINT `ppe_fk3` FOREIGN KEY (`groupFk`) REFERENCES `ppeGroup` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
@@ -33232,6 +33054,20 @@ CREATE TABLE `ppeGroup` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tipo de inmovilizado';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `ppeLocation`
+--
+
+DROP TABLE IF EXISTS `ppeLocation`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ppeLocation` (
+ `code` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `description` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `ppePlan`
--
@@ -33392,47 +33228,13 @@ CREATE TABLE `printQueueConfig` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `printServerQueue`
+-- Table structure for table `printServerQueue2__`
--
-DROP TABLE IF EXISTS `printServerQueue`;
+DROP TABLE IF EXISTS `printServerQueue2__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `printServerQueue` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `printerFk` tinyint(3) unsigned DEFAULT NULL,
- `priorityFk` tinyint(3) unsigned DEFAULT NULL,
- `labelReportFk` tinyint(3) unsigned DEFAULT NULL,
- `statusFk` tinyint(3) unsigned DEFAULT '1',
- `started` datetime DEFAULT NULL,
- `finished` datetime DEFAULT NULL,
- `param1` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
- `workerFk` int(11) DEFAULT NULL,
- `param2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
- `param3` text COLLATE utf8_unicode_ci,
- `error` text COLLATE utf8_unicode_ci,
- `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `reportFk__` tinyint(3) unsigned DEFAULT NULL,
- PRIMARY KEY (`id`),
- KEY `Id_estado` (`statusFk`),
- KEY `Id_Impresora` (`printerFk`),
- KEY `Id_Prioridad` (`priorityFk`),
- KEY `Id_Trabajador` (`workerFk`),
- KEY `printServerQueue_FK` (`labelReportFk`),
- CONSTRAINT `printServerQueue_FK` FOREIGN KEY (`labelReportFk`) REFERENCES `report` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `printServerQueue_ibfk_3` FOREIGN KEY (`priorityFk`) REFERENCES `queuePriority` (`id`) ON UPDATE CASCADE,
- CONSTRAINT `printServerQueue_printerFk` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `printServerQueue2`
---
-
-DROP TABLE IF EXISTS `printServerQueue2`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `printServerQueue2` (
+CREATE TABLE `printServerQueue2__` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`printerFk` tinyint(3) unsigned DEFAULT NULL,
`priorityFk` tinyint(3) unsigned DEFAULT NULL,
@@ -33539,10 +33341,31 @@ CREATE TABLE `producer` (
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`producer_afterUpdate`
- AFTER INSERT ON `producer` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`producer_afterInsert`
+ AFTER INSERT ON `producer`
+ FOR EACH ROW
+BEGIN
+ CALL util.debugAdd('producer_insert',CONCAT(NEW.name, NEW.id));
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER producer_beforeDelete
+BEFORE DELETE
+ON producer FOR EACH ROW
BEGIN
- CALL util.debugAdd('producer',CONCAT(NEW.name, NEW.id));
+ CALL util.debugAdd('producer_delete',CONCAT(OLD.name, OLD.id));
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -33636,7 +33459,7 @@ CREATE TABLE `profile` (
PRIMARY KEY (`id`),
KEY `personFk` (`personFk`),
KEY `profileTypeFk` (`profileTypeFk`),
- CONSTRAINT `profile_ibfk_1` FOREIGN KEY (`personFk`) REFERENCES `person` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `profile_ibfk_1` FOREIGN KEY (`personFk`) REFERENCES `person__` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `profile_ibfk_2` FOREIGN KEY (`profileTypeFk`) REFERENCES `profileType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -34306,6 +34129,22 @@ CREATE TABLE `report` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `returnBuckets`
+--
+
+DROP TABLE IF EXISTS `returnBuckets`;
+/*!50001 DROP VIEW IF EXISTS `returnBuckets`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `returnBuckets` (
+ `id` tinyint NOT NULL,
+ `freightContainerType` tinyint NOT NULL,
+ `freightPackagingEmpty` tinyint NOT NULL,
+ `freightPackagingFull` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Temporary table structure for view `role`
--
@@ -34337,8 +34176,8 @@ CREATE TABLE `route` (
`agencyModeFk` int(11) DEFAULT NULL,
`time` datetime DEFAULT NULL,
`isOk` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `kmStart` mediumint(9) NOT NULL,
- `kmEnd` mediumint(9) NOT NULL,
+ `kmStart` mediumint(9) DEFAULT NULL,
+ `kmEnd` mediumint(9) DEFAULT NULL,
`started` datetime NOT NULL,
`finished` datetime NOT NULL,
`gestdocFk` int(11) DEFAULT NULL,
@@ -34349,6 +34188,7 @@ CREATE TABLE `route` (
`priority` int(11) NOT NULL DEFAULT '0',
`invoiceInFk` mediumint(8) unsigned DEFAULT NULL,
`beachFk` int(11) DEFAULT NULL,
+ `commissionWorkCenterFk` int(11) DEFAULT NULL COMMENT 'WorkerCenter que gestiona la ruta',
PRIMARY KEY (`id`),
KEY `Id_Agencia` (`agencyModeFk`),
KEY `Fecha` (`created`),
@@ -34357,7 +34197,9 @@ CREATE TABLE `route` (
KEY `fk_route_1_idx` (`zoneFk`),
KEY `asdfasdf_idx` (`invoiceInFk`),
KEY `route_idxIsOk` (`isOk`),
+ KEY `route_WorkCenterFk_idx` (`commissionWorkCenterFk`),
CONSTRAINT `fk_route_1` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ CONSTRAINT `route_WorkCenterFk` FOREIGN KEY (`commissionWorkCenterFk`) REFERENCES `workCenter` (`id`) ON UPDATE CASCADE,
CONSTRAINT `route_fk5` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `route_ibfk_1` FOREIGN KEY (`gestdocFk`) REFERENCES `dms` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `route_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
@@ -34373,13 +34215,15 @@ CREATE TABLE `route` (
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_AFTER_INSERT`
- AFTER INSERT ON `route`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_beforeInsert`
+ BEFORE INSERT ON `route`
FOR EACH ROW
BEGIN
- IF NEW.kmEnd < NEW.kmStart AND NEW.kmEnd <> 0 THEN
- CALL util.throw ('KmEnd menor que kmStart');
- END IF;
+ SET NEW.commissionWorkCenterFk = (
+ SELECT IFNULL(wl.workCenterFK, r.defaultWorkCenterFk)
+ FROM vn.routeConfig r
+ LEFT JOIN vn.workerLabour wl ON wl.workerFk = account.myUser_getId()
+ AND NEW.created BETWEEN wl.started AND IFNULL(wl.ended, NEW.created));
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -34399,6 +34243,8 @@ DELIMITER ;;
BEFORE UPDATE ON `route`
FOR EACH ROW
BEGIN
+ DECLARE vKmMax INT;
+
IF NEW.isOk <> FALSE AND OLD.isOk = FALSE THEN
SET NEW.m3 = ( SELECT SUM(litros)/1000
FROM vn.saleVolume s
@@ -34409,6 +34255,14 @@ BEGIN
IF NEW.kmEnd < NEW.kmStart AND NEW.kmEnd <> 0 THEN
CALL util.throw ('KmEnd menor que kmStart');
END IF;
+
+ SELECT kmMax INTO vKmMax
+ FROM routeConfig rc;
+
+ IF ((NEW.kmEnd - NEW.kmStart) > vKmMax) AND NEW.kmEnd <> 0 THEN
+ CALL util.throw (CONCAT('The km can not exceed ', vKmMax));
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -34428,6 +34282,7 @@ DELIMITER ;;
AFTER UPDATE ON `route`
FOR EACH ROW
BEGIN
+
IF IFNULL(NEW.gestdocFk,0) <> IFNULL(OLD.gestdocFk,0) AND NEW.gestdocFk > 0 THEN
-- JGF 09/09/14 cuando se añade un gestdoc a una ruta, se le asigna automagicamente a todos sus Tickets
@@ -34441,6 +34296,15 @@ BEGIN
JOIN ticketDms tg ON t.id = tg.ticketFk
SET isSigned = 1 WHERE t.routeFk = NEW.id;
END IF;
+
+ IF !(NEW.kmStart <=> OLD.kmStart)
+ OR !(NEW.kmEnd <=> OLD.kmEnd)
+ OR !(NEW.workerFk <=> OLD.workerFk)
+ OR !(NEW.m3 <=> OLD.m3)
+ OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)THEN
+ CALL route_calcCommission(NEW.id);
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -34463,6 +34327,32 @@ CREATE TABLE `routeAction` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `routeCommission`
+--
+
+DROP TABLE IF EXISTS `routeCommission`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `routeCommission` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `routeFk` int(10) unsigned NOT NULL,
+ `workCenterFk` int(11) DEFAULT NULL,
+ `km` decimal(5,2) DEFAULT NULL,
+ `m3` decimal(5,2) DEFAULT NULL,
+ `yearlyKm` decimal(5,2) DEFAULT NULL,
+ `yearlyM3` decimal(5,2) DEFAULT NULL,
+ `cat4m3` decimal(5,2) DEFAULT NULL,
+ `cat5m3` decimal(5,2) DEFAULT NULL,
+ `freelanceYearlyM3` decimal(5,2) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `routeCommission_routeFk_idx` (`routeFk`),
+ KEY `routeCommission_workCenterFk_idx` (`workCenterFk`),
+ CONSTRAINT `routeCommission_routeFk` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `routeCommission_workCenterFk` FOREIGN KEY (`workCenterFk`) REFERENCES `workCenter` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `routeComplement`
--
@@ -34514,6 +34404,26 @@ CREATE TABLE `routeConfig` (
`plusCategory1Concept` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`plusCategory2Concept` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`defaultCompanyFk` smallint(5) unsigned DEFAULT '442',
+ `kmHeavy` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por kilometro vehículo pesado',
+ `kmLight` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por kilometro vehículo ligero',
+ `kmYearly` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por kilometro objetivo anual',
+ `m3Yearly` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por m3 objetivo anual',
+ `deliveryM3Cat4` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por m3 repartido Cat.IV',
+ `deliveryM3Cat5` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por m3 repartido Cat. V',
+ `plusCat2Fixed` decimal(5,2) DEFAULT NULL COMMENT 'Plus fijo Cat.II vehículo ligero',
+ `plusCat2Variable` decimal(5,2) DEFAULT NULL COMMENT 'Plus variable Cat.II vehículo ligero',
+ `plusCat3Fixed` decimal(5,2) DEFAULT NULL COMMENT 'Plus fijo Cat.III vehículo pesado',
+ `plusCat3Variable` decimal(5,2) DEFAULT NULL COMMENT 'Plus variable Cat.III vehículo pesado',
+ `distributionCat4M3` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por gestión de la distribución Cat IV',
+ `distributionCat5M3` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por gestión de la distribución Cat V',
+ `rateCat4` decimal(5,2) DEFAULT NULL COMMENT 'Ratio aplicado a la media de venta de los repartidores para el cálculo de las comisiones de enrutadores Cat IV',
+ `rateCat5` decimal(5,2) DEFAULT NULL COMMENT 'Ratio aplicado a la media de venta de los repartidores para el cálculo de las comisiones de enrutadores Cat V',
+ `freelanceM3` decimal(5,2) DEFAULT NULL COMMENT 'Comisión para enrutadores sobre rutas de autónomos',
+ `freelanceMinM3` decimal(5,2) DEFAULT NULL COMMENT 'Metros mínimos para considerar las rutas de autónomos',
+ `mainlineDelivered` decimal(5,2) DEFAULT NULL COMMENT 'Comisión para entregas troncales',
+ `cutoffDated` date DEFAULT NULL COMMENT 'Fecha a partir de la cual se autoriza calcular la comisión',
+ `defaultWorkCenterFk` int(11) DEFAULT '9' COMMENT 'Para el cálculo de las comisiones, en caso de el creador de la ruta no tenga workCenter',
+ `kmMax` int(11) DEFAULT '4000' COMMENT 'Máximo número de km validos para una ruta',
PRIMARY KEY (`id`),
KEY `routeConfig_FK` (`defaultCompanyFk`),
CONSTRAINT `routeConfig_FK` FOREIGN KEY (`defaultCompanyFk`) REFERENCES `company` (`id`)
@@ -34774,7 +34684,7 @@ BEGIN
JOIN vn.route r ON r.id = t.routeFk
WHERE r.isOk = FALSE
AND s.id = NEW.id
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
END IF;
@@ -34901,7 +34811,7 @@ BEGIN
JOIN vn.route r ON r.id = t.routeFk
WHERE r.isOk = FALSE
AND s.id = NEW.id
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
END IF;
@@ -34947,7 +34857,7 @@ BEGIN
JOIN vn.route r ON r.id = t.routeFk
WHERE r.isOk = FALSE
AND s.id = OLD.id
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
END IF;
END */;;
@@ -35869,8 +35779,8 @@ DELIMITER ;;
BEFORE INSERT ON `sharingClient`
FOR EACH ROW
BEGIN
- SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended);
- SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started);
+ SET NEW.ended = GREATEST(CURDATE(),NEW.ended);
+ SET NEW.started = GREATEST(CURDATE(),NEW.started);
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -35890,8 +35800,8 @@ DELIMITER ;;
BEFORE UPDATE ON `sharingClient`
FOR EACH ROW
BEGIN
- SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended);
- SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started);
+ SET NEW.ended = GREATEST(CURDATE(),NEW.ended);
+ SET NEW.started = GREATEST(CURDATE(),NEW.started);
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -36896,7 +36806,10 @@ DROP TABLE IF EXISTS `tagAbbreviation`;
CREATE TABLE `tagAbbreviation` (
`value` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
`abbreviation` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
- PRIMARY KEY (`value`)
+ `tagFk` int(11) DEFAULT NULL,
+ PRIMARY KEY (`value`),
+ KEY `tagAbbreviation_FK` (`tagFk`),
+ CONSTRAINT `tagAbbreviation_FK` FOREIGN KEY (`tagFk`) REFERENCES `tag` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -37126,7 +37039,7 @@ CREATE TABLE `ticket` (
CONSTRAINT `ticket_ibfk_9` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `tickets_fk11` FOREIGN KEY (`collectionFk__`) REFERENCES `collection` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `tickets_zone_fk` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3750016 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -37170,8 +37083,8 @@ BEGIN
WHERE c.id = NEW.clientFk;
INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped)
- VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, util.VN_CURDATE()), util.VN_CURDATE())
- ON DUPLICATE KEY UPDATE lastShipped = util.VN_CURDATE();
+ VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, CURDATE()), CURDATE())
+ ON DUPLICATE KEY UPDATE lastShipped = CURDATE();
END IF;
@@ -37202,7 +37115,7 @@ BEGIN
FROM vn.route r
WHERE r.isOk = FALSE
AND r.id IN (OLD.routeFk,NEW.routeFk)
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
call util.debugAdd(NEW.id,CONCAT(OLD.routeFk,' ',NEW.routeFk));
END IF;
@@ -37226,7 +37139,7 @@ BEGIN
JOIN vn.route r ON r.id = t.routeFk
WHERE r.isOk = FALSE
AND t.id = NEW.id
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T');
SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
@@ -37335,7 +37248,7 @@ BEGIN
FROM vn.route r
WHERE r.isOk = FALSE
AND r.id = OLD.routeFk
- AND r.created >= util.VN_CURDATE()
+ AND r.created >= CURDATE()
GROUP BY r.id;
DELETE FROM sale WHERE ticketFk = OLD.id;
@@ -37862,10 +37775,12 @@ DROP TABLE IF EXISTS `ticketRecalc`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `ticketRecalc` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`ticketFk` int(11) NOT NULL,
- PRIMARY KEY (`ticketFk`),
+ PRIMARY KEY (`id`),
+ KEY `ticketRecalc_ibfk_1` (`ticketFk`),
CONSTRAINT `ticketRecalc_ibfk_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Queue of changed tickets to recalc its total';
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Queue of changed tickets to recalc its total';
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -38140,7 +38055,7 @@ CREATE TABLE `ticketServiceType` (
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
`expenceFk` varchar(10) NOT NULL DEFAULT '7050000000',
PRIMARY KEY (`id`),
- KEY `ticketServiceType_expenceFk` (`expenceFk`),
+ KEY `ticketServiceType_expenceFk_idx` (`expenceFk`),
CONSTRAINT `ticketServiceType_expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COMMENT='Lista de los posibles servicios a elegir';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -38652,14 +38567,17 @@ CREATE TABLE `travel` (
`cargoSupplierFk` int(11) DEFAULT NULL,
`totalEntries` tinyint(4) unsigned DEFAULT '0',
`appointment` datetime DEFAULT NULL,
+ `agencyModeFk` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `shipment_2` (`shipped`,`landed`,`warehouseInFk`,`warehouseOutFk`,`agencyFk`,`ref`),
+ UNIQUE KEY `shipment_1` (`shipped`,`landed`,`warehouseInFk`,`warehouseOutFk`,`agencyFk`,`agencyModeFk`,`ref`),
KEY `agency_id` (`agencyFk`),
KEY `shipment` (`shipped`),
KEY `landing` (`landed`),
KEY `warehouse_landing` (`warehouseInFk`,`landed`),
KEY `warehouse_out_shipment` (`warehouseOutFk`,`shipped`),
KEY `travel_ibfk_4_idx` (`cargoSupplierFk`),
+ KEY `travel_FK` (`agencyModeFk`),
+ CONSTRAINT `travel_FK` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE,
CONSTRAINT `travel_ibfk_1` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
CONSTRAINT `travel_ibfk_2` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
CONSTRAINT `travel_ibfk_3` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE
@@ -38679,6 +38597,15 @@ DELIMITER ;;
FOR EACH ROW
BEGIN
CALL travel_checkDates(NEW.shipped, NEW.landed);
+
+ -- Actualizar agencyFk y agencyModeFk
+ IF NEW.agencyFk THEN
+ SET NEW.agencyModeFk = NEW.agencyFk;
+ END IF;
+
+ IF NEW.agencyModeFk THEN
+ SET NEW.agencyFk = NEW.agencyModeFk;
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -38702,6 +38629,15 @@ BEGIN
OR !(NEW.shipped <=> OLD.shipped) THEN
CALL travel_checkDates(NEW.shipped, NEW.landed);
END IF;
+
+ -- Actualizar agencyFk y agencyModeFk
+ IF !(NEW.agencyFk <=> OLD.agencyFk)THEN
+ SET NEW.agencyModeFk = NEW.agencyFk;
+ END IF;
+
+ IF !(NEW.agencyModeFk <=> OLD.agencyModeFk) THEN
+ SET NEW.agencyFk = NEW.agencyModeFk;
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -39334,22 +39270,10 @@ CREATE TABLE `worker` (
`code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
`firstName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`lastName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
- `password__` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
- `email__` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
- `extension__` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
`sub` int(11) unsigned DEFAULT NULL,
- `user__` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
- `typeBussines__` varchar(30) CHARACTER SET utf8 DEFAULT 'no dejar vacio' COMMENT 'campo obsoleto, actualmente se rellena en laboral',
- `laborCategory__` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
- `started__` datetime DEFAULT NULL,
- `ended__` datetime DEFAULT NULL,
- `notes__` varchar(254) COLLATE utf8_unicode_ci DEFAULT NULL,
`photo` blob,
- `fi__` varchar(9) COLLATE utf8_unicode_ci DEFAULT NULL,
- `address__` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
- `birthed__` date NOT NULL,
- `phone` varchar(9) COLLATE utf8_unicode_ci NOT NULL,
- `clientFk__` int(11) DEFAULT NULL,
+ `phone` varchar(9) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `mobileExtension` int(4) DEFAULT NULL,
`userFk` int(10) unsigned DEFAULT NULL,
`bossFk` int(11) NOT NULL DEFAULT '103',
`fiDueDate` datetime DEFAULT NULL,
@@ -39363,17 +39287,20 @@ CREATE TABLE `worker` (
`originCountryFk` mediumint(8) unsigned DEFAULT NULL COMMENT 'País de origen',
`educationLevelFk` smallint(6) DEFAULT NULL,
`SSN` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `fi` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `birth` date DEFAULT NULL,
+ `isDisable` tinyint(1) NOT NULL DEFAULT '0',
+ `isFreelance` tinyint(1) NOT NULL DEFAULT '0',
+ `isSsDiscounted` tinyint(1) NOT NULL DEFAULT '0',
+ `sex` enum('M','F') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'F' COMMENT 'M Masculino F Femenino',
PRIMARY KEY (`id`),
UNIQUE KEY `CodigoTrabajador_UNIQUE` (`code`),
- UNIQUE KEY `user` (`user__`),
UNIQUE KEY `user_id_UNIQUE` (`userFk`),
- UNIQUE KEY `Id_Cliente_Interno` (`clientFk__`),
KEY `sub` (`sub`),
KEY `boss_idx` (`bossFk`),
KEY `worker_FK` (`labelerFk`),
KEY `worker_FK_2` (`educationLevelFk`),
KEY `worker_FK_1` (`originCountryFk`),
- CONSTRAINT `Clientes` FOREIGN KEY (`clientFk__`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
CONSTRAINT `worker_FK` FOREIGN KEY (`labelerFk`) REFERENCES `printer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `worker_FK_1` FOREIGN KEY (`originCountryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE,
CONSTRAINT `worker_FK_2` FOREIGN KEY (`educationLevelFk`) REFERENCES `educationLevel` (`id`) ON UPDATE CASCADE,
@@ -39514,20 +39441,6 @@ SET character_set_client = utf8;
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
---
--- Temporary table structure for view `workerDepartmentTest`
---
-
-DROP TABLE IF EXISTS `workerDepartmentTest`;
-/*!50001 DROP VIEW IF EXISTS `workerDepartmentTest`*/;
-SET @saved_cs_client = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE TABLE `workerDepartmentTest` (
- `workerFk` tinyint NOT NULL,
- `departmentFk` tinyint NOT NULL
-) ENGINE=MyISAM */;
-SET character_set_client = @saved_cs_client;
-
--
-- Table structure for table `workerDisableExcluded`
--
@@ -39961,7 +39874,7 @@ DELIMITER ;;
AFTER INSERT ON `workerTimeControl`
FOR EACH ROW
BEGIN
- IF NEW.timed > DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY) THEN
+ IF NEW.timed > DATE_ADD(NOW(), INTERVAL 1 DAY) THEN
CALL util.throw('date in the future');
END IF;
END */;;
@@ -40379,7 +40292,7 @@ DELIMITER ;;
BEFORE INSERT ON `workingHours`
FOR EACH ROW
BEGIN
- IF (SELECT COUNT(*) FROM workingHours WHERE userId = NEW.userId AND DATE(timeIn) = util.VN_CURDATE()) > 0 THEN
+ IF (SELECT COUNT(*) FROM workingHours WHERE userId = NEW.userId AND DATE(timeIn) = CURDATE()) > 0 THEN
CALL util.throw ('ALREADY_LOGGED');
END IF;
END */;;
@@ -40594,7 +40507,7 @@ CREATE TABLE `zoneExclusionGeo` (
KEY `zoneExclusionGeo2_FK_1` (`geoFk`),
CONSTRAINT `zoneExclusionGeo_FK` FOREIGN KEY (`geoFk`) REFERENCES `zoneGeo` (`id`) ON UPDATE CASCADE,
CONSTRAINT `zoneExclusionGeo_FK_1` FOREIGN KEY (`zoneExclusionFk`) REFERENCES `zoneExclusion` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -41006,7 +40919,7 @@ DELIMITER ;;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `sale_checkWithoutComponents` ON SCHEDULE EVERY 10 MINUTE STARTS '2020-05-04 11:56:23' ON COMPLETION PRESERVE DISABLE DO call sale_checkNoComponents(DATE_ADD(util.VN_NOW(), INTERVAL -10 MINUTE),DATE_ADD(util.VN_NOW(), INTERVAL -1 MINUTE)) */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `sale_checkWithoutComponents` ON SCHEDULE EVERY 10 MINUTE STARTS '2020-05-04 11:56:23' ON COMPLETION PRESERVE DISABLE DO call sale_checkNoComponents(DATE_ADD(NOW(), INTERVAL -10 MINUTE),DATE_ADD(NOW(), INTERVAL -1 MINUTE)) */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -41024,7 +40937,7 @@ DELIMITER ;;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ticketClosure` ON SCHEDULE EVERY 1 DAY STARTS '2017-09-18 00:30:00' ON COMPLETION NOT PRESERVE DISABLE COMMENT 'Realiza el cierre de todos los almacenes del dia actual' DO CALL ticketClosureMultiWarehouse(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 DAY)) */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ticketClosure` ON SCHEDULE EVERY 1 DAY STARTS '2017-09-18 00:30:00' ON COMPLETION NOT PRESERVE DISABLE COMMENT 'Realiza el cierre de todos los almacenes del dia actual' DO CALL ticketClosureMultiWarehouse(DATE_ADD(CURDATE(), INTERVAL -1 DAY)) */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -41083,7 +40996,7 @@ DELIMITER ;;
SELECT week,year INTO vWeek,vYear
FROM vn.time
- WHERE dated IN (DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL -4 DAY))
+ WHERE dated IN (DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL -4 DAY))
GROUP BY year,week
LIMIT 1;
@@ -41140,36 +41053,19 @@ BEGIN
* @param vCompanyId Compañia desde la que se factura
* @return Código de area
*/
- DECLARE vTaxArea VARCHAR(25);
- DECLARE vClientIsUeeMember INT;
- DECLARE vSupplierIsUeeMember INT;
- DECLARE vSpainCountryCode INT DEFAULT 1;
- DECLARE vSupplierCountry INT;
- DECLARE vClientCountry INT;
- DECLARE vIsEqualizated BOOLEAN;
- DECLARE vIsVies BOOLEAN;
-
- SELECT cClient.isUeeMember, c.countryFk, a.isEqualizated, cSupplier.isUeeMember, s.countryFk, c.isVies
- INTO vClientIsUeeMember, vClientCountry, vIsEqualizated, vSupplierIsUeeMember, vSupplierCountry, vIsVies
- FROM address a
- JOIN `client` c ON c.id = a.clientFk
- JOIN country cClient ON cClient.id = c.countryFk
- JOIN supplier s ON s.id = vCompanyId
- JOIN country cSupplier ON cSupplier.id = s.countryFk
- WHERE a.id = vAddresId;
-
- CASE
- WHEN (NOT vClientIsUeeMember OR NOT vSupplierIsUeeMember) AND vSupplierCountry != vClientCountry THEN
- SET vTaxArea = 'WORLD';
- WHEN vClientIsUeeMember AND vSupplierIsUeeMember AND vClientCountry != vSupplierCountry AND vIsVies THEN
- SET vTaxArea = 'CEE';
- WHEN vIsEqualizated AND vClientCountry = vSpainCountryCode THEN
- SET vTaxArea = 'EQU';
- ELSE
- SET vTaxArea = 'NATIONAL';
- END CASE;
+ DECLARE vTaxArea VARCHAR(25);
- RETURN vTaxArea;
+ DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
+ CREATE TEMPORARY TABLE tmp.addressCompany
+ SELECT vAddresId addressFk, vCompanyId companyFk;
+
+ CALL vn.addressTaxArea();
+ SELECT areaFk INTO vTaxArea FROM tmp.addressTaxArea;
+ DROP TEMPORARY TABLE
+ tmp.addressCompany,
+ tmp.addressTaxArea;
+
+ RETURN vTaxArea;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -41427,7 +41323,7 @@ BEGIN
INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
SELECT vWarehouse, vItem, vComponentCost, vCost
FROM vn.rate
- WHERE dated <= util.VN_CURDATE()
+ WHERE dated <= CURDATE()
AND warehouseFk = vWarehouse
ORDER BY dated DESC
LIMIT 1;
@@ -41437,7 +41333,7 @@ BEGIN
/* INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost
FROM vn.rate
- WHERE dated <= util.VN_CURDATE()
+ WHERE dated <= CURDATE()
AND warehouseFk = vWarehouse
ORDER BY dated DESC
LIMIT 1;
@@ -41511,9 +41407,9 @@ BEGIN
RETURN 0;
END IF;
- SET vDate = IFNULL(vDate, util.VN_CURDATE());
+ SET vDate = IFNULL(vDate, CURDATE());
- SET vDateIni = TIMESTAMPADD(MONTH, -2, util.VN_CURDATE());
+ SET vDateIni = TIMESTAMPADD(MONTH, -2, CURDATE());
SET vDateEnd = TIMESTAMP(vDate, '23:59:59');
SELECT IFNULL(SUM(t.amount), 0) INTO vDebt
@@ -41605,7 +41501,7 @@ BEGIN
JOIN saleComponent sc on sc.saleFk = s.id
WHERE sc.componentFk IN (vManaComponent, vAutoManaComponent)
AND t.shipped > vFromDated
- AND t.shipped < TIMESTAMPADD(DAY,1,util.VN_CURDATE())
+ AND t.shipped < TIMESTAMPADD(DAY,1,CURDATE())
AND a.clientFk = vClient
UNION ALL
SELECT - amountPaid
@@ -41613,7 +41509,7 @@ BEGIN
JOIN `client` c ON c.id = r.clientFk
WHERE r.bankFk = vManaBank
AND r.payed > vFromDated
- AND r.payed <= util.VN_CURDATE()
+ AND r.payed <= CURDATE()
AND c.id = vClient
UNION ALL
SELECT g.amount
@@ -41621,7 +41517,7 @@ BEGIN
JOIN `client` c ON c.id = g.clientFk
WHERE g.greugeTypeFk = vManaGreugeType
AND g.shipped > vFromDated
- AND g.shipped <= util.VN_CURDATE()
+ AND g.shipped <= CURDATE()
AND c.id = vClient
) sub;
RETURN IFNULL(vMana,0);
@@ -41675,27 +41571,14 @@ BEGIN
* @param vCompanyFk Compañia desde la que se factura
* @return Código de area
*/
- DECLARE vTaxArea VARCHAR(25);
- DECLARE vCee INT;
-
- SELECT ct.Cee INTO vCee
- FROM `client` c
- JOIN country ct ON ct.id = c.countryFk
- JOIN supplier s ON s.id = vCompanyId
- WHERE
- c.id = vClientId
- AND c.isVies
- AND c.countryFk != s.countryFk;
-
- IF vCee < 2 THEN
- SET vTaxArea = 'CEE';
- ELSEIF vCee = 2 THEN
- SET vTaxArea = 'WORLD';
- ELSE
- SET vTaxArea = 'NATIONAL';
- END IF;
-
- RETURN vTaxArea;
+ DECLARE vTaxArea VARCHAR(25);
+
+ SELECT addressTaxArea(defaultAddressFk, vCompanyId)
+ INTO vTaxArea
+ FROM client
+ WHERE id = vClientId;
+
+ RETURN vTaxArea;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -41811,7 +41694,7 @@ BEGIN
l: LOOP
SELECT workerSubstitute INTO vWorkerSubstituteFk
FROM sharingCart
- WHERE util.VN_CURDATE() BETWEEN started AND ended
+ WHERE curdate() BETWEEN started AND ended
AND workerFk = vSalesPersonFk
ORDER BY id
LIMIT 1;
@@ -41964,28 +41847,57 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` FUNCTION `collectionExpeditionLacks`(vCollectionFk INT) RETURNS varchar(100) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
BEGIN
-
- DECLARE vExpeditionLacks BOOL;
+/**
+ * Return message with tickets and collection if there is tickets of a collection without expeditions.
+ *
+ * @param vCollectionFk The collection to check
+ * @return An array with collection and tickets without expeditions
+ */
DECLARE vAnswer VARCHAR(100) DEFAULT '';
-
- SELECT (COUNT(*) > 0) INTO vExpeditionLacks
- FROM vn.ticketCollection tc
- LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND ISNULL(e.id);
-
- IF vExpeditionLacks THEN
+ IF collection_isPacked(vCollectionFk) = FALSE THEN
SELECT CONCAT('Colección: ',tc.collectionFk,' Tickets: ' , GROUP_CONCAT(tc.ticketFk) ) INTO vAnswer
- FROM vn.ticketCollection tc
- LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND ISNULL(e.id);
-
+ FROM vn.ticketCollection tc
+ LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
+ WHERE tc.collectionFk = vCollectionFk
+ AND ISNULL(e.id);
END IF;
RETURN vAnswer;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `collection_isPacked` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `collection_isPacked`(vSelf INT) RETURNS tinyint(1)
+ DETERMINISTIC
+BEGIN
+/**
+ * Check if collection is packed.
+ *
+ * @param vSelf the collection to check
+ * @return true if the collection is packed
+ */
+ DECLARE vTicketsWithoutExpeditions INT;
+ SELECT (COUNT(*) > 0) INTO vTicketsWithoutExpeditions
+ FROM vn.ticketCollection tc
+ LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
+ WHERE tc.collectionFk = vSelf
+ AND ISNULL(e.id);
+
+ RETURN NOT vTicketsWithoutExpeditions;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -42088,7 +42000,7 @@ BEGIN
FROM
(SELECT taxClassFk, rate
FROM invoiceInTaxBookingAccount
- WHERE effectived <= util.VN_CURDATE()
+ WHERE effectived <= CURDATE()
AND countryFk = vCountryFk
AND taxClassFk = vTaxClass
ORDER BY effectived DESC
@@ -42114,77 +42026,68 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
-
- /**
- * Devuelve el numero de entrada para el ekt
- *
- * @param vEktFk Identificador de edi.ekt
- */
-
+/**
+ * Devuelve el numero de entrada para el ekt
+ *
+ * @param vEktFk Identificador de edi.ekt
+ */
DECLARE vTravelFk INT;
- DECLARE vEntryFk INT DEFAULT 0;
- DECLARE vEntryAssignFk INT;
+ DECLARE vEntryFk INT DEFAULT 0;
+ DECLARE vEntryAssignFk INT;
- SET vTravelFk = vn.ekt_getTravel(vEktFk);
-
- IF vTravelFk THEN
-
- SELECT ea.id INTO vEntryAssignFk
- FROM edi.ekt e
- JOIN vn.travel tr ON tr.id = vTravelFk
- JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND IFNULL(ea.sub, e.sub) <=> e.sub
- AND IFNULL(ea.kop, e.kop) <=> e.kop
- AND IFNULL(ea.pro, e.pro) <=> e.pro
- WHERE e.id = vEktFk
- ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+ SELECT ea.id
+ INTO vEntryAssignFk
+ FROM edi.ekt e
+ JOIN vn.ektEntryAssign ea ON
+ IFNULL(ea.sub, e.sub) <=> e.sub AND
+ IFNULL(ea.kop, e.kop) <=> e.kop AND
+ IFNULL(ea.pro, e.pro) <=> e.pro AND
+ IFNULL(ea.auction, e.auction) <=> e.auction
+ WHERE e.id = vEktFk
+ ORDER BY
+ IF(ea.sub,1,0) * 1000 +
+ IF(ea.kop,1,0) * 100 +
+ IF(ea.pro,1,0) * 10 +
+ IF(ea.auction,1,0) DESC
LIMIT 1;
-
- SELECT MAX(e.id) INTO vEntryFk
- FROM vn.entry e
- JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
- WHERE e.travelFk = vTravelFk
- AND e.sub <=> ea.sub
- AND e.kop <=> ea.kop
- AND e.pro <=> ea.pro;
-
-
- IF IFNULL(vEntryFk,0) = 0 THEN
-
+
+ SET vTravelFk = vn.ekt_getTravel(vEntryAssignFk, vEktFk);
+
+ IF vTravelFk THEN
+
+ SELECT MAX(e.id)
+ INTO vEntryFk
+ FROM vn.entry e
+ JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
+ WHERE e.travelFk = vTravelFk
+ AND e.sub <=> ea.sub
+ AND e.kop <=> ea.kop
+ AND e.pro <=> ea.pro
+ AND e.auction <=> ea.auction;
+
+ IF vEntryFk IS NULL THEN
INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
FROM vn.ektEntryAssign ea
JOIN vn.company c ON c.code = 'VNL'
JOIN vn.currency cu ON cu.code = 'EUR'
WHERE ea.id = vEntryAssignFk;
-
- SELECT MAX(id) INTO vEntryFk
- FROM vn.entry
- WHERE travelFk = vTravelFk;
-
+
+ SET vEntryFk = LAST_INSERT_ID();
END IF;
-
+
UPDATE vn.ektEntryAssign
- SET entryFk = vEntryFk
- WHERE id = vEntryAssignFk;
-
+ SET entryFk = vEntryFk
+ WHERE id = vEntryAssignFk;
+
ELSE
-
- SELECT ec.defaultEntry INTO vEntryFk
+
+ SELECT ec.defaultEntry INTO vEntryFk
FROM vn.entryConfig ec;
-
+
INSERT IGNORE INTO vn.entry(id) VALUES(vEntryFk);
-
END IF;
-
+
RETURN vEntryFk;
END ;;
DELIMITER ;
@@ -42202,89 +42105,44 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getTravel`(vEktFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getTravel`(vEntryAssignFk INT, vEktFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
-
+/**
+ * Devuelve un vn.travel.id
+ *
+ * @param vEntryAssignFk Identificador de vn.entryAssign
+ */
DECLARE vTravelFk INT;
- DECLARE vEntryAssignFk INT;
- SELECT ea.id INTO vEntryAssignFk
- FROM edi.ekt e
- JOIN vn.ektEntryAssign ea ON IFNULL(ea.sub, e.sub) <=> e.sub
- AND IFNULL(ea.kop, e.kop) <=> e.kop
- AND IFNULL(ea.pro, e.pro) <=> e.pro
- WHERE e.id = vEktFk
- ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
- LIMIT 1;
-
SELECT MAX(tr.id) INTO vTravelFk
FROM vn.travel tr
JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
JOIN edi.ekt e ON e.id = vEktFk
WHERE ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
AND tr.landed = e.fec;
- /*
- SELECT tr.id INTO vTravelFk
- FROM vn.travel tr
- JOIN edi.ekt e ON e.id = vEktFk
- JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND (ea.sub = e.sub OR ea.kop = e.kop OR ea.pro = e.pro)
- AND tr.landed = e.fec
- ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
- LIMIT 1;
- */
-
+ IF vTravelFk IS NULL THEN
-
- IF NOT vTravelFk THEN
-
- INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
+ INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
SELECT e.fec, e.fec, ea.warehouseInFk, ea.warehouseOutFk, ea.agencyModeFk
FROM edi.ekt e
JOIN vn.ektEntryAssign ea ON ea.kop = e.kop
- WHERE e.id = vEktFk
- ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
- LIMIT 1;
-
- SELECT MAX(id) INTO vTravelFk
- FROM vn.travel tr
- JOIN edi.ekt e ON e.id = vEktFk
- JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND IFNULL(ea.sub, e.sub) <=> e.sub
- AND IFNULL(ea.kop, e.kop) <=> e.kop
- AND IFNULL(ea.pro, e.pro) <=> e.pro
- AND tr.landed = e.fec;
-
+ WHERE e.id = vEktFk
+ ORDER BY
+ IF(ea.sub,1,0) * 1000 +
+ IF(ea.kop,1,0) * 100 +
+ IF(ea.pro,1,0) * 10 +
+ IF(ea.auction,1,0) DESC
+ LIMIT 1;
+
+ SET vTravelFk = LAST_INSERT_ID();
+
END IF;
RETURN vTravelFk;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -42477,17 +42335,17 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` FUNCTION `entry_isInventoryOrPrevious`(vSelf INT) RETURNS int(11)
DETERMINISTIC
BEGIN
- DECLARE vIsInventoryOrPrevious BOOL;
+ DECLARE vIsInventoryOrPrevious BOOL;
- SELECT ec.inventorySupplierFk = e.supplierFk OR t.landed < c.inventoried
- INTO vIsInventoryOrPrevious
- FROM entry e
- JOIN travel t ON e.travelFk = t.id
- JOIN entryConfig ec
- JOIN config c
- WHERE e.id = vSelf;
+ SELECT ec.inventorySupplierFk = e.supplierFk OR t.landed < c.inventoried
+ INTO vIsInventoryOrPrevious
+ FROM entry e
+ JOIN travel t ON e.travelFk = t.id
+ JOIN entryConfig ec
+ JOIN config c
+ WHERE e.id = vSelf;
- RETURN vIsInventoryOrPrevious;
+ RETURN vIsInventoryOrPrevious;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -42857,7 +42715,7 @@ BEGIN
SELECT rate3 INTO price
FROM vn.priceFixed
WHERE itemFk = vItemFk
- AND util.VN_CURDATE() BETWEEN started AND ended ORDER BY created DESC LIMIT 1;
+ AND CURDATE() BETWEEN started AND ended ORDER BY created DESC LIMIT 1;
SELECT `value` INTO price
FROM vn.specialPrice
@@ -42894,7 +42752,7 @@ BEGIN
* #PENDING REVIEW
**/
- DECLARE vToday DATETIME DEFAULT util.VN_CURDATE();
+ DECLARE vToday DATETIME DEFAULT CURDATE();
DECLARE vYesterday DATETIME;
DECLARE vTodayvMidniight DATETIME DEFAULT midnight(vToday);
DECLARE vTicket INT DEFAULT NULL;
@@ -42911,10 +42769,10 @@ BEGIN
FROM vn.sale s
JOIN vn.saleTracking st ON st.saleFk = s.id
JOIN vn.ticketStateToday tst ON tst.ticket = s.ticketFk
- WHERE st.created > util.VN_CURDATE()
+ WHERE st.created > CURDATE()
-- AND tst.`code` = 'ON_PREPARATION'
) sub ON sub.ticketFk = i.Id_Ticket
- WHERE odbc_date > util.VN_CURDATE()
+ WHERE odbc_date > CURDATE()
AND s.`code` = 'ON_PREPARATION'
AND i.Id_Trabajador = vWorker
AND sub.ticketFk IS NULL
@@ -43258,40 +43116,6 @@ BEGIN
) t1;
RETURN totalAmount;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP FUNCTION IF EXISTS `invoiceOutAmount` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceOut_getWeight`(vInvoice VARCHAR(15)) RETURNS decimal(10,2)
- READS SQL DATA
-BEGIN
- DECLARE vTotalWeight DECIMAL(10,2);
-
- SELECT SUM(CAST(IFNULL(i.stems, 1) * s.quantity *
- IF(ic.grams, ic.grams, i.density * ic.cm3delivery / 1000)
- / 1000 AS DECIMAL(10,2)))
- INTO vTotalWeight
- FROM ticket t
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- JOIN itemCost ic ON ic.itemFk = i.id
- AND ic.warehouseFk = t.warehouseFk
- WHERE t.refFk = vInvoice
- AND i.intrastatFk ;
-
- RETURN vTotalWeight;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -43333,6 +43157,46 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `invoiceOut_getWeight` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceOut_getWeight`(vInvoice VARCHAR(15)) RETURNS decimal(10,2)
+ READS SQL DATA
+BEGIN
+/**
+ * Calcula el peso de una factura emitida
+ *
+ * @param vInvoice Id de la factura
+ * @return vTotalWeight peso de la factura
+ */
+ DECLARE vTotalWeight DECIMAL(10,2);
+
+ SELECT SUM(CAST(IFNULL(i.stems, 1) * s.quantity *
+ IF(ic.grams, ic.grams, i.density * ic.cm3delivery / 1000)
+ / 1000 AS DECIMAL(10,2)))
+ INTO vTotalWeight
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemCost ic ON ic.itemFk = i.id
+ AND ic.warehouseFk = t.warehouseFk
+ WHERE t.refFk = vInvoice
+ AND i.intrastatFk ;
+
+ RETURN vTotalWeight;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP FUNCTION IF EXISTS `invoiceSerial` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -43388,38 +43252,26 @@ BEGIN
IF vType = 'R' THEN
SELECT
CASE vTaxArea
- WHEN 'CEE'
- THEN 'H'
- WHEN 'WORLD'
- THEN 'E'
- WHEN 'NATIONAL'
- THEN 'T'
- END
- INTO vSerie;
+ WHEN 'CEE' THEN 'H'
+ WHEN 'WORLD' THEN 'E'
+ WHEN 'NATIONAL' THEN 'T'
+ END INTO vSerie;
-- Factura multiple
ELSEIF vType = 'M' THEN
SELECT
CASE vTaxArea
- WHEN 'CEE'
- THEN 'H'
- WHEN 'WORLD'
- THEN 'E'
- WHEN 'NATIONAL'
- THEN 'M'
- END
- INTO vSerie;
+ WHEN 'CEE' THEN 'H'
+ WHEN 'WORLD' THEN 'E'
+ WHEN 'NATIONAL' THEN 'M'
+ END INTO vSerie;
-- Factura global
ELSEIF vType = 'G' THEN
SELECT
CASE vTaxArea
- WHEN 'CEE'
- THEN 'V'
- WHEN 'WORLD'
- THEN 'X'
- WHEN 'NATIONAL'
- THEN 'A'
- END
- INTO vSerie;
+ WHEN 'CEE' THEN 'V'
+ WHEN 'WORLD' THEN 'X'
+ ELSE 'A'
+ END INTO vSerie;
END IF;
RETURN vSerie;
END ;;
@@ -43430,6 +43282,40 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `isDateRangeAccounting` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `isDateRangeAccounting`(vSelf DATE) RETURNS int(11)
+ READS SQL DATA
+BEGIN
+/**
+* Comprueba si la fecha pasada esta en el rango
+* de fecha de contabilidad
+*
+* @param vSelf Fecha para comparar
+* @return vReturn
+*
+**/
+ DECLARE vReturn BOOL;
+
+ SELECT COUNT(*) INTO vReturn
+ FROM accountingConfig
+ WHERE Vself BETWEEN minDate AND maxDate;
+
+ RETURN vReturn;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP FUNCTION IF EXISTS `isIntrastatEntry` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -43916,7 +43802,7 @@ BEGIN
DECLARE vCount INT;
DECLARE vUuid VARCHAR(255);
- DECLARE vSendDate DATETIME DEFAULT util.VN_NOW();
+ DECLARE vSendDate DATETIME DEFAULT NOW();
DECLARE vSender VARCHAR(255) CHARSET utf8;
SELECT `name` INTO vSender
@@ -44129,7 +44015,6 @@ WHERE
RETURN vPhyto;
END ;;
DELIMITER ;
-
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
@@ -44541,6 +44426,45 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `ticketCollection_getNoPacked` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketCollection_getNoPacked`(vCollectionFk INT) RETURNS varchar(100) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+BEGIN
+
+ /*
+ * return message with tickets and collection if there is tickets of a collection without expeditions
+ *
+ * @param vCollectionFk the collection to check
+ * @return an array with collection and tickets without expeditions
+ *
+ */
+
+ DECLARE vAnswer VARCHAR(100) DEFAULT '';
+
+ IF collection_isPacked(vCollectionFk) = FALSE THEN
+ SELECT CONCAT('Colección: ',tc.collectionFk,' Tickets: ' , GROUP_CONCAT(tc.ticketFk) ) INTO vAnswer
+ FROM vn.ticketCollection tc
+ LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
+ WHERE tc.collectionFk = vCollectionFk
+ AND ISNULL(e.id);
+ END IF;
+
+ RETURN vAnswer;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP FUNCTION IF EXISTS `ticketGetTotal` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -44857,7 +44781,7 @@ proc:BEGIN
JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
WHERE sg.id = vParamFk
- AND sg.created > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE())
+ AND sg.created > TIMESTAMPADD(WEEK,-1, CURDATE())
LIMIT 1;
IF vValidFk THEN
@@ -44872,7 +44796,7 @@ proc:BEGIN
SELECT c.id INTO vValidFk
FROM vn.collection c
WHERE c.id = vParamFk
- AND c.created > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE());
+ AND c.created > TIMESTAMPADD(WEEK,-1, CURDATE());
IF vValidFk THEN
@@ -44886,7 +44810,7 @@ proc:BEGIN
SELECT t.id INTO vValidFk
FROM vn.ticket t
WHERE t.id = vParamFk
- AND t.shipped > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE());
+ AND t.shipped > TIMESTAMPADD(WEEK,-1, CURDATE());
IF vValidFk THEN
@@ -45016,7 +44940,7 @@ BEGIN
IF vTicket IS NULL THEN
CALL vn.ticket_add(
vClientFk,
- IFNULL(vShipped, util.VN_CURDATE()),
+ IFNULL(vShipped, CURDATE()),
vWarehouseFk,
vCompanyFk,
vAddressFk,
@@ -45289,7 +45213,7 @@ BEGIN
FROM vn.travel tr
JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
- JOIN vn.agencyMode am ON am.id = tr.agencyFk
+ JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
WHERE wIn.id = vWarehouseFk
AND wOut.name = 'Holanda'
AND am.name = 'LOGIFLORA'
@@ -45297,8 +45221,8 @@ BEGIN
IF NOT vTravelFk THEN
- INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
- SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id
+ INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
+ SELECT vLanded, curdate(), vWarehouseFk, wOut.id, am.id
FROM vn.warehouse wOut
JOIN vn.agencyMode am ON am.name = 'LOGIFLORA'
WHERE wOut.name = 'Holanda';
@@ -45486,7 +45410,7 @@ BEGIN
IF (SELECT COUNT(*)
FROM machineWorker m
WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -(SELECT maxHours from machineWorkerConfig), util.VN_NOW()) AND ISNULL(m.outTimed))
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -(SELECT maxHours from machineWorkerConfig), NOW()) AND ISNULL(m.outTimed))
THEN
RETURN TRUE;
ELSE
@@ -45908,7 +45832,7 @@ BEGIN
*/
DECLARE vAgency INT;
DECLARE vShipped DATE;
-DECLARE vLanded DATE DEFAULT util.VN_CURDATE();
+DECLARE vLanded DATE DEFAULT CURDATE();
SELECT agencyFk INTO vAgency FROM agencyMode WHERE id= vAgencyMode;
l: LOOP
@@ -45975,7 +45899,7 @@ BEGIN
) t
LIMIT 1
) t
- WHERE IF(vDated = util.VN_CURDATE(), t.maxHour > HOUR(util.VN_NOW()), TRUE) AND t.substractDay < 225;
+ WHERE IF(vDated = CURDATE(), t.maxHour > HOUR(NOW()), TRUE) AND t.substractDay < 225;
END ;;
DELIMITER ;
@@ -46051,8 +45975,8 @@ BEGIN
AND (ah.provinceFk = a.provinceFk
OR ah.provinceFk IS NULL
OR vAddress IS NULL)
- AND TIMESTAMPADD(DAY, -ah.substractDay, vDate) >= util.VN_CURDATE()
- AND IF(TIMESTAMPADD(DAY, -ah.substractDay, vDate) = util.VN_CURDATE(), ah.maxHour > HOUR(util.VN_NOW()), TRUE)
+ AND TIMESTAMPADD(DAY, -ah.substractDay, vDate) >= CURDATE()
+ AND IF(TIMESTAMPADD(DAY, -ah.substractDay, vDate) = CURDATE(), ah.maxHour > HOUR(NOW()), TRUE)
ORDER BY (
(ah.weekDay IS NOT NULL) +
(ah.agencyFk IS NOT NULL) +
@@ -46230,7 +46154,7 @@ BEGIN
ON s.id = bp.supplierFk
LEFT JOIN vn.bank b
ON b.id = bp.bankFk
- WHERE bp.insuranceExpired = util.VN_CURDATE();
+ WHERE bp.insuranceExpired = CURDATE();
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46267,7 +46191,7 @@ BEGIN
FROM cache.last_buy
WHERE warehouse_id = vWarehouseFk OR vWarehouseFk IS NULL;
- CALL buyUltimateFromInterval(vWarehouseFk, util.VN_CURDATE(), vDated);
+ CALL buyUltimateFromInterval(vWarehouseFk, CURDATE(), vDated);
REPLACE INTO tmp.buyUltimate
SELECT itemFk, buyFk, warehouseFk, landed landing
@@ -46715,7 +46639,7 @@ BEGIN
JOIN entry e ON e.id = b.entryFk
JOIN travel t ON t.id = e.travelFk
WHERE t.landed = vDated
- AND t.agencyFk IN (0, vAgencyFk);
+ AND t.agencyModeFk IN (0, vAgencyFk);
CALL buy_getVolume();
DROP TEMPORARY TABLE tmp.buy;
@@ -46798,7 +46722,7 @@ BEGIN
JOIN entry e ON e.id = b.entryFk
JOIN itemType it ON it.id = i.typeFk
JOIN travel tr ON tr.id = e.travelFk
- JOIN agencyMode am ON am.id = tr.agencyFk
+ JOIN agencyMode am ON am.id = tr.agencyModeFk
JOIN tmp.rate r
SET b.freightValue = @PF:=
ROUND(IFNULL(((am.m3 * @cm3:= item_getVolume(b.itemFk, b.packageFk)) / 1000000) / b.packing,0),3),
@@ -46839,6 +46763,91 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `buy_scan` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_scan`(vBarcode VARCHAR(255), vLabels INT)
+BEGIN
+/**
+ * Marca una compra de subasta como escaneada.
+ *
+ * @param vBarcode Código de compra de una etiqueta de subasta
+ * @param vLabels Cantidad escaneada
+ */
+ DECLARE vEktFk INT;
+ DECLARE vBuyFk INT;
+ DECLARE vItemFk INT;
+ DECLARE vIsPhotoNeeded BOOL;
+
+ -- Aun no se sabe como obtener el número de serie de transacción de
+ -- las compras realizadas a través de un reloj, por lo que se establece
+ -- siempre a '01'
+
+ -- Campo ekt.barcode, el clásico
+ IF SUBSTR(vBarcode, 3, 2) != '99' THEN
+ SET vBarcode = CONCAT(LEFT(vBarcode, 12), '010');
+ END IF;
+
+ SELECT e.id, b.id, b.itemFk, i.doPhoto
+ INTO vEktFk, vBuyFk, vItemFk, vIsPhotoNeeded
+ FROM edi.ekt e
+ JOIN vn.buy b ON b.ektFk = e.id
+ JOIN vn.item i ON i.id = b.itemFk
+ WHERE e.barcode = vBarcode
+ AND e.entryYear = YEAR(CURDATE())
+ ORDER BY b.id
+ LIMIT 1;
+
+ -- Campo ekt.batchCode
+ IF ISNULL(vEktFk) THEN
+ SELECT e.id, b.id, b.itemFk, i.doPhoto
+ INTO vEktFk, vBuyFk, vItemFk, vIsPhotoNeeded
+ FROM edi.ekt e
+ JOIN vn.buy b ON b.ektFk = e.id
+ JOIN vn.item i ON i.id = b.itemFk
+ WHERE LEFT(@bc, 13) = e.batchNumber
+ AND e.entryYear = YEAR(CURDATE())
+ ORDER BY b.id
+ LIMIT 1;
+ END IF;
+
+ -- Campo ekt.deliveryNumber
+ IF ISNULL(vEktFk) THEN
+ SELECT e.id, b.id, b.itemFk, i.doPhoto
+ INTO vEktFk, vBuyFk, vItemFk, vIsPhotoNeeded
+ FROM edi.ekt e
+ JOIN vn.buy b ON b.ektFk = e.id
+ JOIN vn.item i ON i.id = b.itemFk
+ WHERE e.deliveryNumber = vBarcode
+ AND e.entryYear = YEAR(CURDATE())
+ ORDER BY b.id
+ LIMIT 1;
+ END IF;
+
+ IF NOT ISNULL(vEktFk) THEN
+
+ UPDATE edi.ekt e SET e.scanned = TRUE WHERE id = vEktFk;
+
+ UPDATE vn.buy b
+ SET b.printedStickers = b.printedStickers + IF(vLabels <> -1, vLabels, b.stickers)
+ WHERE b.id = vBuyFk;
+
+ END IF;
+
+ SELECT vBuyFk buy, vIsPhotoNeeded do_photo;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `buy_updateGrouping` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -46857,7 +46866,7 @@ BEGIN
* @param vGrouping Cantidad de grouping
*/
- CALL vn.buyUltimate(vWarehouseFk, util.VN_CURDATE());
+ CALL vn.buyUltimate(vWarehouseFk, CURDATE());
UPDATE vn.buy b
JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
@@ -46891,7 +46900,7 @@ BEGIN
* @param vItemFk id del item
* @param vPacking packing a actualizar
*/
- CALL buyUltimate(vWarehouseFk, util.VN_CURDATE());
+ CALL buyUltimate(vWarehouseFk, CURDATE());
UPDATE buy b
JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
@@ -47124,7 +47133,7 @@ BEGIN
SELECT price, itemFk, priceKg, `grouping`
FROM tmp.ticketComponentPrice
WHERE warehouseFk = vWarehouseFk
- ORDER BY (rate = 2) DESC
+ ORDER BY (rate = 2) DESC, price
LIMIT 10000000000000000000
) sub
GROUP BY itemFk
@@ -47556,7 +47565,7 @@ proc: BEGIN
* @return tmp.ticketComponentPrice
* @return tmp.zoneGetShipped
*/
- DECLARE vLanded DATE DEFAULT DATE_ADD(util.VN_CURDATE(),INTERVAL 2 DAY);
+ DECLARE vLanded DATE DEFAULT DATE_ADD(CURDATE(),INTERVAL 2 DAY);
DECLARE vAddressFk INT DEFAULT 24526;
DECLARE vAgencyModeFk INT DEFAULT 639;
DECLARE vAvailableCalc INT;
@@ -47695,14 +47704,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `clean` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
BEGIN
@@ -47714,12 +47723,12 @@ BEGIN
DECLARE v3Month DATE;
DECLARE vTrashId varchar(15);
- SET vDateShort = TIMESTAMPADD(MONTH, -2, util.VN_CURDATE());
- SET vOneYearAgo = TIMESTAMPADD(YEAR,-1,util.VN_CURDATE());
- SET vFourYearsAgo = TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());
- SET v18Month = TIMESTAMPADD(MONTH, -18,util.VN_CURDATE());
- SET v26Month = TIMESTAMPADD(MONTH, -26,util.VN_CURDATE());
- SET v3Month = TIMESTAMPADD(MONTH, -3, util.VN_CURDATE());
+ SET vDateShort = TIMESTAMPADD(MONTH, -2, CURDATE());
+ SET vOneYearAgo = TIMESTAMPADD(YEAR,-1,CURDATE());
+ SET vFourYearsAgo = TIMESTAMPADD(YEAR,-4,CURDATE());
+ SET v18Month = TIMESTAMPADD(MONTH, -18,CURDATE());
+ SET v26Month = TIMESTAMPADD(MONTH, -26,CURDATE());
+ SET v3Month = TIMESTAMPADD(MONTH, -3, CURDATE());
DELETE FROM ticketParking WHERE created < vDateShort;
DELETE FROM routesMonitor WHERE dated < vDateShort;
@@ -47728,14 +47737,14 @@ BEGIN
DELETE FROM messageInbox WHERE sendDate < vDateShort;
DELETE FROM messageInbox WHERE sendDate < vDateShort;
DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
- DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
- DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
+ DELETE FROM itemShelving WHERE created < CURDATE() AND visible = 0;
+ DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,CURDATE());
DELETE FROM entryLog WHERE creationDate < vDateShort;
DELETE IGNORE FROM expedition WHERE created < v26Month;
DELETE FROM sms WHERE created < v18Month;
DELETE FROM saleTracking WHERE created < vOneYearAgo;
DELETE tobs FROM ticketObservation tobs
- JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+ JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,CURDATE());
DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
DELETE FROM sharingCart where ended < vDateShort;
DELETE FROM sharingClient where ended < vDateShort;
@@ -47790,7 +47799,7 @@ BEGIN
FROM vn.travel t
LEFT JOIN vn.entry e ON e.travelFk = t.id
JOIN vn.travelThermograph th ON th.travelFk = t.id
- WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+ WHERE t.shipped < TIMESTAMPADD(MONTH, -3, CURDATE()) AND e.travelFk IS NULL;
SELECT dt.id into vTrashId
FROM vn.dmsType dt
@@ -47807,12 +47816,12 @@ BEGIN
DELETE t
FROM vn.travel t
LEFT JOIN vn.entry e ON e.travelFk = t.id
- WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+ WHERE t.shipped < TIMESTAMPADD(MONTH, -3, CURDATE()) AND e.travelFk IS NULL;
UPDATE dms d
JOIN dmsType dt ON dt.id = d.dmsTypeFk
SET d.dmsTypeFk = vTrashId
- WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
+ WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, CURDATE());
-- borrar entradas sin compras
DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
@@ -47821,7 +47830,7 @@ BEGIN
FROM vn.entry e
LEFT JOIN vn.buy b ON b.entryFk = e.id
JOIN vn.entryConfig ec ON e.id != ec.defaultEntry
- WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
+ WHERE e.dated < TIMESTAMPADD(MONTH, -3, CURDATE()) AND b.entryFK IS NULL;
DELETE e
FROM vn.entry e
@@ -47832,7 +47841,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp.routeToDelete
SELECT *
FROM vn.route r
- WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());
+ WHERE created < TIMESTAMPADD(YEAR,-4,CURDATE());
UPDATE tmp.routeToDelete tmp
JOIN vn.dms d ON d.id = tmp.gestdocFk
@@ -47847,7 +47856,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp.duaToDelete
SELECT *
FROM vn.dua
- WHERE operated < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+ WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE());
UPDATE tmp.duaToDelete tm
JOIN vn.dms d ON d.id = tm.gestdocFk
@@ -47857,10 +47866,7 @@ BEGIN
FROM tmp.duaToDelete tmp
JOIN vn.dua d ON d.id = tmp.id;
- DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
-
- -- Borra los ficheros gestDoc
- INSERT INTO vn.printServerQueue(priorityFk, labelReportFk)VALUES(1,11);
+ DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,CURDATE());
-- Borra los registros de collection y ticketcollection
DELETE FROM vn.collection WHERE created < vDateShort;
@@ -47895,7 +47901,7 @@ BEGIN
* item_clean, buy_clean
* */
- DECLARE vMaxDated DATE DEFAULT TIMESTAMPADD(DAY, - 7, util.VN_CURDATE());
+ DECLARE vMaxDated DATE DEFAULT TIMESTAMPADD(DAY, - 7, CURDATE());
DECLARE vDone INT DEFAULT FALSE;
DECLARE vBuyFk INT;
DECLARE cur1 CURSOR FOR SELECT id FROM tmp.buy;
@@ -47911,7 +47917,7 @@ BEGIN
FROM vn.buy b
JOIN vn.entry e ON e.id = b.entryFk
JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN vn.agencyMode am ON am.id = tr.agencyFk
+ JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
WHERE b.quantity = 0
AND am.name = 'LOGIFLORA'
AND e.isRaid;
@@ -47945,10 +47951,12 @@ BEGIN
LEFT JOIN hedera.orderRow o ON o.itemFk = i.id
LEFT JOIN vn.sale s ON s.itemFk = i.id
LEFT JOIN vn.buy b ON b.itemFk = i.id
+ LEFT JOIN bs.waste w ON w.itemFk = i.id
WHERE i.supplyResponseFk
AND o.id IS NULL
AND b.id IS NULL
AND s.id IS NULL
+ AND w.rate IS NULL
AND i.created < vMaxDated;
OPEN cur2;
@@ -48104,15 +48112,15 @@ BEGIN
DECLARE vClientDebt DOUBLE;
- SELECT vn.clientGetDebt(vClientFk, util.VN_CURDATE()) INTO vClientDebt;
+ SELECT vn.clientGetDebt(vClientFk, CURDATE()) INTO vClientDebt;
INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
- VALUES (vClientFk, 'Saldo pendiente', vClientDebt, util.VN_CURDATE(), 5);
+ VALUES (vClientFk, 'Saldo pendiente', vClientDebt, CURDATE(), 5);
CALL vn.clientGreugeSpray(vClientFk, TRUE, '', TRUE);
INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
- SELECT vClientFk, 'Liquidación cliente', sum(amount), util.VN_CURDATE(), 5
+ SELECT vClientFk, 'Liquidación cliente', sum(amount), CURDATE(), 5
FROM vn.greuge
WHERE clientFk = vClientFk;
@@ -48127,59 +48135,55 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `clientFreeze` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `clientFreeze`()
BEGIN
/**
- * Congela diariamente aquellos clientes que son morosos sin recobro,
- * pero que no sean trabajadores,
- * y que el riesgo no sea menor que cero
- * hasta que no se gire la remesa no se congelan a los clientes de giro
- */
+* Congela diariamente aquellos clientes que son morosos sin recobro,
+* pero que no sean trabajadores,
+* y que el riesgo no sea menor que cero
+* hasta que no se gire la remesa no se congelan a los clientes de giro
+*/
DECLARE vIsRemittanced BOOLEAN;
SELECT id into vIsRemittanced
FROM receipt
WHERE invoiceFk LIKE 'REMESA%'
- AND payed > util.firstDayOfMonth(util.VN_CURDATE())
- limit 1;
-
+ AND payed > util.firstDayOfMonth(CURDATE())
+ LIMIT 1;
+
DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
CREATE TEMPORARY TABLE tmp.clientGetDebt
SELECT clientFk
FROM bs.defaulter
- WHERE created = util.VN_CURDATE()
+ WHERE created = CURDATE()
AND amount;
-
- CALL clientGetDebt(util.VN_CURDATE());
+
+ CALL clientGetDebt(CURDATE());
UPDATE client c
- JOIN bi.defaulters d ON d.client = c.id AND d.date = util.VN_CURDATE()
- JOIN config ON TRUE
- LEFT JOIN account.`user` u ON u.id = c.id AND u.active
- LEFT JOIN worker w ON w.id = u.id
- LEFT JOIN recovery r ON r.clientFk = c.id AND r.finished IS NULL
- LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
- LEFT JOIN tmp.risk rk ON rk.clientFk = c.id
- SET c.isFreezed = TRUE,
- d.frozened = util.VN_CURDATE(),
- u.active = FALSE
+ JOIN bi.defaulters d ON d.client = c.id AND d.date = CURDATE()
+ JOIN config ON TRUE
+ LEFT JOIN recovery r ON r.clientFk = c.id AND r.finished IS NULL
+ LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
+ LEFT JOIN tmp.risk rk ON rk.clientFk = c.id
+ SET c.isFreezed = TRUE,
+ d.frozened = CURDATE()
WHERE (d.amount > config.defaultersMaxAmount
- AND rk.risk > 0)
+ AND rk.risk > 0)
AND c.typeFk = 'normal'
- AND r.id IS NULL
- AND w.id IS NULL
+ AND r.id IS NULL
AND (vIsRemittanced OR pm.code <> 'bankDraft');
-
+
DROP TEMPORARY TABLE tmp.clientGetDebt;
END ;;
DELIMITER ;
@@ -48206,10 +48210,10 @@ BEGIN
* @param vDate Fecha maxima de los registros
* @return tmp.risk
*/
- DECLARE vStarted DATETIME DEFAULT TIMESTAMPADD(DAY, -35, util.VN_CURDATE());
+ DECLARE vStarted DATETIME DEFAULT TIMESTAMPADD(DAY, -35, CURDATE());
DECLARE vEnded DATETIME;
- SET vEnded = TIMESTAMP(IFNULL(vDate, util.VN_CURDATE()), '23:59:59');
+ SET vEnded = TIMESTAMP(IFNULL(vDate, CURDATE()), '23:59:59');
DROP TEMPORARY TABLE IF EXISTS tClientRisk;
CREATE TEMPORARY TABLE tClientRisk
@@ -48419,7 +48423,7 @@ BEGIN
VALUES( vClientFk,
'Desasignación',
-1 * vMana,
- util.VN_CURDATE(),
+ CURDATE(),
vGreugeTypeMana);
END IF;
@@ -48452,7 +48456,7 @@ BEGIN
JOIN vn.workerMana wm ON wm.workerFk = c.salesPersonFk
JOIN vn.claimRatio cr ON cr.clientFk = c.id
WHERE wm.workerFk = IF(onlyForHisOwner, vOwner, wm.workerFk)
- AND t.shipped >= TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+ AND t.shipped >= TIMESTAMPADD(MONTH,-1,CURDATE())
AND c.id != vClientFk
HAVING monthSale > 100;
@@ -48460,10 +48464,10 @@ BEGIN
FROM tmp.clientList;
INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
- SELECT clientFk, CONCAT('Cliente: ',vClientFk), vGreuge * monthSale / vTotalSale, util.VN_CURDATE(), vGreugeTypeFk
+ SELECT clientFk, CONCAT('Cliente: ',vClientFk), vGreuge * monthSale / vTotalSale, CURDATE(), vGreugeTypeFk
FROM tmp.clientList
UNION ALL
- SELECT vClientFk, 'Reparto greuge', -vGreuge, util.VN_CURDATE(), vGreugeTypeFk;
+ SELECT vClientFk, 'Reparto greuge', -vGreuge, CURDATE(), vGreugeTypeFk;
END IF;
@@ -48554,7 +48558,7 @@ BEGIN
IFNULL(pe.equivalentFk, p.itemFk) itemFk,
NULL,
NULL,
- IF(tp.quantity > 0 AND t.shipped <= TIMESTAMPADD(DAY, - vGraceDays, util.VN_CURDATE()), tp.quantity, NULL) SenttoClient,
+ IF(tp.quantity > 0 AND t.shipped <= TIMESTAMPADD(DAY, - vGraceDays, CURDATE()), tp.quantity, NULL) SenttoClient,
IF(tp.quantity < 0, -tp.quantity, NULL) GotfromClient,
NULL AS refFk,
NULL,
@@ -48604,13 +48608,13 @@ BEGIN
CALL vn.ticket_add(
vClientFk
- ,util.VN_CURDATE()
+ ,CURDATE()
,vWarehouseFk -- Algemesi
,442 -- Verdnatura
,NULL -- address
,NULL -- agencia
,NULL -- route
- ,util.VN_CURDATE()
+ ,CURDATE()
,account.myUser_getId()
,TRUE
,vNewTicket);
@@ -48797,7 +48801,7 @@ BEGIN
INSERT INTO tmp.client(clientFk)
SELECT DISTINCT clientFk
FROM vn.invoiceOut
- WHERE issued > TIMESTAMPADD(MONTH, -2, util.VN_CURDATE());
+ WHERE issued > TIMESTAMPADD(MONTH, -2, CURDATE());
SELECT max(id) INTO maxClientFk
FROM tmp.client;
@@ -48854,7 +48858,7 @@ BEGIN
DECLARE vLanded DATE;
- SELECT DATE_ADD(util.VN_CURDATE(), INTERVAL landingDays DAY) INTO vLanded
+ SELECT DATE_ADD(CURDATE(), INTERVAL landingDays DAY) INTO vLanded
FROM vn.cmrConfig;
IF vTicketFk THEN
@@ -48906,7 +48910,7 @@ BEGIN
*/
SET SESSION group_concat_max_len = 1000000;
--- IF (DAY(util.VN_CURDATE()) = 5) THEN
+-- IF (DAY(CURDATE()) = 5) THEN
INSERT INTO
vn.mail (receiver,
replyTo,
@@ -48923,7 +48927,7 @@ BEGIN
Estimado cliente, cmr@verdnatura.es
@@ -48942,8 +48946,8 @@ BEGIN
JOIN vn.address a ON c.addressToFk = a.id
JOIN vn.client c2 ON a.clientFk = c2.id
WHERE c.state = 'Pending'
- AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH)
- AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH)
+ AND MONTH(c.created) = MONTH(CURDATE() - INTERVAL 1 MONTH)
+ AND YEAR(c.created) = YEAR(CURDATE() - INTERVAL 1 MONTH)
AND c2.email IS NOT NULL -- No cogemos los CMRs dirigidos a 'Verdnatura'
GROUP BY c2.id;
@@ -48951,8 +48955,8 @@ BEGIN
UPDATE vn.cmr c
SET c.state = 'Sent'
WHERE c.state = 'Pending'
- AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH)
- AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH);
+ AND MONTH(c.created) = MONTH(CURDATE() - INTERVAL 1 MONTH)
+ AND YEAR(c.created) = YEAR(CURDATE() - INTERVAL 1 MONTH);
-- END IF;
END ;;
DELIMITER ;
@@ -48972,77 +48976,65 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `collectionPlacement_get`(vParamFk INT(11), vIsPicker bool)
BEGIN
-
- /* Devuelve el listado de ubicaciones a las que hay que ir para preparar una colección o ticket
- *
- * @param vParamFk Identificador de vn.collection o Identificador de vn.ticket
- * @param vIsPicker Booleano para distinguer el sacador del revisador
- */
+/** Devuelve el listado de ubicaciones a las que hay que ir para preparar una colección o ticket
+ *
+ * @param vParamFk Identificador de vn.collection o Identificador de vn.ticket
+ * @param vIsPicker Booleano para distinguer el sacador del revisador
+ */
DECLARE vCalcFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vWarehouseAliasFk INT;
- DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- ENGINE = MEMORY
- SELECT 00000000 as ticketFk,
+ DECLARE vWarehouseFk INT;
+ DECLARE vWarehouseAliasFk INT;
+ DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ ENGINE = MEMORY
+ SELECT 00000000 as ticketFk,
00000000 as saleFk,
- 00000000 as itemFk,
- FALSE as isStowaway,
- 0 as quantity;
-
- INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ 00000000 as itemFk,
+ 0 as quantity;
+ -- 0 AS visible;
+
+ INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, quantity)
+ SELECT s.ticketFk, s.id, s.itemFk, s.quantity
FROM vn.ticketCollection tc
- -- JOIN vn.collection c ON c.id = tc.collectionFk
JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- -- JOIN vn.item i ON i.id = s.itemFk
WHERE tc.collectionFk = vParamFk
- -- AND (IFNULL(i.itemPackingTypeFk,c.itemPackingTypeFk) = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
UNION ALL
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ SELECT s.ticketFk, s.id, s.itemFk, s.quantity
FROM vn.sale s
WHERE s.ticketFk = vParamFk;
-
- SELECT t.warehouseFk, w.aliasFk
+
+ SELECT t.warehouseFk, w.aliasFk
INTO vWarehouseFk, vWarehouseAliasFk
- FROM vn.ticket t
+ FROM vn.ticket t
JOIN tmp.sale ts ON ts.ticketFk = t.id
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- LIMIT 1;
-
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ LIMIT 1;
+
CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
-
- UPDATE tmp.sale ts
- JOIN ( SELECT itemFk, sum(visible) as visible
- FROM vn.itemShelvingStock iss
- JOIN vn.warehouse w ON w.id = iss.warehouseFk
- WHERE w.aliasFk = vWarehouseAliasFk
- GROUP BY iss.itemFk ) iss ON iss.itemFk = ts.itemFk
- SET ts.quantity = iss.visible;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
- CREATE TEMPORARY TABLE tmp.sale2
- ENGINE = MEMORY
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
+ CREATE TEMPORARY TABLE tmp.sale2
+ ENGINE = MEMORY
SELECT * FROM tmp.sale;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
- CREATE TEMPORARY TABLE tmp.`grouping`
+ CREATE TEMPORARY TABLE tmp.`grouping`
(INDEX(itemFk))
- ENGINE = MEMORY
+ ENGINE = MEMORY
SELECT b.itemFk,
CASE b.groupingMode
WHEN 0 THEN 1
WHEN 2 THEN b.packing
ELSE b.`grouping`
- END AS `grouping`
+ END AS `grouping`
FROM buy b
JOIN cache.last_buy lb ON lb.buy_id = b.id
WHERE lb.warehouse_id = vWarehouseFk
GROUP BY b.itemFk;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
CREATE TEMPORARY TABLE tmp.grouping2
ENGINE MEMORY
@@ -49052,93 +49044,96 @@ BEGIN
CREATE TEMPORARY TABLE tmp.salePlacementList
ENGINE MEMORY
- SELECT ts.saleFk,
+ SELECT ts.saleFk,
ts.itemFk,
CAST(0 AS DECIMAL(10,0)) as saleOrder,
- IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) /* + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,util.VN_NOW())) */) as priority,
- CONCAT(
- IF( iss.id,
- CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
- ''),
- p.`code`) COLLATE utf8_general_ci as placement ,
- sh.priority shelvingPriority,
+ IF(ish.visible > 0 OR iss.id, 1, 100000) * p.pickingOrder as `order`,
+ IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) /* + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW())) */) as priority,
+ CONCAT(
+ IF( iss.id,
+ CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
+ ''),
+ p.`code`) COLLATE utf8_general_ci as placement,
+ sh.priority shelvingPriority,
sh.code COLLATE utf8_general_ci as shelving,
ish.created,
ish.visible,
IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- sc.isPreviousPrepared,
- iss.id as itemShelvingSaleFk,
- ts.ticketFk
- ,iss.id
- , st.saleFk as salePreviousPrepared
- , iss.userFk
+ sc.isPreviousPrepared,
+ iss.id as itemShelvingSaleFk,
+ ts.ticketFk
+ ,iss.id
+ , st.saleFk as salePreviousPrepared
+ , iss.userFk
+ , ts.quantity
FROM tmp.sale ts
LEFT JOIN (SELECT DISTINCT saleFk
FROM vn.saleTracking st
JOIN vn.state s ON s.id = st.stateFk
WHERE st.isChecked
AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
- JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector sc ON sc.id = p.sectorFk
- JOIN vn.warehouse w ON w.id = sc.warehouseFk
- LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
- LEFT JOIN vn.worker wk ON wk.id = iss.userFk
+ JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector sc ON sc.id = p.sectorFk
+ JOIN vn.warehouse w ON w.id = sc.warehouseFk
+ LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
+ LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
+ LEFT JOIN vn.worker wk ON wk.id = iss.userFk
WHERE w.aliasFk = vWarehouseAliasFk
- AND NOT sc.isHideForPickers
- HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
- ;
-
-
+ AND NOT sc.isHideForPickers
+ HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
+ ;
+
DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_2;
CREATE TEMPORARY TABLE tmp.salePlacementList_2
ENGINE MEMORY
- SELECT saleFk, priority as olderPriority
+ SELECT saleFk, priority as olderPriority
FROM (SELECT saleFk, priority
FROM tmp.salePlacementList
- ORDER BY IF(isPreviousPrepared,2,1),
- IF(visible > 0 OR itemShelvingSaleFk,1,2),
- IFNULL(shelvingPriority,0) DESC,
+ ORDER BY isPreviousPrepared DESC,
+ itemShelvingSaleFk IS NULL DESC,
+ visible >= quantity DESC,
+ visible > 0 DESC,
+ IFNULL(shelvingPriority,0) DESC,
priority
LIMIT 10000000000000000000
) sub
- GROUP BY saleFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
+ GROUP BY saleFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
CREATE TEMPORARY TABLE tmp.salePlacementList_3
ENGINE MEMORY
- SELECT s1.saleFk, `order`as saleOrder
+ SELECT s1.saleFk, `order`as saleOrder
FROM tmp.salePlacementList s1
JOIN tmp.salePlacementList_2 s2 ON s2.saleFk = s1.saleFk AND s2.olderPriority = s1.priority;
-
- UPDATE tmp.salePlacementList s1
+
+ UPDATE tmp.salePlacementList s1
JOIN tmp.salePlacementList_3 s3 ON s3.saleFk = s1.saleFk
- SET s1.saleOrder = s3.saleOrder;
- /*
- -- Anula el orden de antigüedad y ordena por ubicación
- UPDATE tmp.salePlacementList
- SET saleOrder = `order`;*/
-
- SELECT *
- FROM tmp.salePlacementList
- ORDER BY saleOrder,
- IF(isPreviousPrepared,2,1),
- IF(itemShelvingSaleFk,1,2),
- IF(vIsPicker, visible = 0, TRUE),
- shelvingPriority DESC, -- PAK 05/11/2021
- priority;
-
+ SET s1.saleOrder = s3.saleOrder;
+ /*
+ -- Anula el orden de antigüedad y ordena por ubicación
+ UPDATE tmp.salePlacementList
+ SET saleOrder = `order`;*/
+
+ SELECT spl.*
+ FROM tmp.salePlacementList spl
+ JOIN vn.sale s ON s.id = spl.saleFk
+ ORDER BY saleOrder,
+ isPreviousPrepared DESC,
+ itemShelvingSaleFk,
+ IF(vIsPicker, visible = 0, TRUE),
+ s.quantity <= spl.visible DESC,
+ shelvingPriority DESC, -- PAK 05/11/2021
+ priority;
+
DROP TEMPORARY TABLE
tmp.sale,
- tmp.sale2,
- tmp.`grouping`,
- tmp.grouping2,
- tmp.salePlacementList_2,
- tmp.salePlacementList_3;
-
+ tmp.sale2,
+ tmp.`grouping`,
+ tmp.grouping2,
+ tmp.salePlacementList_2,
+ tmp.salePlacementList_3;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -49166,7 +49161,7 @@ BEGIN
SELECT barcodeToItem(vItemFk) INTO itemFk;
- SELECT CONCAT(vn.getUser()," ",DATE_FORMAT(util.VN_NOW( ), "%H:%i" )," ",i.name) INTO vConcept FROM vn.item i WHERE i.id = itemFk;
+ SELECT CONCAT(vn.getUser()," ",DATE_FORMAT(NOW( ), "%H:%i" )," ",i.name) INTO vConcept FROM vn.item i WHERE i.id = itemFk;
SELECT name INTO vItemName FROM vn.item WHERE id = vItemFk;
SELECT CONCAT("Añadido articulo ", vItemName, " cantidad:", vQuantity) INTO vDescription;
@@ -49212,7 +49207,7 @@ BEGIN
JOIN vn.state ss on ss.code = 'PREPARED'
LEFT JOIN vn.saleTracking st on st.saleFk = s.id AND st.stateFk = ss.id
WHERE c.workerFk = vWorkerFk
- AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW())
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
AND s.quantity != 0
GROUP BY c.id
HAVING totalRow > pickedRow;
@@ -49318,7 +49313,7 @@ BEGIN
FROM vn.collection c
LEFT JOIN vn.state s ON c.stateFk = s.id
WHERE c.workerFk = vWorkerFk AND s.code = 'ON_PREPARATION'
- AND created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW());
+ AND created >= TIMESTAMPADD(HOUR , -6,NOW());
END ;;
@@ -49369,59 +49364,117 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_missingTrash`(vSaleFk BIGINT, vQuantity INT, vIsTrash BOOLEAN, vWarehouseFk INT, vNewQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_missingTrash`(
+ vSaleFk BIGINT,
+ vQuantity INT,
+ vIsTrash BOOLEAN,
+ vWarehouseFk INT,
+ vNewQuantity INT)
BEGIN
+/**
+* Modifica la cantidad de una sale tirándola a faltas o basura
+*
+* @param vSaleFk el id de la sale
+* @param vQuantity cantidad que se va a tirar a faltas o basura
+* @param vWarehouseFk id warehouse
+* @param vNewQuantity cantidad que se queda en el ticket original
+*/
DECLARE vTicketFk INT;
DECLARE vClientFk INT DEFAULT 400;
- DECLARE vClientName VARCHAR(50);
- DECLARE vConsignatario INT;
- DECLARE vOriginalQuantity INT;
- DECLARE vDescription VARCHAR(100);
- DECLARE vConcept VARCHAR(100);
- DECLARE vOrigin INT;
+ DECLARE vClientName VARCHAR(50);
+ DECLARE vConsignatario INT;
+ DECLARE vOriginalQuantity INT;
+ DECLARE vDescription VARCHAR(100);
+ DECLARE vCompanyVnlFk INT;
+ DECLARE vOrigin INT;
IF vIsTrash THEN
- SELECT 200 INTO vClientFk;
+ SELECT id INTO vClientFk
+ FROM client c
+ WHERE c.name='BASURA';
END IF;
-
- SELECT concept INTO vConcept FROM vn.sale WHERE id = vSaleFk;
- SELECT ticketFk INTO vOrigin FROM vn.sale WHERE id = vSaleFk;
- SELECT CONCAT("Cambio cantidad ",vConcept," de ", vQuantity ," a ", vNewQuantity) INTO vDescription;
-
- INSERT INTO vn.ticketLog (originFk, userFk, action , description)
- VALUES(vOrigin, vn.getUser(), 'update', vDescription);
- SELECT t.id INTO vTicketFk FROM vn.ticket t WHERE t.created > DATE_SUB(util.VN_NOW(), INTERVAL 1 DAY) AND t.clientFk = vClientFk AND t.warehouseFk = vWarehouseFk LIMIT 1;
-
- IF vTicketFk IS NULL THEN
- SELECT c.name , co.id INTO vClientName,vConsignatario
- FROM vn.client c
- INNER JOIN vn.address co ON c.id = co.clientFk
- WHERE c.id = vClientFk
- LIMIT 1;
-
- CALL ticket_add(vClientFk,
- util.VN_NOW(), vWarehouseFk,
- 442,
- vConsignatario,
- NULL,
- NULL,
- NULL,
- account.myUser_getId(),
- TRUE,
- vTicketFk);
-
- SELECT t.id INTO vTicketFk FROM vn.ticket t WHERE t.created > DATE_SUB(util.VN_NOW(), INTERVAL 1 DAY) AND t.clientFk = vClientFk AND t.warehouseFk = vWarehouseFk LIMIT 1;
-
- END IF;
-
- INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded)
- SELECT itemFk, vTicketFk, CONCAT(concept," ",vn.getWorkerCode(), " ",LEFT(CAST(util.VN_NOW() AS TIME),5)), vQuantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded
- FROM vn.sale s WHERE s.id = vSaleFk;
-
- SELECT quantity INTO vOriginalQuantity FROM vn.sale WHERE id = vSaleFk;
- UPDATE vn.sale SET originalQuantity = vOriginalQuantity ,quantity = vNewQuantity WHERE id = vSaleFk;
-
+ SELECT CONCAT("Cambio cantidad del artículo ",itemFk, ", ",concept,", de ", quantity," a ", vNewQuantity), ticketFk
+ INTO vDescription,vOrigin
+ FROM sale
+ WHERE id = vSaleFk;
+
+ CALL logAdd(vOrigin, 'update', 'ticket', vDescription);
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ WHERE t.created > DATE_SUB(NOW(), INTERVAL 1 DAY)
+ AND t.clientFk = vClientFk
+ AND t.warehouseFk = vWarehouseFk
+ LIMIT 1;
+
+ IF vTicketFk IS NULL THEN
+ SELECT c.name , co.id INTO vClientName,vConsignatario
+ FROM client c
+ JOIN address co ON c.id = co.clientFk
+ WHERE c.id = vClientFk
+ LIMIT 1;
+
+ SELECT id INTO vCompanyVnlFk
+ FROM company
+ WHERE code = 'VNL';
+
+ CALL ticket_add(vClientFk,
+ NOW(), vWarehouseFk,
+ vCompanyVnlFk,
+ vConsignatario,
+ NULL,
+ NULL,
+ NULL,
+ account.myUser_getId(),
+ TRUE,
+ vTicketFk);
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ WHERE t.created > DATE_SUB(NOW(), INTERVAL 1 DAY)
+ AND t.clientFk = vClientFk
+ AND t.warehouseFk = vWarehouseFk
+ LIMIT 1;
+ END IF;
+
+ INSERT INTO sale (itemFk,
+ ticketFk,
+ concept,
+ quantity,
+ originalQuantity,
+ price,
+ discount,
+ priceFixed,
+ reserved,
+ isPicked,
+ isPriceFixed,
+ created,
+ isAdded)
+ SELECT itemFk,
+ vTicketFk,
+ CONCAT(concept," ",getWorkerCode(), " ", LEFT(CAST(NOW() AS TIME),5)),
+ vQuantity,
+ originalQuantity,
+ price,
+ discount,
+ priceFixed,
+ reserved,
+ isPicked,
+ isPriceFixed,
+ created,
+ isAdded
+ FROM sale s
+ WHERE s.id = vSaleFk;
+
+ SELECT quantity INTO vOriginalQuantity
+ FROM sale
+ WHERE id = vSaleFk;
+
+ UPDATE sale
+ SET originalQuantity = vOriginalQuantity,
+ quantity = vNewQuantity
+ WHERE id = vSaleFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -49566,7 +49619,7 @@ proc:BEGIN
JOIN vn.state ss ON ss.code = 'PREPARED'
LEFT JOIN vn.saleTracking st ON st.saleFk = s.id AND st.stateFk = ss.id
WHERE c.workerFk = vUserFk
- AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW())
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
AND s.quantity != 0
GROUP BY c.id
HAVING totalRow > pickedRow) sub;
@@ -49685,7 +49738,7 @@ proc:BEGIN
JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
JOIN vn.agency a ON a.id = am.agencyFk
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (pb.ubicacion IS NOT NULL
OR a.isOwn = FALSE )
AND s.isPreparable
@@ -49711,7 +49764,7 @@ proc:BEGIN
JOIN vn.ticket t ON t.id = pb.ticketFk
JOIN vn.ticketConfig tc
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (LENGTH(pb.problem) = 0
OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
AND (pb.ubicacion IS NOT NULL
@@ -49723,7 +49776,7 @@ proc:BEGIN
OR (pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV))
OR (pb.H = 0 AND pb.V = 0 AND pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV))
)
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , util.VN_NOW())
+ AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
AND (pc.isPreviousPreparationRequired = FALSE
OR pb.previousWithoutParking = FALSE)
ORDER BY HH,
@@ -50130,7 +50183,7 @@ proc:BEGIN
DECLARE vTrainFk INT DEFAULT 1;
DECLARE vNow DATETIME;
- SELECT ticketPrintedMax * vWagons, ticketTrolleyMax * vWagons, pc.maxNotReadyCollections , util.VN_NOW()
+ SELECT ticketPrintedMax * vWagons, ticketTrolleyMax * vWagons, pc.maxNotReadyCollections , NOW()
INTO vMaxTicketPrinted, vMaxTickets, vMaxNotReadyCollections, vNow
FROM vn.productionConfig pc;
@@ -50163,7 +50216,7 @@ proc:BEGIN
JOIN vn.state ss ON ss.code = 'PREPARED'
LEFT JOIN vn.saleTracking st ON st.saleFk = s.id AND st.stateFk = ss.id
WHERE c.workerFk = vUserFk
- AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW())
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
AND s.quantity != 0
GROUP BY c.id
HAVING totalRow > pickedRow) sub;
@@ -50284,7 +50337,7 @@ call util.debugAdd('wargo',CONCAT('vNotReadyCollections ',vNotReadyCollections))
JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
JOIN vn.agency a ON a.id = am.agencyFk
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (pb.ubicacion IS NOT NULL
OR a.isOwn = FALSE )
AND s.isPreparable
@@ -50313,7 +50366,7 @@ call util.debugAdd('wargo',CONCAT('vPrintedTickets ',vPrintedTickets));
JOIN vn.ticket t ON t.id = pb.ticketFk
JOIN vn.ticketConfig tc
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (LENGTH(pb.problem) = 0
OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
AND (pb.ubicacion IS NOT NULL
@@ -50325,7 +50378,7 @@ call util.debugAdd('wargo',CONCAT('vPrintedTickets ',vPrintedTickets));
OR (pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV))
OR (pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV))
)
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , util.VN_NOW())
+ AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
AND (pc.isPreviousPreparationRequired = FALSE
OR pb.previousWithoutParking = FALSE)
ORDER BY HH,
@@ -50786,9 +50839,15 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_setParking`(IN `vCollectionFk` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
+/**
+ * Aparca una colección en un parking.
+ *
+ * @param vCollectionFk Id de la colección
+ * @param vParkingFk Id del parking
+ */
REPLACE vn.ticketParking(ticketFk, parkingFk)
SELECT tc.ticketFk, vParkingFk
- FROM vn.ticketCollection tc
+ FROM vn.ticketCollection tc
WHERE tc.collectionFk = vCollectionFk;
END ;;
DELIMITER ;
@@ -51158,93 +51217,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `dayMinuteWorker` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `dayMinuteWorker`(vDateFrom DATETIME, vDateTo DATETIME)
-BEGIN
-
- DECLARE vDateStart DATE DEFAULT vDateFrom;
- DECLARE vDateEnd DATETIME DEFAULT util.dayEnd(vDateTo);
-
- SET @ordr := 0;
- SET @user := 0;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.dayMinuteWorker;
- CREATE TEMPORARY TABLE tmp.dayMinuteWorker
- SELECT sub3.id,
- sub3.hh `Hour`,
- sub3.mm Minut,
- sub3.userFk,
- sub3.code workerCode,
- sub3.firstname name,
- sub3.lastName surnames,
- sub3.workcenterFk center,
- w.name centerName,
- w2.name warehouseName,
- w2.hasProduction production
- FROM vn.workCenter w
- JOIN(SELECT id,
- hh,
- mm,
- userFk,
- code,
- firstname,
- lastName,
- @ordr := IF(@user != userFk,0,@ordr),
- IF(@ordr MOD 2, 'presente','--') state,
- @ordr := IFNULL(sub2.`order`,@ordr),
- @user := IFNULL(sub2.`userFk`,@user),
- workcenterFk
- FROM(SELECT dm.id,
- dm.hh,
- dm.mm,
- users.userFk,
- sub.`order`,
- users.code,
- firstName,
- lastName,
- users.workcenterFk
- FROM dayMinute dm
- JOIN(SELECT DISTINCT wtc.userFk ,
- code ,
- firstName,
- lastName,
- wl.workCenterFk
- FROM vn.workerTimeControl wtc
- JOIN vn.worker w ON w.userFk = wtc.userFk
- JOIN vn.workerLabour wl ON wl.workerFK = w.id
- AND wtc.timed BETWEEN wl.started AND IFNULL(wl.ended, util.VN_CURDATE())
- WHERE wtc.timed BETWEEN vDateStart AND vDateEnd
- ) users
- LEFT JOIN(SELECT `order`,
- wtc.userFk,
- hour(wtc.timed) * 100 + minute(wtc.timed) as dayMinuteFk
- FROM vn.workerTimeControl wtc
- WHERE wtc.timed BETWEEN vDateStart AND vDateEnd
- ORDER BY wtc.userFk, `order`
- ) sub ON sub.dayMinuteFk = dm.id AND sub.userFk = users.userFk
- ORDER BY userFk,dm.id
- ) sub2
- ) sub3 ON sub3.workcenterFk = w.id
- JOIN vn.warehouse w2 ON w2.id = w.warehouseFk
- WHERE state = 'presente'
- AND sub3.id BETWEEN HOUR(vDateFrom) *100 + MINUTE(vDateFrom)
- AND HOUR(vDateTo) *100 + MINUTE(vDateTo);
-
- END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `department_calcTree` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -51874,7 +51846,7 @@ BEGIN
DECLARE vDiff DECIMAL(10,2);
DECLARE vApunte BIGINT;
- SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE()) INTO vBookNumber, vBookDated
+ SELECT ASIEN, IFNULL(bookEntried, CURDATE()) INTO vBookNumber, vBookDated
FROM dua
WHERE id = vDuaFk;
@@ -52110,13 +52082,13 @@ DECLARE done INT DEFAULT FALSE;
DECLARE vEntryFk INT;
DECLARE vTravelFk INT;
DECLARE vId INT;
-DECLARE vLanded DATE DEFAULT util.VN_CURDATE();
+DECLARE vLanded DATE DEFAULT CURDATE();
DECLARE cur1 CURSOR FOR SELECT id FROM vn.ektEntryAssign;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- IF HOUR(util.VN_NOW()) > 12 THEN
+ IF HOUR(NOW()) > 12 THEN
SET vLanded = TIMESTAMPADD(DAY,1,vLanded);
@@ -52140,7 +52112,7 @@ OPEN cur1;
JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
AND ea.supplierFk = e.supplierFk
WHERE ea.id = vId
AND tr.landed = vLanded
@@ -52153,7 +52125,7 @@ OPEN cur1;
JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
WHERE ea.id = vId
AND tr.landed = vLanded
AND ea.supplierFk IS NULL
@@ -52169,13 +52141,13 @@ OPEN cur1;
FROM vn.travel tr
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
WHERE ea.id = vId
AND tr.landed = vLanded;
IF NOT vTravelFk THEN
- INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
+ INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk
FROM vn.ektEntryAssign
WHERE id = vId;
@@ -52239,7 +52211,7 @@ BEGIN
INSERT INTO vn.energyMeter
SET
`input` = vInput,
- `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'),
+ `period` = DATE_FORMAT(NOW(), '%Y-%m-%d %H:00:00'),
`activeTime` = vActiveTime,
`consumption` = CAST(IFNULL((vConsumption / 3600) * vActiveTime, 0) AS DECIMAL(10,2))
ON DUPLICATE KEY UPDATE
@@ -52277,8 +52249,8 @@ BEGIN
ELSE
- INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyFk, ref, isDelivered, isReceived)
- SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE
+ INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, ref, isDelivered, isReceived)
+ SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyModeFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE
FROM vn.travel WHERE id = vTravelFk;
SELECT LAST_INSERT_ID() INTO vTravelFk;
@@ -52345,7 +52317,7 @@ BEGIN
SELECT t.id, e.id INTO vTravel, vEntry
FROM travel t LEFT JOIN entry e ON t.id = e.travelFk
WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse
- AND t.warehouseInFk = vLandingWarehouse AND t.agencyFk IS NULL AND e.supplierFk = vSupplierFk
+ AND t.warehouseInFk = vLandingWarehouse AND t.agencyModeFk IS NULL AND e.supplierFk = vSupplierFk
LIMIT 1;
-- creamos el travel si es necesario
@@ -52468,55 +52440,55 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `entry_cloneWithoutBuy` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_cloneWithoutBuy`(vSelf INT, OUT vNewEntryFk INT)
BEGIN
-
/**
* Clona una entrada sin compras
*
* @param vSelf Identificador de vn.entry
- *
- * @return vNewEntryFk Identificador de la nueva entrada
+ * @param vNewEntryFk Identificador de la nueva entrada
*/
-
START TRANSACTION;
- INSERT INTO vn.entry(supplierFk,
- dated,
- isInventory,
- notes,
- isRaid,
- commission,
- travelFk,
- currencyFk,
- companyFk,
- loadPriority)
+ INSERT INTO vn.entry(
+ supplierFk,
+ dated,
+ isExcludedFromAvailable,
+ notes,
+ isRaid,
+ commission,
+ travelFk,
+ currencyFk,
+ companyFk,
+ loadPriority,
+ `ref`
+ )
SELECT supplierFk,
dated,
- isInventory,
+ isExcludedFromAvailable,
notes,
isRaid,
commission,
travelFk,
- currencyFk,
+ currencyFk,
companyFk,
- loadPriority
+ loadPriority,
+ `ref`
FROM vn.entry e
WHERE e.id = vSelf;
-
+
SET vNewEntryFk = LAST_INSERT_ID();
COMMIT;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -52669,6 +52641,8 @@ BEGIN
*/
DECLARE vNewTravelFk INT;
DECLARE vTravelFk INT;
+ DECLARE vInvoiceAmountOldEntryFk DECIMAL(10,2);
+ DECLARE vInvoiceAmountNewEntry DECIMAL(10,2);
SELECT travelFk INTO vTravelFk
FROM vn.entry
@@ -52796,6 +52770,26 @@ BEGIN
AND printedStickers != stickers;
END IF;
+ SELECT SUM(IFNULL(b.buyingValue * b.quantity, 0)) INTO vInvoiceAmountOldEntryFk
+ FROM vn.buy b
+ WHERE b.entryFk = vSelf;
+
+ UPDATE vn.entry e
+ JOIN vn.buy b ON b.entryFk = e.id
+ SET e.ref = CONCAT(e.ref,'(1)'),
+ e.invoiceAmount = vInvoiceAmountOldEntryFk
+ WHERE e.id = vSelf;
+
+ SELECT SUM(IFNULL(b.buyingValue * b.quantity, 0)) INTO vInvoiceAmountNewEntry
+ FROM vn.buy b
+ WHERE b.entryFk = vNewEntryFk;
+
+ UPDATE vn.entry e
+ JOIN vn.buy b ON b.entryFk = e.id
+ SET e.ref = CONCAT(e.ref,'(2)'),
+ e.invoiceAmount = vInvoiceAmountNewEntry
+ WHERE e.id = vNewEntryFk;
+
INSERT INTO entryLog
SET action = 'update',
description = CONCAT('Se ha creado la entrada ', vNewEntryFk,' transferida desde la ', vSelf),
@@ -52825,33 +52819,33 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_notifyChanged`(vSelf INT, vBuyFk INT, vOldValues VARCHAR(512), vNewValues VARCHAR(512))
BEGIN
- DECLARE vEmail VARCHAR(255);
- DECLARE vFields VARCHAR(100);
- DECLARE vMessage TEXT;
+ DECLARE vEmail VARCHAR(255);
+ DECLARE vFields VARCHAR(100);
+ DECLARE vMessage TEXT;
- SELECT e.mailToNotify INTO vEmail
- FROM entryConfig e
- LIMIT 1;
+ SELECT e.mailToNotify INTO vEmail
+ FROM entryConfig e
+ LIMIT 1;
- SET vFields = CONCAT_WS(',',
- 'entryFk',
- 'itemFk',
- 'quantity',
- 'price1',
- 'price2',
- 'price3'
- );
- SET vMessage = util.formatTable(vFields, vOldValues, vNewValues);
+ SET vFields = CONCAT_WS(',',
+ 'entryFk',
+ 'itemFk',
+ 'quantity',
+ 'price1',
+ 'price2',
+ 'price3'
+ );
+ SET vMessage = util.formatTable(vFields, vOldValues, vNewValues);
- CALL mail_insert(
- vEmail,
- NULL,
- CONCAT(
- 'Se ha modificado una línea de la entrada ', vSelf
- ,' siendo inventario o anterior al mismo'
- ),
- vMessage
- );
+ CALL mail_insert(
+ vEmail,
+ NULL,
+ CONCAT(
+ 'Se ha modificado una línea de la entrada ', vSelf
+ ,' siendo inventario o anterior al mismo'
+ ),
+ vMessage
+ );
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53100,22 +53094,27 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `errorProduction_add` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add`(vAction VARCHAR(25), vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add`(
+ vAction VARCHAR(25),
+ vDatedFrom DATETIME,
+ vDatedTo DATETIME)
BEGIN
-
/**
- * Fill in the errorProduction table
- */
-
+ * Rellena la tabla vn.errorProduction
+ *
+ * @param vAction Accion que se quiere añadir
+ * @param vDatedFrom Fecha desde
+ * @param vDatedTo Fecha hasta
+ */
DECLARE vDepartment VARCHAR(255);
DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
@@ -53155,7 +53154,8 @@ BEGIN
JOIN vncontrol.accion a ON a.accion_id = st.actionFk
JOIN sale s ON s.id = st.saleFk
JOIN ticket t ON s.ticketFk = t.id
- WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) AND a.accion = vAction
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ AND a.accion = vAction
GROUP BY st.workerFk;
END IF;
@@ -53189,8 +53189,8 @@ BEGIN
SELECT st.workerFk,
t.id
FROM saleMistake sm
- JOIN saleTracking st ON sm.saleFk = st.saleFk
- JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+ JOIN saleTracking st ON sm.saleFk = st.saleFk
+ JOIN vncontrol.accion a ON a.accion_id = st.actionFk
JOIN sale s ON s.id = sm.saleFk
JOIN ticket t on t.id = s.ticketFk
WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
@@ -53198,29 +53198,47 @@ BEGIN
GROUP BY s.ticketFk
) sub1
GROUP BY sub1.workerFk;
-
- INSERT INTO errorProduction(userFk, firstname, lastname, rol, ticketNumber, lineNumber, error, volume, hourStart, hourEnd, hourWorked, dated)
- SELECT w.id,
- w.firstName,
- w.lastName,
- vDepartment,
- t.ticketCount totalTickets,
- t.lineCount,
- IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
- IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
- SUBSTRING(tc.timed, 1, 5) hourStart,
- SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
- IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
- vDatedFrom dated
- FROM tmp.total t
- LEFT JOIN worker w ON w.id = t.workerFk
- LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
- LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
- LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
- LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
- GROUP BY w.id;
-
+
IF (vDepartment = 'Sacadores') THEN
+
+ INSERT INTO errorProduction(userFk,
+ firstname,
+ lastname,
+ rol,
+ ticketNumber,
+ lineNumber,
+ error,
+ volume,
+ hourStart,
+ hourEnd,
+ hourWorked,
+ dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ vDepartment,
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
+ IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
+ SUBSTRING(tc.timed, 1, 5) hourStart,
+ SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ JOIN (SELECT DISTINCT w.id -- Verificamos que son sacadores
+ FROM vn.collection c
+ JOIN vn.state s ON s.id = c.stateFk
+ JOIN vn.train tn ON tn.id = c.trainFk
+ JOIN vn.worker w ON w.id = c.workerFk
+ WHERE c.created BETWEEN vDatedFrom AND vDatedTo) sub ON sub.id = w.id
+ GROUP BY w.id;
+
CREATE TEMPORARY TABLE tmp.itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores
ENGINE = MEMORY
SELECT COUNT(c.ticketFk) errors,
@@ -53235,12 +53253,43 @@ BEGIN
AND cr.description = 'Revisadores'
AND s.code = 'ON_PREPARATION'
GROUP BY workerFk;
-
+
UPDATE errorProduction ep
JOIN tmp.itemPickerErrors ipe ON ipe.workerFk = ep.userFk
SET ep.error = ep.error + ipe.errors
WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores';
-
+ ELSE
+ INSERT INTO errorProduction(userFk,
+ firstname,
+ lastname,
+ rol,
+ ticketNumber,
+ lineNumber,
+ error,
+ volume,
+ hourStart,
+ hourEnd,
+ hourWorked,
+ dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ vDepartment,
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
+ IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
+ SUBSTRING(tc.timed, 1, 5) hourStart,
+ SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ GROUP BY w.id;
END IF;
DROP TEMPORARY TABLE tmp.timeControlCalculate;
@@ -53249,7 +53298,6 @@ BEGIN
DROP TEMPORARY TABLE tmp.errorsByClaim;
DROP TEMPORARY TABLE tmp.volume;
DROP TEMPORARY TABLE tmp.errorsByChecker;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53271,7 +53319,7 @@ BEGIN
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
- SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
+ SELECT DATE_SUB(CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
CALL vn.errorProduction_add('SACAR', vDatedFrom, vDatedTo);
CALL vn.errorProduction_add('ENCAJAR', vDatedFrom, vDatedTo);
@@ -53390,26 +53438,39 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_printLabel`(vSelf INT)
BEGIN
-
+/**
+ * Inserta en la cola de impresión teniendo en cuenta el sector de trabajador
+ * la expedición que se pasa como variable al procedimiento vSelf.
+ *
+ * @param vSelf identificador de expedition pallet
+ */
DECLARE vReport INT;
DECLARE vPrinterFk INT;
+ SET vReport = NULL;
+
+ SELECT s.reportFk, w.labelerFk INTO vReport, vPrinterFk
+ FROM worker w
+ JOIN sector s ON s.id = w.sectorFk
+ JOIN report r ON r.id = s.reportFk
+ WHERE w.id = account.myUser_getId()
+ AND r.name = 'LabelPalletExpedition';
+
+ IF vReport IS NULL THEN
+ CALL util.throw('Sector incorrecto');
+ END IF;
+
UPDATE vn.expeditionPallet
SET isPrint = FALSE
WHERE id = vSelf;
- SELECT s.reportFk, w.labelerFk INTO vReport, vPrinterFk
- FROM worker w
- LEFT JOIN sector s ON s.id= w.sectorFk
- WHERE w.id = account.myUser_getId();
-
INSERT INTO printQueue (printerFk, priorityFk, reportFk, workerFk)
SELECT vPrinterFk, qp.id, vReport, account.myUser_getId()
FROM queuePriority qp
- WHERE qp.`code`= 'high';
-
+ WHERE qp.`code`= 'high';
+
INSERT INTO printQueueArgs (printQueueFk, `name`, `value` )
- SELECT LAST_INSERT_ID(), 'palletFk', vSelf;
+ SELECT LAST_INSERT_ID(), 'palletFk', vSelf;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53753,7 +53814,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_Add`(vHour VARCHAR(
BEGIN
INSERT INTO vn.expeditionTruck(ETD,description)
- VALUES(CONCAT(util.VN_CURDATE(), ' ', vHour), vDescription);
+ VALUES(CONCAT(CURDATE(), ' ', vHour), vDescription);
END ;;
DELIMITER ;
@@ -53778,7 +53839,7 @@ BEGIN
ETD,
description Destino
FROM vn.expeditionTruck
- WHERE ETD BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE ETD BETWEEN CURDATE() AND util.dayend(CURDATE())
ORDER BY ETD;
END ;;
DELIMITER ;
@@ -53813,10 +53874,11 @@ BEGIN
a.nickname,
sub2.itemPackingTypeConcat,
est.code
- FROM expedition e
+ FROM expedition e
JOIN ticket t ON t.id = e.ticketFk
JOIN ticketState ts ON ts.ticketFk = e.ticketFk
JOIN address a ON t.addressFk = a.id
+ JOIN route r ON r.id = t.routeFk
LEFT JOIN warehouse w ON t.warehouseFk = w.id
LEFT JOIN (SELECT sub.ticketFk,
CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeConcat
@@ -53829,7 +53891,8 @@ BEGIN
GROUP BY sub.ticketFk
) sub2 ON sub2.ticketFk = t.id
LEFT JOIN expeditionStateType est ON est.id = e.stateTypeFk
- WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE;
+ WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE
+ ORDER BY r.created, t.priority DESC;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -54038,7 +54101,7 @@ BEGIN
JOIN vn.client c ON c.id = t.clientFk
WHERE c.typeFk = 'loses' COLLATE utf8_unicode_ci
AND s.isPicked = FALSE
- AND date(t.shipped) = util.VN_CURDATE()
+ AND date(t.shipped) = CURDATE()
AND t.warehouseFk = vWarehouseFk
) sub ON sub.itemFk = ishr.itemFk
;
@@ -54068,7 +54131,7 @@ BEGIN
JOIN vn.client c ON c.id = t.clientFk
SET s.isPicked = TRUE
WHERE c.typeFk = 'loses' COLLATE utf8_unicode_ci
- AND date(t.shipped) = util.VN_CURDATE()
+ AND date(t.shipped) = CURDATE()
AND t.warehouseFk = vWarehouseFk
AND s.itemFk = vItemFk;
@@ -54380,7 +54443,7 @@ BEGIN
t.routeFk as routeFk
FROM vn2008.expeditions e
INNER JOIN vn.ticket t ON t.id = e.ticket_id
- WHERE DATE(odbc_date) = util.VN_CURDATE();
+ WHERE DATE(odbc_date) = CURDATE();
END ;;
DELIMITER ;
@@ -54460,6 +54523,41 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `greuge_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `greuge_add`()
+BEGIN
+/**
+ * Group inserts into vn.greuge and then deletes the records just inserted
+ */
+ DECLARE vDated DATE;
+
+ SELECT DATE_SUB(CURDATE(), INTERVAL yearsToDelete YEAR) INTO vDated
+ FROM vn.greugeConfig;
+
+ INSERT INTO vn.greuge(clientFk, description, amount, shipped, created, greugeTypeFk)
+ SELECT clientFk, 'Suma agrupada', SUM(amount), MAX(shipped), MAX(created), greugeTypeFk
+ FROM vn.greuge
+ WHERE shipped <= vDated AND description <> 'Suma agrupada'
+ GROUP BY clientFk, greugeTypeFk;
+
+ DELETE
+ FROM vn.greuge
+ WHERE shipped <= vDated AND description <> 'Suma agrupada';
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `intrastat_data_neto_Update` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -54624,7 +54722,7 @@ proc: BEGIN
WHERE warehouseOutFk = 13
AND warehouseInFk = vWh
AND landed = vDate
- AND agencyFk = 53
+ AND agencyModeFk = 53
AND ref = 'inventario'
LIMIT 1;
@@ -54635,7 +54733,7 @@ proc: BEGIN
warehouseInFk = vWh,
shipped = vDate,
landed = vDate,
- agencyFk = 53,
+ agencyModeFk = 53,
ref = 'inventario',
isDelivered = TRUE,
isReceived = TRUE;
@@ -54787,12 +54885,12 @@ proc: BEGIN
vEntryFk
FROM tmp.inventory;
- SELECT vWh, count(*), util.VN_NOW() FROM tmp.inventory;
+ SELECT vWh, count(*), NOW() FROM tmp.inventory;
-- Actualizamos el campo lastUsed de vn.item
UPDATE vn.item i
JOIN tmp.inventory i2 ON i2.itemFk = i.id
- SET i.lastUsed = util.VN_NOW()
+ SET i.lastUsed = NOW()
WHERE i2.quantity;
-- DROP TEMPORARY TABLE tmp.inventory;
@@ -54812,8 +54910,8 @@ proc: BEGIN
FROM vn.travel t
JOIN vn.entry e ON e.travelFk = t.id
WHERE e.supplierFk = 4
- AND t.shipped <= TIMESTAMPADD(DAY, -2, TIMESTAMPADD(DAY, -10, util.VN_CURDATE()))
- AND (DAY(t.shipped) <> 1 OR shipped < TIMESTAMPADD(MONTH, -12, util.VN_CURDATE()));
+ AND t.shipped <= TIMESTAMPADD(DAY, -2, TIMESTAMPADD(DAY, -10, CURDATE()))
+ AND (DAY(t.shipped) <> 1 OR shipped < TIMESTAMPADD(MONTH, -12, CURDATE()));
DELETE e
FROM vn.entry e
@@ -54844,7 +54942,7 @@ BEGIN
* Recalcula los inventarios de todos los almacenes.
*/
- call vn.inventoryMake(TIMESTAMPADD(DAY, -10, util.VN_CURDATE()), 0);
+ call vn.inventoryMake(TIMESTAMPADD(DAY, -10, CURDATE()), 0);
END ;;
DELIMITER ;
@@ -54900,7 +54998,7 @@ BEGIN
LEFT JOIN origin o ON o.id = i.originFk
) ON it.id = i.typeFk
LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
- WHERE (b.packageFk = "--" 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.packageFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,CURDATE())) AND s.name = 'INVENTARIO';
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
CREATE TEMPORARY TABLE tmp.lastEntryOk
@@ -54937,7 +55035,7 @@ BEGIN
LEFT JOIN origin o ON o.id = i.originFk
) ON it.id = i.typeFk
LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
- WHERE b.packageFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,util.VN_CURDATE()))
+ WHERE b.packageFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,CURDATE()))
ORDER BY tr.landed DESC;
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOkGroup;
@@ -55032,7 +55130,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromAddress`(vMaxTicketDate DATETIME,vAddress INT,vCompany INT)
BEGIN
- DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, util.VN_CURDATE());
+ DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, CURDATE());
SET vMaxTicketDate = vn2008.DAYEND(vMaxTicketDate);
@@ -55063,7 +55161,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromClient`(IN vMaxTicketDate datetime, IN vClientFk INT, IN vCompanyFk INT)
BEGIN
- DECLARE vMinTicketDate DATE DEFAULT TIMESTAMPADD(YEAR, -3, util.VN_CURDATE());
+ DECLARE vMinTicketDate DATE DEFAULT TIMESTAMPADD(YEAR, -3, CURDATE());
SET vMaxTicketDate = util.dayend(vMaxTicketDate);
DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
@@ -55925,7 +56023,7 @@ BEGIN
WHERE iot.invoiceOutFk = vInvoice;
UPDATE invoiceOut
- SET booked = util.VN_CURDATE()
+ SET booked = CURDATE()
WHERE id = vInvoice;
END ;;
DELIMITER ;
@@ -56245,7 +56343,7 @@ BEGIN
DECLARE vNewInvoiceInId INT;
DECLARE vIsInterCompany BOOL;
- SET vInvoiceDate = IFNULL(vInvoiceDate,util.VN_CURDATE());
+ SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
SELECT t.clientFk, t.companyFk
INTO vClient, vCompany
@@ -56474,7 +56572,7 @@ BEGIN
END IF;
CALL invoiceFromClient(vMaxShipped, vClientFk, vCompanyFk);
- CALL invoiceOut_new(vSerial, util.VN_CURDATE(), vTaxArea, vInvoiceId);
+ CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
UPDATE invoiceOut
SET `ref` = vRef
@@ -56513,7 +56611,7 @@ BEGIN
*/
DECLARE vIsRefEditable BOOLEAN;
CALL invoiceFromTicket(vTicketFk);
- CALL invoiceOut_new(vSerial, util.VN_CURDATE(), vTaxArea, vInvoiceId);
+ CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
IF vRef IS NOT NULL THEN
SELECT isRefEditable INTO vIsRefEditable
@@ -56721,14 +56819,14 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
FROM vn2008.item_out
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ WHERE dat BETWEEN CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(curdate()))
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) sale ON sale.item_id = i.id
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
FROM vn2008.item_entry_in
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ WHERE dat BETWEEN CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(curdate()))
AND warehouse_id = vWarehouseFk
AND isVirtualStock = FALSE
GROUP BY item_id
@@ -56736,7 +56834,7 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
FROM vn2008.item_entry_out
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ WHERE dat BETWEEN CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(curdate()))
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) mov ON mov.item_id = i.id
@@ -57623,7 +57721,7 @@ BEGIN
AND IFNULL(sub3.transit,0) < s.quantity
AND s.isPicked = FALSE
AND s.reserved = FALSE
- AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND MIDNIGHT(CURDATE())
AND tst.isPreviousPreparable = TRUE
AND t.warehouseFk = vWarehouseFk
AND iss.sectorFk = vSectorFk
@@ -57690,7 +57788,7 @@ proc:BEGIN
WHERE id = vSectorFk;
CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
- CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE());
DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar;
@@ -57819,15 +57917,15 @@ proc:BEGIN
LEFT JOIN vn.zone z ON z.id = t.zoneFk
LEFT JOIN (SELECT DISTINCT saleFk
FROM vn.saleTracking st
- WHERE st.created > util.VN_CURDATE()
+ WHERE st.created > CURDATE()
AND st.isChecked
) stPrevious ON `stPrevious`.`saleFk` = io.saleFk
WHERE t.warehouseFk = vWarehouseFk
AND s.isPicked = 0
AND NOT io.Reservado
AND stPrevious.saleFk IS NULL
- AND io.dat >= util.VN_CURDATE()
- AND io.dat < util.VN_CURDATE()+1
+ AND io.dat >= CURDATE()
+ AND io.dat < CURDATE()+1
) sub
GROUP BY itemFk, hours, minutes;
@@ -57872,10 +57970,10 @@ BEGIN
DECLARE vWarehouseFk INT DEFAULT 1;
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
- DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
+ DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(CURDATE());
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
- CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE());
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
@@ -57905,7 +58003,7 @@ BEGIN
JOIN tmp.item2 ti ON ti.itemFk = s.itemFk
JOIN vn.ticket t ON t.id = s.ticketFk
LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND vTodayDayEnd
+ WHERE t.shipped BETWEEN CURDATE() AND vTodayDayEnd
AND t.warehouseFk = vWarehouseFk
AND IFNULL(tst.productionOrder,0) < 5
GROUP BY s.itemFK
@@ -57937,10 +58035,10 @@ BEGIN
DECLARE vWarehouseFk INT DEFAULT 1;
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
- DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
+ DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(CURDATE());
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
- CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE());
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
@@ -58025,7 +58123,7 @@ BEGIN
LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58052,7 +58150,7 @@ BEGIN
LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58240,7 +58338,7 @@ BEGIN
JOIN ticket t ON t.id = c.ticketFk
WHERE c.id = vClaimFk;
- CALL buyUltimate (vWarehouseFk, util.VN_CURDATE());
+ CALL buyUltimate (vWarehouseFk, CURDATE());
INSERT INTO itemShelving (itemFk, shelvingFk, packing, `grouping`, visible)
SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity AS visible
@@ -58377,7 +58475,7 @@ proc:BEGIN
JOIN ticket t ON t.id = s.ticketFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58402,7 +58500,7 @@ proc:BEGIN
JOIN ticket t ON t.id = s.ticketFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58463,6 +58561,41 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_getAlternatives` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getAlternatives`(vShelvingFk VARCHAR(10))
+BEGIN
+/**
+ * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula
+ * del carro que se le ha pasado.
+ *
+ * @param vShelvingFk matricula del carro
+ */
+ SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder
+ FROM itemShelving is2
+ JOIN shelving sh ON sh.code = is2.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector s ON s.id = p.sectorFk
+ LEFT JOIN worker w ON w.sectorFk = s.id AND w.id = account.myUser_getId()
+ JOIN warehouse wh ON wh.id = s.warehouseFk
+ JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+ WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci
+ GROUP BY is2.id
+ ORDER BY p.pickingOrder DESC;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_getInfo` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -58549,11 +58682,11 @@ BEGIN
FROM (
SELECT * FROM (
SELECT t2.* FROM (
- SELECT item_id itemFk, amount, util.VN_CURDATE() dated
+ SELECT item_id itemFk, amount, CURDATE() dated
FROM cache.stock
WHERE warehouse_id = vWarehouseFk
UNION ALL
- SELECT ish.itemFk, - sum(visible), util.VN_CURDATE()
+ SELECT ish.itemFk, - sum(visible), CURDATE()
FROM vn.itemShelving ish
JOIN shelving sh ON sh.code = ish.shelvingFk
JOIN parking p ON sh.parkingFk = p.id
@@ -58563,21 +58696,21 @@ BEGIN
UNION ALL
SELECT item_id, sum(iei.amount), dat
FROM vn2008.item_entry_in iei
- WHERE dat >= util.VN_CURDATE()
+ WHERE dat >= CURDATE()
AND warehouse_id = vWarehouseFk
AND isVirtualStock = FALSE
GROUP BY item_id, dat
UNION ALL
SELECT item_id, sum(ieo.amount), dat
FROM vn2008.item_entry_out ieo
- WHERE dat >= util.VN_CURDATE()
+ WHERE dat >= CURDATE()
AND warehouse_id = vWarehouseFk
GROUP BY item_id, dat
UNION ALL
SELECT i.itemFk, sum(io.amount), dat
FROM vn2008.item_out io
JOIN tmp.item i ON i.itemFk = io.item_id
- WHERE io.dat >= util.VN_CURDATE()
+ WHERE io.dat >= CURDATE()
AND io.warehouse_id = vWarehouseFk
GROUP BY io.item_id, io.dat
) t2
@@ -58660,41 +58793,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_return` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_return`(vShelving VARCHAR(10))
-BEGIN
-/**
- * Devuelve un listado de posibles ubicaciones a ubicar los item de la matricula
- * del carro que se le ha pasado.
- *
- * @param vShelving matricula del carro
- */
- SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , i.longName , is2.visible
- FROM vn.itemShelving is2
- JOIN vn.item i ON i.id = is2.itemFk
- JOIN vn.shelving sh ON sh.code = is2.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector s ON s.id = p.sectorFk
- LEFT JOIN vn.worker w ON w.sectorFk = s.id AND w.id = account.myUser_getId()
- JOIN vn.warehouse wh ON wh.id = s.warehouseFk
- JOIN vn.itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelving COLLATE utf8_unicode_ci
- GROUP BY is2.id
- ORDER BY p.pickingOrder DESC;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_StarsUpdate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -58781,21 +58879,21 @@ BEGIN
SELECT itemFk, SUM(quantity) stock, SUM(quantity) visible, SUM(quantity) available FROM (
SELECT itemFk, quantity
FROM itemTicketOut
- WHERE shipped >= util.VN_CURDATE() AND shipped < vDated
+ WHERE shipped >= CURDATE() AND shipped < vDated
AND warehouseFk = vWarehouseFk
AND (vItemFk IS NULL OR itemFk = vItemFk)
UNION ALL
SELECT itemFk, quantity
FROM itemEntryIn i
LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk
- WHERE i.landed >= util.VN_CURDATE() AND i.landed < vDated
+ WHERE i.landed >= CURDATE() AND i.landed < vDated
AND i.warehouseInFk = vWarehouseFk
AND (vItemFk IS NULL OR i.itemFk = vItemFk)
AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
UNION ALL
SELECT itemFk, quantity
FROM itemEntryOut
- WHERE shipped >= util.VN_CURDATE() AND shipped < vDated
+ WHERE shipped >= CURDATE() AND shipped < vDated
AND warehouseOutFk = vWarehouseFk
AND (vItemFk IS NULL OR itemFk = vItemFk)
) t
@@ -59043,7 +59141,7 @@ BEGIN
SELECT s.itemFk, SUM(s.quantity) AS total, v.tipo_id typeFk
FROM vn.sale s
INNER JOIN bs.ventas v ON v.Id_Movimiento = s.id
- WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, util.VN_CURDATE()) AND util.VN_CURDATE()
+ WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, CURDATE()) AND CURDATE()
GROUP BY s.itemFk;
DROP TABLE IF EXISTS tmp.topSeller;
@@ -59121,7 +59219,7 @@ BEGIN
JOIN address a ON a.id=t.addressFk
WHERE t.warehouseFk = vWarehouseFk
AND t.clientFk = vClientFk
- AND DATE(t.shipped) = util.VN_CURDATE()
+ AND DATE(t.shipped) = CURDATE()
AND a.isDefaultAddress
LIMIT 1;
@@ -59131,13 +59229,13 @@ BEGIN
CALL ticket_add(
vClientFk,
- util.VN_CURDATE(),
+ CURDATE(),
vWarehouseFk,
vCompanyVnlFk,
NULL,
NULL,
NULL,
- util.VN_CURDATE(),
+ CURDATE(),
account.myUser_getId(),
FALSE,
vTicketFk);
@@ -59146,7 +59244,7 @@ BEGIN
INSERT INTO sale(ticketFk, itemFk, concept, quantity)
SELECT vTicketFk,
vItemFk,
- CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+ CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(NOW() AS TIME),5)),
vQuantity
FROM item
WHERE id = vItemFk;
@@ -59429,7 +59527,7 @@ BEGIN
WHERE isFloramondo
AND (ISNULL(i.supplyResponseFk)
OR sub.NumberOfUnits = 0
- OR sub.lodt < util.VN_NOW())
+ OR sub.lodt < NOW())
GROUP BY i.name,
subname,
value5,
@@ -59503,16 +59601,15 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_deactivateUnused`()
BEGIN
/**
- * Cambia a false el campo isActive de la tabla vn.item
- * para todos aquellos items que no se han comprado
- * en los últimos meses configurados en
- * vn.itemConfig.monthToDeactivate
+ * Cambia a false el campo isActive de la tabla vn.item para todos aquellos
+ * items que no se han comprado en los últimos meses configurados en
+ * @vn.itemConfig.monthToDeactivate
*/
DECLARE vMonthToDeactivate INT;
-
+
SELECT monthToDeactivate INTO vMonthToDeactivate
FROM vn.itemConfig;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.buyMaxCreated;
CREATE TEMPORARY TABLE tmp.buyMaxCreated
ENGINE = MEMORY
@@ -59522,12 +59619,12 @@ BEGIN
JOIN vn.item i ON i.id = b.itemFk
WHERE i.isActive
GROUP BY itemFk;
-
+
UPDATE vn.item i
JOIN tmp.buyMaxCreated bmc ON bmc.itemFk = i.id
SET i.isActive = FALSE
- WHERE bmc.created < util.VN_CURDATE() - INTERVAL vMonthToDeactivate MONTH;
-
+ WHERE bmc.created < CURDATE() - INTERVAL vMonthToDeactivate MONTH;
+
DROP TEMPORARY TABLE IF EXISTS tmp.buyMaxCreated;
END ;;
DELIMITER ;
@@ -59548,7 +59645,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
BEGIN
DECLARE vDateInventory DATETIME;
- DECLARE vCurdate DATE DEFAULT util.VN_CURDATE();
+ DECLARE vCurdate DATE DEFAULT CURDATE();
DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
SELECT inventoried INTO vDateInventory FROM config;
@@ -59566,8 +59663,8 @@ BEGIN
`in` AS invalue,
`out`,
@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
- @currentLineFk := IF (@shipped < util.VN_CURDATE()
- OR (@shipped = util.VN_CURDATE() AND (isPicked OR alertLevel >= 2)),
+ @currentLineFk := IF (@shipped < CURDATE()
+ OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)),
lineFk,@currentLineFk) lastPreparedLineFk,
isTicket,
lineFk,
@@ -59596,8 +59693,8 @@ BEGIN
JOIN supplier s ON s.id = e.supplierFk
JOIN alertLevel al ON al.id =
CASE
- WHEN tr.landed < util.VN_CURDATE() THEN 3
- WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
+ WHEN tr.landed < CURDATE() THEN 3
+ WHEN tr.landed = CURDATE() AND tr.isReceived = TRUE THEN 3
ELSE 0
END
JOIN state st ON st.code = al.code
@@ -59630,8 +59727,8 @@ BEGIN
JOIN supplier s ON s.id = e.supplierFk
JOIN alertLevel al ON al.id =
CASE
- WHEN tr.shipped < util.VN_CURDATE() THEN 3
- WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
+ WHEN tr.shipped < CURDATE() THEN 3
+ WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
ELSE 0
END
JOIN state st ON st.code = al.code
@@ -59667,8 +59764,8 @@ BEGIN
JOIN clientType ct ON ct.id = c.clientTypeFk
JOIN alertLevel al ON al.id =
CASE
- WHEN t.shipped < util.VN_CURDATE() THEN 3
- WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0
+ WHEN t.shipped < curdate() THEN 3
+ WHEN t.shipped > util.dayEnd(curdate()) THEN 0
ELSE IFNULL(ts.alertLevel, 0)
END
LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
@@ -59699,70 +59796,71 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getInfo`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT)
BEGIN
- /*
- * Devuelve información relativa al item correspondiente del vBarcode pasado
- *
- * @param vBarcode código relativo al ítem
- * @param vWarehouseFk código del almacén
- */
-
+/**
+ * Devuelve información relativa al item correspondiente del vBarcode pasado
+ *
+ * @param vBarcode código relativo al ítem
+ * @param vWarehouseFk código del almacén
+ */
DECLARE vCacheVisibleFk INT;
DECLARE vCacheAvailableFk INT;
DECLARE vVisibleItemShelving INT;
DECLARE vItemFk INT;
-
- SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
- CALL cache.visible_refresh(vCacheVisibleFk, FALSE,vWarehouseFk);
- CALL cache.available_refresh(vCacheAvailableFk, FALSE,vWarehouseFk, util.VN_CURDATE());
-
+
+ CALL cache.visible_refresh(vCacheVisibleFk, FALSE, vWarehouseFk);
+ CALL cache.available_refresh(vCacheAvailableFk, FALSE, vWarehouseFk, CURDATE());
+ CALL buyUltimate(vWarehouseFk, CURDATE());
+
+ SELECT barcodeToItem(vBarcode) INTO vItemFk;
SELECT SUM(visible) INTO vVisibleItemShelving
- FROM vn.itemShelvingStock
- WHERE itemFk = vItemFk AND warehouseFk = vWarehouseFk;
-
- CALL vn.buyUltimate(vWarehouseFk, util.VN_CURDATE());
-
- SELECT i.id,
- i.longName,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7,
- i.image,
- i.size,
- i.stems,
- i.category,
- i.minimum as min,
- p.name as producer,
- o.code as origin,
- v.visible - IFNULL(vVisibleItemShelving,0) as unlocated,
- a.available,
- vVisibleItemShelving,
- v.visible,
- c.`grouping`,
- c.packing,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) as urlImage200,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) as urlImage,
- i.itemPackingTypeFk,
- i.comment reference,
- u.name buyer
- FROM vn.item i
- LEFT JOIN vn.producer p ON p.id = i.producerFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id
- LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id
- LEFT JOIN (
- SELECT b.itemFk, b2.`grouping`, b2.packing
- FROM tmp.buyUltimate b
- JOIN vn.buy b2 ON b2.id = b.buyFk
- WHERE b.warehouseFk = vWarehouseFk
- ) c ON i.id = c.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN account.user u ON u.id = it.workerFk
- WHERE i.id = vItemFk;
- DROP TEMPORARY TABLE tmp.buyUltimate;
+ FROM itemShelvingStock
+ WHERE itemFk = vItemFk
+ AND warehouseFk = vWarehouseFk;
+
+ SELECT i.id,
+ i.longName,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7,
+ i.image,
+ i.`size`,
+ i.stems,
+ i.category,
+ i.minimum `min`,
+ p.name producer,
+ o.code origin,
+ v.visible - IFNULL(vVisibleItemShelving, 0) unlocated,
+ a.available,
+ vVisibleItemShelving,
+ v.visible,
+ b.`grouping`,
+ b.packing,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) urlImage200,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) urlImage,
+ i.itemPackingTypeFk,
+ i.comment reference,
+ u.name buyer,
+ IFNULL(b.buyingValue, 0) +
+ IFNULL(b.freightValue, 0) +
+ IFNULL(b.comissionValue, 0) +
+ IFNULL(b.packageValue, 0) itemCost
+ FROM item i
+ LEFT JOIN producer p ON p.id = i.producerFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk
+ AND v.item_id = i.id
+ LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk
+ AND a.item_id = i.id
+ LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+ LEFT JOIN buy b ON b.id = bu.buyFk
+ AND bu.warehouseFk = vWarehouseFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN account.user u ON u.id = it.workerFk
+ WHERE i.id = vItemFk;
+ DROP TEMPORARY TABLE tmp.buyUltimate;
END ;;
DELIMITER ;
@@ -59790,7 +59888,7 @@ BEGIN
**/
CALL `cache`.stock_refresh(vForce);
- CALL item_getMinacum(NULL, util.VN_CURDATE(), vDays, NULL);
+ CALL item_getMinacum(NULL, CURDATE(), vDays, NULL);
CALL item_getMinETD();
SELECT i.id itemFk,
@@ -59951,7 +60049,7 @@ BEGIN
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
LEFT JOIN `zone` z ON z.id = t.zoneFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND vMidnight
+ WHERE t.shipped BETWEEN CURDATE() AND vMidnight
GROUP BY s.itemFk;
END ;;
DELIMITER ;
@@ -60068,7 +60166,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_GetVisible`(vWarehouse SMALLINT, vItem INT)
BEGIN
- DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, util.VN_CURDATE());
+ DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, CURDATE());
INSERT INTO vn2008.tmp_item (item_id, visible)
SELECT item_id, SUM(amount) amount
@@ -60080,18 +60178,18 @@ BEGIN
LEFT JOIN (SELECT DISTINCT saleFk
FROM saleTracking st
JOIN state s ON s.id = st.stateFk
- WHERE st.created > util.VN_CURDATE()
+ WHERE st.created > CURDATE()
AND (s.isPicked OR st.isChecked)
) stPrevious ON `stPrevious`.`saleFk` = i.saleFk
WHERE i.warehouseFk = vWarehouse
AND (vItem IS NULL OR i.itemFk = vItem)
AND (s.isPicked OR i.reserved OR stPrevious.saleFk )
- AND i.shipped >= util.VN_CURDATE() AND i.shipped < vTomorrow
+ AND i.shipped >= CURDATE() AND i.shipped < vTomorrow
UNION ALL
SELECT iei.itemFk, quantity
FROM itemEntryIn iei
- WHERE (iei.isReceived != FALSE /*OR ip.modificationDate > util.VN_CURDATE()*/)
- AND iei.landed >= util.VN_CURDATE() AND iei.landed < vTomorrow
+ WHERE (iei.isReceived != FALSE /*OR ip.modificationDate > CURDATE()*/)
+ AND iei.landed >= CURDATE() AND iei.landed < vTomorrow
AND iei.warehouseInFk = vWarehouse
AND (vItem IS NULL OR iei.itemFk = vItem)
AND iei.isVirtualStock is FALSE
@@ -60099,7 +60197,7 @@ BEGIN
SELECT itemFk, quantity
FROM itemEntryOut
WHERE isDelivered != FALSE
- AND shipped >= util.VN_CURDATE() AND shipped < vTomorrow
+ AND shipped >= CURDATE() AND shipped < vTomorrow
AND warehouseOutFk = vWarehouse
AND (vItem IS NULL OR itemFk = vItem)
) t
@@ -60157,13 +60255,13 @@ BEGIN
LEFT JOIN itemTag it1 ON it1.priority = 1 AND it1.itemFk = i.id
LEFT JOIN tagAbbreviation ta1 ON ta1.`value` = it1.`value`
LEFT JOIN itemTag it2 ON it2.priority = 2 AND it2.itemFk = i.id
- LEFT JOIN tagAbbreviation ta2 ON ta2.`value` = it2.`value` AND ta2.`value` != 'Rosa'
+ LEFT JOIN tagAbbreviation ta2 ON ta2.`value` = it2.`value` AND ta2.tagFk IS NULL
LEFT JOIN itemTag it3 ON it3.priority = 3 AND it3.itemFk = i.id
LEFT JOIN tagAbbreviation ta3 ON ta3.`value` = it3.`value`
SET i.`name` = CONCAT_WS(' ',
IFNULL(ta1.abbreviation,it1.`value`),
IFNULL(ta2.abbreviation,it2.`value`),
- IF(i.id > 400000,'',IFNULL(ta3.abbreviation,it3.`value`)))
+ IF(i.isFloramondo,'',IFNULL(ta3.abbreviation,it3.`value`)))
WHERE i.id = vItemFk;
UPDATE item i
@@ -60638,7 +60736,7 @@ BEGIN
JOIN itemType t ON t.id = i.typeFk
JOIN warehouse w ON w.id = tr.warehouseInFk
WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
- AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, trUE)
+ AND IF(tr.landed = CURDATE(), tr.isReceived, trUE)
AND NOT e.isRaid
AND w.valuatedInventory
AND t.isInventory
@@ -60671,7 +60769,7 @@ BEGIN
AND it.isInventory
ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,1,-1);
- IF vDated = util.VN_CURDATE() THEN -- volver a poner lo que esta aun en las estanterias
+ IF vDated = CURDATE() THEN -- volver a poner lo que esta aun en las estanterias
INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
SELECT w.id, s.itemFk, s.quantity * IF(vHasNotInventory,0,1), w.`name`
@@ -61059,7 +61157,7 @@ BEGIN
*/
UPDATE vn.machineWorker mw
JOIN vn.machine m ON m.id = mw.machineFk
- SET mw.outTimed = util.VN_NOW()
+ SET mw.outTimed = NOW()
WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate)
AND ISNULL(mw.outTimed);
@@ -61141,12 +61239,12 @@ BEGIN
IF (SELECT COUNT(*)
FROM machineWorker m
WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, NOW()) AND ISNULL(m.outTimed)) THEN
UPDATE machineWorker m
SET m.outTimed = CURRENT_TIMESTAMP()
WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW())
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, NOW())
AND ISNULL(m.outTimed)
AND m.machineFk = vMachineFk;
@@ -61181,7 +61279,7 @@ BEGIN
SELECT m.plate
FROM machine m
JOIN machineWorker mw ON mw.machineFk = m.id
- WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,util.VN_NOW())
+ WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,NOW())
AND ISNULL(mw.outTimed)
AND mw.workerFk = vWorkerFk;
@@ -61220,7 +61318,7 @@ BEGIN
SELECT COUNT(*) INTO vIsRepeated
FROM vn.mail
- WHERE creationDate >= util.VN_CURDATE()
+ WHERE creationDate >= CURDATE()
AND `receiver` = vReceiver
AND `replyTo` = vReplyTo
AND `subject` = vSubject
@@ -61342,7 +61440,7 @@ BEGIN
*/
DECLARE vWorkerIsExcluded BOOLEAN;
DECLARE vFromDated DATE;
- DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,util.VN_CURDATE());
+ DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
DECLARE vMana INT;
DECLARE vAutoMana INT;
DECLARE vClaimMana INT;
@@ -61394,7 +61492,7 @@ BEGIN
FROM greuge g
JOIN client c ON c.id = g.clientFk
WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
- AND g.shipped > vFromDated and g.shipped < util.VN_CURDATE()
+ AND g.shipped > vFromDated and g.shipped < CURDATE()
UNION ALL
SELECT cc.mana
FROM clientManaCache cc
@@ -61992,6 +62090,52 @@ BEGIN
VALUES(saleFk,valueFk,account.myUser_getId(),encajando);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `packingSite_startCollection` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packingSite_startCollection`(vSelf INT, vTicketFk INT)
+BEGIN
+/**
+ * @param vSelf packingSite id
+ * @param vTicketFk A ticket id from the collection to start
+ */
+ DECLARE vNewCollectionFk INT;
+ DECLARE vOldCollectionFk INT;
+ DECLARE vIsPackingByOther BOOL;
+
+ SELECT collectionFk INTO vNewCollectionFk
+ FROM ticketCollection WHERE ticketFk = vTicketFk;
+
+ SELECT collectionFk INTO vOldCollectionFk
+ FROM packingSite WHERE id = vSelf;
+
+ IF NOT (vOldCollectionFk <=> vNewCollectionFk) THEN
+ SELECT COUNT(*) > 0
+ INTO vIsPackingByOther
+ FROM packingSite
+ WHERE id <> vSelf
+ AND collectionFk = vOldCollectionFk;
+
+ IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) AND vSelf IS NOT NULL THEN
+ CALL util.throw('cannotChangeCollection');
+ END IF;
+ END IF;
+
+ UPDATE packingSite SET collectionFk = vNewCollectionFk
+ WHERE id = vSelf;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62227,7 +62371,7 @@ BEGIN
DECLARE vCalcFk INT;
DECLARE vWarehouseFk INT;
DECLARE vWarehouseAliasFk INT;
- DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
+ DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
DROP TEMPORARY TABLE IF EXISTS tmp.sale;
CREATE TEMPORARY TABLE tmp.sale
@@ -62310,7 +62454,7 @@ BEGIN
ish.visible,
IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,util.VN_NOW()))) as priority,
+ IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
0 as saleOrder,
sc.isPreviousPrepared,
iss.id as itemShelvingSaleFk,
@@ -62431,11 +62575,11 @@ BEGIN
JOIN vn.client c ON c.id = t.clientFk
WHERE c.typeFk IN ('normal','handMaking','internalUse')
AND (
- t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate
+ t.shipped BETWEEN CURDATE() AND vEndingDate
OR (
ts.alertLevel < 3
AND t.shipped >= vStartingDate
- AND t.shipped < util.VN_CURDATE()
+ AND t.shipped < CURDATE()
)
);
END ;;
@@ -62534,7 +62678,7 @@ proc: BEGIN
* @return Table tmp.productionBuffer
*/
- DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(util.VN_CURDATE()));
+ DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
DECLARE vIsTodayRelative BOOLEAN;
@@ -62542,7 +62686,7 @@ proc: BEGIN
FROM vn.worker
WHERE userFk = vn.getUser();
- CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,util.VN_CURDATE()), vEndingDate);
+ CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
CREATE TEMPORARY TABLE tmp.ticket
@@ -62639,7 +62783,7 @@ proc: BEGIN
IF(tp.hasTicketRequest, ' COD 100',''),
IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
IF(tp.hasComponentLack,' COMPONENTES', ''),
- IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle,' PEQUEÑO', '')
+ IF(HOUR(NOW()) < pb.HH AND tp.isTooLittle,' PEQUEÑO', '')
) as char(255)));
-- Clientes Nuevos o Recuperados
@@ -62783,7 +62927,7 @@ BEGIN
FROM vn.sale s
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, 23, CURDATE())
GROUP BY s.ticketFk
HAVING saleNum = iptNull;
@@ -62795,7 +62939,7 @@ BEGIN
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.ticket t ON t.id = s.ticketFk
JOIN vn.sector sc ON sc.id = vSectorFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, 23, CURDATE())
GROUP BY s.ticketFk
HAVING iptSector;
@@ -63335,13 +63479,13 @@ BEGIN
)
SELECT
vCustomer,
- util.VN_CURDATE(),
+ CURDATE(),
vAddress,
vRefundAgencyMode,
a.nickname,
vWarehouse,
vCompany,
- util.VN_CURDATE(),
+ CURDATE(),
vZoneFk
FROM address a
WHERE a.id = vAddress;
@@ -63441,7 +63585,7 @@ BEGIN
CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color,
CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) levelV,
tc.ticketFk,
- LEFT(IF(t.routeFk IS NULL, am.name, zo.name ), 12) agencyDescription,
+ LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription,
am.name,
t.clientFk,
CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
@@ -63467,6 +63611,8 @@ BEGIN
JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN ticketTrolley tt ON tt.ticket = t.id
LEFT JOIN `zone` zo ON t.zoneFk = zo.id
+ LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN expeditionTruck et ON et.id = rm.expeditionTruckFk
WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam)
GROUP BY t.id
ORDER BY cc.`code`;
@@ -63539,7 +63685,7 @@ UPDATE ticket mt
SELECT tt.addressFk, ROUND(IFNULL(AVG(t.priority),0),0) AS priority
FROM ticket t
JOIN ticket tt ON tt.addressFk = t.addressFk
- WHERE t.shipped > TIMESTAMPADD(YEAR,-1,util.VN_CURDATE())
+ WHERE t.shipped > TIMESTAMPADD(YEAR,-1,CURDATE())
AND tt.routeFk = vRuta
GROUP BY addressFk
) sub ON sub.addressFk = mt.addressFk
@@ -63758,6 +63904,80 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `route_calcCommission` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_calcCommission`(vSelf INT)
+proc: BEGIN
+/**
+ * Calcula las comisión para una ruta y guarda los valores en la tabla routeCommission
+ *
+ * @param vSelf id de ruta
+ */
+ DECLARE vIsUpdatable BOOL;
+ DECLARE vIsFreelance BOOL;
+
+ SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
+ FROM route r
+ JOIN routeConfig rc
+ WHERE r.id = vSelf;
+
+ IF vIsUpdatable THEN
+ DELETE FROM routeCommission
+ WHERE routeFk = vSelf;
+
+ SELECT wl.workerFk IS NULL INTO vIsFreelance
+ FROM route r
+ LEFT JOIN workerLabour wl ON wl.workerFk = r.workerFk
+ WHERE r.id = vSelf
+ LIMIT 1;
+
+ IF vIsFreelance THEN
+ INSERT INTO routeCommission (routeFk, workCenterFk, freelanceYearlyM3)
+ SELECT vSelf,
+ r.commissionWorkCenterFk,
+ rc.freelanceM3 * IF(IFNULL(r.m3, 0) >= rc.freelanceMinM3, IFNULL(r.m3, 0), 0)
+ FROM route r
+ JOIN vehicle v ON v.id = r.vehicleFk
+ JOIN routeConfig rc
+ WHERE r.id = vSelf
+ AND r.workerFk
+ AND r.commissionWorkCenterFk
+ AND r.m3;
+ ELSE
+ INSERT INTO routeCommission (routeFk, workCenterFk, km, m3, yearlyKm, yearlyM3, cat4m3, cat5m3)
+ SELECT vSelf,
+ r.commissionWorkCenterFk,
+ FORMAT((r.kmEnd - r.kmStart) * IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight), 2),
+ FORMAT(IFNULL(r.m3, 0) * IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4), 2),
+ FORMAT((r.kmEnd - r.kmStart) * rc.kmYearly, 2),
+ FORMAT(IFNULL(r.m3, 0) * rc.m3Yearly, 2),
+ FORMAT(distributionCat4M3 * IFNULL(r.m3, 0), 2),
+ FORMAT(rc.distributionCat5M3 * IFNULL(r.m3, 0), 2)
+ FROM route r
+ JOIN vehicle v ON v.id = r.vehicleFk
+ JOIN routeConfig rc
+ WHERE r.id = vSelf
+ AND r.kmStart
+ AND r.kmEnd
+ AND r.workerFk
+ AND r.commissionWorkCenterFk
+ AND r.m3;
+ END IF;
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `route_doRecalc` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -64175,10 +64395,16 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGroup_setParking`(IN `vSaleGroupFk` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
- UPDATE vn.saleGroup sg
+/**
+ * Aparca una preparación previa en un parking
+ *
+ * @param vSaleGroupFk id de la preparación previa
+ * @param vParkingFk id del parking
+ */
+ UPDATE vn.saleGroup sg
SET sg.parkingFk = vParkingFk
WHERE sg.id = vSaleGroupFk
- AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND sg.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
CALL vn.ticket_setNextState(vn.ticket_get(vSaleGroupFk));
END ;;
@@ -65011,10 +65237,10 @@ BEGIN
DECLARE vComponentCount INT;
DECLARE vCursor CURSOR FOR
- SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), date(tt.shipped))
+ SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, CURDATE(), date(tt.shipped))
FROM tmp.sale_getProblems tt
- WHERE DATE(tt.shipped) BETWEEN util.VN_CURDATE()
- AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), util.VN_CURDATE());
+ WHERE DATE(tt.shipped) BETWEEN CURDATE()
+ AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), CURDATE());
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
@@ -65063,12 +65289,12 @@ BEGIN
FROM tmp.ticket_list tl
JOIN vn.saleVolume sv ON sv.ticketFk = tl.ticketFk
JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = util.VN_CURDATE()
+ JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = CURDATE()
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
- WHERE util.VN_NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),util.VN_CURDATE()))
+ WHERE NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),CURDATE()))
AND dm.code IN('AGENCY','DELIVERY','PICKUP')
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
+ AND t.shipped BETWEEN CURDATE() AND util.midnight()
GROUP BY t.addressFk) sub ON sub.addressFk = t.addressFk
JOIN vn.volumeConfig vc
WHERE sub.litros < vc.minTicketVolume
@@ -65103,7 +65329,7 @@ BEGIN
SELECT DISTINCT clientFk
FROM tmp.ticket_list;
- CALL clientGetDebt(util.VN_CURDATE());
+ CALL clientGetDebt(CURDATE());
INSERT INTO tmp.sale_problems(ticketFk, risk, hasHighRisk)
SELECT DISTINCT tl.ticketFk, r.risk, ((r.risk - cc.riskTolerance) > c.credit + 10)
@@ -65180,7 +65406,7 @@ BEGIN
AND ic.merchandise = TRUE
AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
AND NOT i.generic
- AND util.VN_CURDATE() = vDate
+ AND CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
@@ -65206,7 +65432,7 @@ BEGIN
AND ic.merchandise = TRUE
AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
AND NOT i.generic
- AND util.VN_CURDATE() = vDate
+ AND CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
@@ -65234,7 +65460,7 @@ BEGIN
AND ic.merchandise = TRUE
AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
AND NOT i.generic
- AND util.VN_CURDATE() = vDate
+ AND CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
@@ -65639,7 +65865,7 @@ BEGIN
AND (ISNULL(scsg.sectorCollectionFk)
OR
(NOT st.isChecked AND sl.quantity > 0))
- AND sc.created > util.VN_CURDATE();
+ AND sc.created > CURDATE();
END ;;
DELIMITER ;
@@ -65648,38 +65874,36 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sectorCollection_getSale` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_getSale`(vSelf INT)
BEGIN
-
- /**
- * Devuelve las lineas de venta correspondientes a esa coleccion de sector
- *
- * @param vSelf Identificador de vn.sectorCollection
- */
-
+/**
+ * Devuelve las lineas de venta correspondientes a esa coleccion de sector
+ *
+ * @param vSelf Identificador de vn.sectorCollection
+ */
SELECT s.ticketFk,
s.itemFk,
i.longName,
- IFNULL(i.itemPackingTypeFk,' ') itemPackingTypeFk,
- IFNULL(i.subName ,' ') subName,
+ itemPackingTypeFk,
+ subName,
s.quantity,
w.code workerCode,
sgd.saleFk,
- IFNULL(iss.quantity,0) pickedQuantity,
- c.salesPersonFk
+ iss.quantity pickedQuantity,
+ c.salesPersonFk
FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.item i ON i.id = s.itemFk
JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
- JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
JOIN vn.saleTracking st ON st.saleFk = s.id
JOIN vn.state stt ON stt.id = st.stateFk AND stt.code = 'PREVIOUS_PREPARATION'
JOIN vn.worker w ON w.id = st.workerFk
@@ -65687,7 +65911,6 @@ BEGIN
JOIN vn.client c ON c.id=t.clientFk
LEFT JOIN vn.itemShelvingSaleSum iss ON iss.saleFk = s.id
WHERE scsg.sectorCollectionFk = vSelf;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65723,7 +65946,7 @@ BEGIN
WHERE ISNULL(scsg.id)
AND sc.userFk = vUserFk
AND sc.sectorFk = vSectorFk
- AND sc.created >= util.VN_CURDATE();
+ AND sc.created >= CURDATE();
IF NOT hasEmptyCollections THEN
INSERT INTO vn.sectorCollection(userFk, sectorFk)
@@ -65747,30 +65970,29 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorProductivity_add`()
BEGIN
-
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
- SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
-
+ SELECT DATE_SUB(CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
+
DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
DROP TEMPORARY TABLE IF EXISTS tmp.errorsByChecker;
- DROP TEMPORARY TABLE IF EXISTS tmp.previousErrors;
+ DROP TEMPORARY TABLE IF EXISTS tmp.previousErrors;
CALL timeControl_calculateAll(vDatedFrom, vDatedTo);
-
+
CREATE TEMPORARY TABLE tmp.errorsByChecker
ENGINE = MEMORY
SELECT sc.userFk workerFk, COUNT(DISTINCT s.ticketFk) errorsByChecker
FROM saleMistake sm
- JOIN vn.saleGroupDetail sgd on sgd.saleFk = sm.saleFk
- JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
- JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
+ JOIN vn.saleGroupDetail sgd on sgd.saleFk = sm.saleFk
+ JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
JOIN sale s ON s.id = sm.saleFk
JOIN ticket t on t.id = s.ticketFk
- WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
GROUP BY sc.userFk ;
-
+
CREATE TEMPORARY TABLE tmp.previousErrors -- Errores de previa, derivadores de los revisadores (por reclamación)
ENGINE = MEMORY
SELECT tt.workerFk, COUNT(c.ticketFk) errorsByClaim
@@ -65778,13 +66000,13 @@ BEGIN
JOIN claim c ON cd.claimFk = c.id
JOIN ticket t ON c.ticketFk = t.id
JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
- JOIN ticketTracking tt ON tt.ticketFk = t.id
- JOIN state s ON s.id = tt.stateFk
+ JOIN ticketTracking tt ON tt.ticketFk = t.id
+ JOIN state s ON s.id = tt.stateFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = 'Revisadores' AND s.code = 'OK PREVIOUS'
GROUP BY workerFk;
- DELETE FROM sectorProductivity
- WHERE dated = vDatedFrom
+ DELETE FROM sectorProductivity
+ WHERE dated = vDatedFrom
AND sector IN ('Algemesi Artificial','Algemesi Complementos');
INSERT INTO sectorProductivity(workerFk, firstName, lastName, sector, ticketCount, saleCount, error, volume, hourWorked, dated)
@@ -65796,28 +66018,27 @@ BEGIN
COUNT(sgd.id) saleCount,
IFNULL(ec2.errorsByChecker,0) + IFNULL(pe.errorsByClaim, 0) errors,
wp.volume,
- IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked,
DATE(vDatedFrom) dated
FROM vn.saleGroupDetail sgd
- JOIN vn.saleGroup sg on sg.id = sgd.saleGroupFk
- JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
- JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
- join vn.sector se on se.id = sc.sectorFk
- JOIN vn.worker w ON w.id = sc.userFk
+ JOIN vn.saleGroup sg on sg.id = sgd.saleGroupFk
+ JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
+ join vn.sector se on se.id = sc.sectorFk
+ JOIN vn.worker w ON w.id = sc.userFk
LEFT JOIN vn.sale s ON s.id = sgd.saleFk
LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = w.id
- LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id
+ LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id
LEFT JOIN vncontrol.accion a ON a.accion_id = wp.actionFk AND a.accion = 'PRESACAR'
LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = w.id
LEFT JOIN tmp.previousErrors pe ON pe.workerFk = w.id
WHERE DATE(sc.created) = vDatedFrom
AND wp.dated = vDatedFrom
GROUP BY w.id;
-
+
DROP TEMPORARY TABLE tmp.timeControlCalculate;
DROP TEMPORARY TABLE tmp.errorsByChecker;
- DROP TEMPORARY TABLE tmp.previousErrors;
-
+ DROP TEMPORARY TABLE tmp.previousErrors;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65885,36 +66106,33 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `setParking`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
proc: BEGIN
-
-/*
+/**
* Aparca una colección, un ticket, un saleGroup o un shelving en un parking
- *
+ *
* @param vParam id del ticket, colección, saleGroup o shelving
- * @param vParkingCode código del parking
- *
+ * @param vParkingCode código del parking
*/
-
DECLARE vParkingFk INT;
DECLARE vIsSaleGroup BOOL;
DECLARE vIsTicket BOOL;
DECLARE vIsCollection BOOL;
-
+
SET vParkingCode = replace(vParkingCode,' ','');
SELECT id INTO vParkingFk
FROM vn.parking
WHERE code = vParkingCode COLLATE utf8_unicode_ci;
-
+
IF vParkingFk IS NULL THEN
CALL util.throw('parkingNotExist');
LEAVE proc;
END IF;
-
+
-- Se comprueba si es una preparación previa
SELECT COUNT(*) INTO vIsSaleGroup
- FROM vn.saleGroup sg
+ FROM vn.saleGroup sg
WHERE sg.id = vParam;
-
+
IF vIsSaleGroup THEN
CALL vn.saleGroup_setParking(vParam, vParkingFk);
LEAVE proc;
@@ -65924,7 +66142,7 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsTicket
FROM vn.ticket t
WHERE t.id = vParam
- AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND t.shipped >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsTicket THEN
CALL vn.ticket_setParking(vParam, vParkingFk);
@@ -65935,8 +66153,8 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsCollection
FROM vn.collection c
WHERE c.id = vParam
- AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
+ AND c.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
+
IF vIsCollection THEN
CALL vn.collection_setParking(vParam, vParkingFk);
LEAVE proc;
@@ -66068,7 +66286,7 @@ proc: BEGIN
UPDATE vn.saleGroup sg
SET sg.parkingFk = vParkingFk
WHERE sg.id = vParam
- AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND sg.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
CALL vn.ticket_setNextState(vn.ticket_get(vParam));
@@ -66080,7 +66298,7 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsTicket
FROM vn.ticket t
WHERE t.id = vParam
- AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND t.shipped >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsTicket THEN
@@ -66115,7 +66333,7 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsCollection
FROM vn.collection c
WHERE c.id = vParam
- AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND c.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsCollection THEN
@@ -66136,7 +66354,7 @@ proc: BEGIN
WHERE s.code = vParam COLLATE utf8_unicode_ci;
UPDATE vn.shelving
- SET parkingFk = vParkingFk, parked = util.VN_NOW(), isPrinted = TRUE
+ SET parkingFk = vParkingFk, parked = NOW(), isPrinted = TRUE
WHERE `code` = vParam COLLATE utf8_unicode_ci;
END ;;
@@ -66168,7 +66386,7 @@ SELECT s.itemFk,
JOIN vn.ticket t ON t.id = s.ticketFk
LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk
JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE()))
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), CURDATE()))
AND iss.saleFk IS NULL
AND t.warehouseFk = vWarehouseFk
GROUP BY s.itemFk
@@ -66217,17 +66435,17 @@ BEGIN
DELETE FROM vn.shelving
WHERE length(code) > 3
- AND parked < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND parked < TIMESTAMPADD(WEEK,-1,CURDATE());
DELETE FROM vn.itemShelving
WHERE visible <= 0
- AND created < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE());
+ AND created < TIMESTAMPADD(MONTH,-1,CURDATE());
DELETE ish.*
FROM vn.itemShelving ish
JOIN vn.shelving sh ON sh.code = ish.shelvingFk
WHERE sh.parkingFk IS NULL
- AND ish.created < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND ish.created < TIMESTAMPADD(WEEK,-1,CURDATE());
UPDATE vn.shelving sh
LEFT JOIN vn.itemShelving its ON its.shelvingFk = sh.`code`
@@ -66237,7 +66455,7 @@ BEGIN
AND sh.isRecyclable
AND ( sh.parked IS NULL
OR
- sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+ sh.parked < TIMESTAMPADD(MONTH,-1,CURDATE())
);
END ;;
@@ -66294,14 +66512,14 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
FROM vn2008.item_out
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) sale ON sale.item_id = i.id
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
FROM vn2008.item_entry_in
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
AND warehouse_id = vWarehouseFk
AND isVirtualStock = FALSE
GROUP BY item_id
@@ -66309,7 +66527,7 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
FROM vn2008.item_entry_out
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) mov ON mov.item_id = i.id
@@ -66332,7 +66550,7 @@ BEGIN
JOIN vn.warehouse w ON w.id = s.warehouseFk
LEFT JOIN tmp.stock s ON s.itemFk = ish.itemFk
WHERE (w.name = 'Algemesi'
- OR (w.name = 'NuncaJamas' AND ish.created < util.VN_CURDATE()))
+ OR (w.name = 'NuncaJamas' AND ish.created < curdate()))
AND ish.visible
GROUP BY ish.shelvingFk
HAVING lineas = spam OR isSpam;
@@ -66357,23 +66575,20 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `shelving_setParking`(IN `vShelvingCode` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
-
-/*
+/**
* Aparca una matrícula en un parking
- *
+ *
* @param vShelvingCode code de la matrícula
- * @param vParkingFk id del parking
- *
+ * @param vParkingFk id del parking
*/
-
-INSERT INTO vn.shelvingLog (originFk, userFk, action , description)
- SELECT vShelvingCode, account.myUser_getId(), 'update', CONCAT("Cambio parking ",vShelvingCode," de ", p.code," a ", vParkingFk)
- FROM parking p
- JOIN shelving s ON s.parkingFk = p.id
- WHERE s.code = vShelvingCode COLLATE utf8_unicode_ci;
+ INSERT INTO vn.shelvingLog (originFk, userFk, action , description)
+ SELECT vShelvingCode, account.myUser_getId(), 'update', CONCAT("Cambio parking ",vShelvingCode," de ", p.code," a ", vParkingFk)
+ FROM parking p
+ JOIN shelving s ON s.parkingFk = p.id
+ WHERE s.code = vShelvingCode COLLATE utf8_unicode_ci;
UPDATE vn.shelving
- SET parkingFk = vParkingFk, parked = util.VN_NOW(), isPrinted = TRUE
+ SET parkingFk = vParkingFk, parked = NOW(), isPrinted = TRUE
WHERE code = vShelvingCode COLLATE utf8_unicode_ci;
END ;;
DELIMITER ;
@@ -66426,7 +66641,7 @@ BEGIN
ORDER BY ci.creationDate DESC
LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente;
- CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
+ CALL vn2008.risk_vs_client_list(CURDATE());
SELECT
c.Id_Cliente, c.Cliente, c.Credito credito_vn, c.creditInsurance solunion, cast(r.risk as DECIMAL(10,0)) riesgo_vivo,
@@ -66577,7 +66792,7 @@ BEGIN
SELECT item_id, SUM(amount) amount
FROM vn2008.item_entry_in
WHERE dat = vDate
- AND vDate >= util.VN_CURDATE()
+ AND vDate >= CURDATE()
AND warehouse_id = vWarehouse
AND isVirtualStock is FALSE
GROUP BY item_id
@@ -66995,7 +67210,7 @@ BEGIN
FROM vn.payment p
LEFT JOIN vn.supplier s ON s.id = p.supplierFk
LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
- WHERE p.created < (util.VN_CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
+ WHERE p.created < (CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
AND pm.graceMonthsDisableChecked
AND s.isPayMethodChecked
GROUP BY p.supplierFk) sdpmc ON sdpmc.supplierFk = s.id
@@ -67295,7 +67510,7 @@ BEGIN
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
+ SET vNewShipped = IFNULL(vNewShipped, CURDATE());
CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
@@ -67992,10 +68207,10 @@ BEGIN
WHERE t.id = vTicket;
IF vAlertLevel IS NULL OR vAlertLevel = 0 THEN
- IF vShipped >= util.VN_CURDATE() THEN
+ IF vShipped >= CURDATE() THEN
CALL cache.available_refresh(vAvailableCalc, FALSE, vWarehouse, vShipped);
END IF;
- IF vShipped = util.VN_CURDATE() THEN
+ IF vShipped = CURDATE() THEN
CALL cache.visible_refresh(vVisibleCalc, FALSE, vWarehouse);
END IF;
END IF;
@@ -68575,45 +68790,57 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_add`(
- vClientId INT
- ,vShipped DATE
- ,vWarehouseFk INT
- ,vCompanyFk INT
- ,vAddressFk INT
- ,vAgencyModeFk INT
- ,vRouteFk INT
- ,vlanded DATE
- ,vUserId INT
- ,vIsRequiredZone INT
- ,OUT vNewTicket INT)
+ vClientId INT
+ ,vShipped DATE
+ ,vWarehouseFk INT
+ ,vCompanyFk INT
+ ,vAddressFk INT
+ ,vAgencyModeFk INT
+ ,vRouteFk INT
+ ,vlanded DATE
+ ,vUserId INT
+ ,vIsRequiredZone INT
+ ,OUT vNewTicket INT)
BEGIN
-
DECLARE vZoneFk INT;
- DECLARE vPrice DECIMAL(10,2);
- DECLARE vBonus DECIMAL(10,2);
-
- IF vClientId IS NULL THEN
- CALL util.throw ('CLIENT_NOT_ESPECIFIED');
+ DECLARE vPrice DECIMAL(10,2);
+ DECLARE vBonus DECIMAL(10,2);
+ DECLARE vIsActive BOOL;
+
+ IF vClientId IS NULL THEN
+ CALL util.throw ('CLIENT_NOT_ESPECIFIED');
+ END IF;
+
+ SELECT isActive INTO vIsActive
+ FROM vn.client
+ WHERE id = vClientId;
+
+ IF NOT vIsActive THEN
+ CALL util.throw ('CLIENT_NOT_ACTIVE');
END IF;
IF NOT vAddressFk OR vAddressFk IS NULL THEN
- SELECT id INTO vAddressFk
- FROM address
- WHERE clientFk = vClientId AND isDefaultAddress;
- END IF;
-
+ SELECT id INTO vAddressFk
+ FROM address
+ WHERE clientFk = vClientId
+ AND isDefaultAddress;
+ END IF;
+
IF vAgencyModeFk IS NOT NULL THEN
-
CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
-
- SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
+
+ SELECT zoneFk, price, bonus
+ INTO vZoneFk, vPrice, vBonus
FROM tmp.zoneGetShipped
- WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
-
+ WHERE shipped = vShipped
+ AND warehouseFk = vWarehouseFk
+ LIMIT 1;
+
IF (vZoneFk IS NULL OR vZoneFk = 0) AND vIsRequiredZone THEN
- CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
+ CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
END IF;
END IF;
+
INSERT INTO ticket (
clientFk,
shipped,
@@ -68624,23 +68851,22 @@ BEGIN
routeFk,
companyFk,
landed,
- zoneFk,
- zonePrice,
- zoneBonus
+ zoneFk,
+ zonePrice,
+ zoneBonus
)
- SELECT
- vClientId,
- vShipped,
- a.id,
- vAgencyModeFk,
- a.nickname,
- vWarehouseFk,
- IF(vRouteFk,vRouteFk,NULL),
- vCompanyFk,
- vlanded,
- vZoneFk,
- vPrice,
- vBonus
+ SELECT vClientId,
+ vShipped,
+ a.id,
+ vAgencyModeFk,
+ a.nickname,
+ vWarehouseFk,
+ IF(vRouteFk,vRouteFk,NULL),
+ vCompanyFk,
+ vlanded,
+ vZoneFk,
+ vPrice,
+ vBonus
FROM address a
JOIN agencyMode am ON am.id = a.agencyModeFk
WHERE a.id = vAddressFk;
@@ -68652,16 +68878,16 @@ BEGIN
FROM addressObservation ao
JOIN address a ON a.id = ao.addressFk
WHERE a.id = vAddressFk;
-
- IF (SELECT COUNT(*) FROM bs.clientNewBorn cnb
- WHERE cnb.clientFk = vClientId
- AND NOT cnb.isRookie) = 0 THEN
-
+
+ IF (SELECT COUNT(*)
+ FROM bs.clientNewBorn cnb
+ WHERE cnb.clientFk = vClientId
+ AND NOT cnb.isRookie) = 0 THEN
+
CALL vn.ticketObservation_addNewBorn(vNewTicket);
-
END IF;
- INSERT INTO vn.ticketLog
+ INSERT INTO vn.ticketLog
SET originFk = vNewTicket, userFk = vUserId, `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket);
IF (SELECT ct.isCreatedAsServed FROM vn.clientType ct JOIN vn.client c ON c.typeFk = ct.code WHERE c.id = vClientId ) <> FALSE THEN
@@ -68724,7 +68950,7 @@ BEGIN
* Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
*
* @param vDated Fecha de los tickets que se quieren adelantar.
- * @param vWarehouseFk AlmacénitemEntryIn
+ * @param vWarehouseFk Almacén
*/
DECLARE vDateInventory DATE;
DECLARE vDateToAdvance DATE;
@@ -68951,16 +69177,16 @@ BEGIN
LEFT JOIN (SELECT tc.collectionFk
FROM ticketCollection tc
WHERE ticketFk = vTicketFk
- AND tc.created >= util.VN_CURDATE()
+ AND tc.created >= CURDATE()
)sub ON sub.collectionFk = tc.collectionFk
WHERE ts.workerFk = vWorkerFk
AND sub.collectionFk IS NULL
- AND tc.created >= util.VN_CURDATE()
+ AND tc.created >= CURDATE()
GROUP BY tc.collectionFk
)sub ON sub.collectionFk = tc.collectionFk
JOIN ticketState ts ON ts.ticketFk = t.id
WHERE ts.code IN ('ON_PREPARATION', 'PREPARED', 'PREVIOUS_PREPARATION', 'OK PREVIOUS')
- AND t.shipped >= util.VN_CURDATE()
+ AND t.shipped >= CURDATE()
AND s.quantity <>0
LIMIT 1;
@@ -69161,7 +69387,7 @@ BEGIN
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
- SET vYear = YEAR(util.VN_CURDATE()) + IF(vWeek < WEEK(util.VN_CURDATE()),1, 0);
+ SET vYear = YEAR(CURDATE()) + IF(vWeek < WEEK(CURDATE()),1, 0);
OPEN rsTicket;
myLoop: LOOP
@@ -69681,7 +69907,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp.ticket
SELECT ticketFk
FROM tmp.productionBuffer
- WHERE shipped = util.VN_CURDATE()
+ WHERE shipped = curdate()
AND problem LIKE '%I:%'
AND (HH <= vHour OR HH = vHour AND mm < vMinute)
AND alertLevel = 0;
@@ -69789,39 +70015,43 @@ proc: BEGIN
/**
* Recalculates modified ticket.
*/
-
DECLARE vDone BOOL;
DECLARE vTicketFk INT;
DECLARE vError INT;
DECLARE cCur CURSOR FOR
- SELECT ticketFk FROM ticketRecalc;
+ SELECT DISTINCT ticketFk FROM tTicket;
DECLARE CONTINUE HANDLER FOR NOT FOUND
SET vDone = TRUE;
-
+
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
- BEGIN
+ BEGIN
DO RELEASE_LOCK('vn.ticket_doRecalc');
ROLLBACK;
GET DIAGNOSTICS CONDITION 2 @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT;
- SET vError = IFNULL(@errno, 0) ;
- IF NOT(vError = 1105 OR vError = 1751) THEN
+ SET vError = IFNULL(@errno, 0);
+ IF NOT(vError = 1105 OR vError = 1751) THEN
CALL `vn`.`mail_insert`('cau@verdnatura.es',
- NULL,
- 'Problema al recalcular el total de ticket',
- CONCAT('Se ha detectado un problema en ticket_doRecalc al calcular el total del ticket : ',
- vTicketFk,' el error es el: ',
- CONCAT('ERROR ', IFNULL(@errno, 0), ': ', ifnull(@text, '')))
- );
+ NULL,
+ 'Problema al recalcular el total de ticket',
+ CONCAT('Se ha detectado un problema en ticket_doRecalc al calcular el total del ticket : ',
+ vTicketFk,' el error es el: ',
+ CONCAT('ERROR ', IFNULL(@errno, 0), ': ', ifnull(@text, '')))
+ );
END IF;
- RESIGNAL;
+ RESIGNAL;
END;
IF !GET_LOCK('vn.ticket_doRecalc', 0) THEN
LEAVE proc;
END IF;
+ DROP TEMPORARY TABLE IF EXISTS tTicket;
+ CREATE TEMPORARY TABLE tTicket
+ ENGINE = MEMORY
+ SELECT id, ticketFk FROM ticketRecalc;
+
OPEN cCur;
myLoop: LOOP
@@ -69832,27 +70062,15 @@ proc: BEGIN
LEAVE myLoop;
END IF;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- ENGINE = MEMORY
- SELECT vTicketFk ticketFk;
-
- CALL ticketGetTotal;
-
- START TRANSACTION;
- UPDATE ticket t
- JOIN tmp.ticketTotal tt ON tt.ticketFk = t.id
- SET t.totalWithVat = tt.total,
- t.totalWithoutVat = tt.totalWithoutVat;
- DELETE FROM ticketRecalc WHERE ticketFk = vTicketFk;
- COMMIT;
-
- DROP TEMPORARY TABLE
- tmp.ticket,
- tmp.ticketTotal;
+ CALL ticket_recalc(vTicketFk);
END LOOP;
CLOSE cCur;
+
+ DELETE tr FROM ticketRecalc tr JOIN tTicket t ON tr.id = t.id;
+
+ DROP TEMPORARY TABLE tTicket;
+
DO RELEASE_LOCK('vn.ticket_doRecalc');
END ;;
DELIMITER ;
@@ -69861,58 +70079,73 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_doRefund` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doRefund`(OUT vNewTicket INT)
BEGIN
-
+/**
+ * Crea un ticket de abono a partir de tmp.sale y/o tmp.ticketService
+ *
+ * @return vNewTicket
+ */
DECLARE vDone BIT DEFAULT 0;
- DECLARE vCustomer MEDIUMINT;
+ DECLARE vClientFk MEDIUMINT;
DECLARE vWarehouse TINYINT;
DECLARE vCompany MEDIUMINT;
DECLARE vAddress MEDIUMINT;
- DECLARE vRefundAgencyMode INT;
- DECLARE vItemFk INT;
- DECLARE vQuantity DECIMAL (10,2);
- DECLARE vConcept VARCHAR(50);
- DECLARE vPrice DECIMAL (10,2);
- DECLARE vDiscount TINYINT;
+ DECLARE vRefundAgencyMode INT;
+ DECLARE vItemFk INT;
+ DECLARE vQuantity DECIMAL (10,2);
+ DECLARE vConcept VARCHAR(50);
+ DECLARE vPrice DECIMAL (10,2);
+ DECLARE vDiscount TINYINT;
DECLARE vSaleNew INT;
- DECLARE vSaleMain INT;
- DECLARE vZoneFk INT;
- DECLARE vDescription VARCHAR(50);
- DECLARE vTaxClassFk INT;
- DECLARE vTicketServiceTypeFk INT;
-
- DECLARE cSales CURSOR FOR
- SELECT *
- FROM tmp.sale;
-
+ DECLARE vSaleMain INT;
+ DECLARE vZoneFk INT;
+ DECLARE vDescription VARCHAR(50);
+ DECLARE vTaxClassFk INT;
+ DECLARE vTicketServiceTypeFk INT;
+ DECLARE vOriginTicket INT;
+
+ DECLARE cSales CURSOR FOR
+ SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
+ FROM tmp.sale s;
+
DECLARE cTicketServices CURSOR FOR
- SELECT *
- FROM tmp.ticketService;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-
- SELECT id INTO vRefundAgencyMode
+ SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
+ FROM tmp.ticketService ts;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ SELECT sub.ticketFk INTO vOriginTicket
+ FROM (
+ SELECT s.ticketFk
+ FROM tmp.sale s
+ UNION ALL
+ SELECT ts.ticketFk
+ FROM tmp.ticketService ts
+ ) sub
+ LIMIT 1;
+
+ SELECT id INTO vRefundAgencyMode
FROM agencyMode WHERE `name` = 'ABONO';
- SELECT clientFk, warehouseFk, companyFk, addressFk
- INTO vCustomer, vWarehouse, vCompany, vAddress
- FROM ticket
- WHERE id = vOriginTicket;
-
- SELECT id INTO vZoneFk
+ SELECT clientFk, warehouseFk, companyFk, addressFk
+ INTO vClientFk, vWarehouse, vCompany, vAddress
+ FROM ticket
+ WHERE id = vOriginTicket;
+
+ SELECT id INTO vZoneFk
FROM zone WHERE agencyModeFk = vRefundAgencyMode
- LIMIT 1;
-
+ LIMIT 1;
+
INSERT INTO vn.ticket (
clientFk,
shipped,
@@ -69922,61 +70155,57 @@ BEGIN
warehouseFk,
companyFk,
landed,
- zoneFk
+ zoneFk
)
SELECT
- vCustomer,
- util.VN_CURDATE(),
- vAddress,
- vRefundAgencyMode,
- a.nickname,
- vWarehouse,
- vCompany,
- util.VN_CURDATE(),
- vZoneFk
+ vClientFk,
+ CURDATE(),
+ vAddress,
+ vRefundAgencyMode,
+ a.nickname,
+ vWarehouse,
+ vCompany,
+ CURDATE(),
+ vZoneFk
FROM address a
WHERE a.id = vAddress;
SET vNewTicket = LAST_INSERT_ID();
- SET vDone := 0;
+ SET vDone := FALSE;
OPEN cSales;
- FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
+ FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
WHILE NOT vDone DO
-
INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
- SET vSaleNew = LAST_INSERT_ID();
-
- INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
- SELECT vSaleNew,componentFk,`value`
- FROM vn.saleComponent
- WHERE saleFk = vSaleMain;
-
+
+ SET vSaleNew = LAST_INSERT_ID();
+
+ INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
+ SELECT vSaleNew,componentFk,`value`
+ FROM vn.saleComponent
+ WHERE saleFk = vSaleMain;
+
FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
END WHILE;
CLOSE cSales;
- SET vDone := 0;
+ SET vDone := FALSE;
OPEN cTicketServices;
- FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
+ FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
WHILE NOT vDone DO
-
INSERT INTO vn.ticketService(description, quantity, price, taxClassFk, ticketFk, ticketServiceTypeFk)
VALUES(vDescription, vQuantity, vPrice, vTaxClassFk, vNewTicket, vTicketServiceTypeFk);
-
+
FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
END WHILE;
+
CLOSE cTicketServices;
INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
VALUES(vNewTicket, vOriginTicket);
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69984,50 +70213,74 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_getFromFloramondo` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getFromFloramondo`(vDateFrom DATE, vDateTo DATE)
BEGIN
-
/**
- * Genera una tabla con la lista de tickets de Floramondo para una fecha determinada
+ * Genera una tabla con la lista de tickets de Floramondo
+ * para una fecha determinada.
+ *
* @param vDated Fecha de preparación de los pedidos
- * @return tmp.ticketFloramondo(ticketFk, clientName, agencyName, freight, expeditionCount, margin, trolleys, pallets)
+ * @table tmp.ticketFloramondo(ticketFk, clientName, agencyName,
+ * agencyModeFk, supplierName, supplierFk, freight, expeditionCount,
+ * margin, trolleys, pallets, shipped, created)
*/
-
DROP TEMPORARY TABLE IF EXISTS tmp.ticketFloramondo;
CREATE TEMPORARY TABLE tmp.ticketFloramondo
(ticketFk INT PRIMARY KEY,
clientName VARCHAR(50),
agencyName VARCHAR(50),
+ agencyModeFk INT,
+ supplierName VARCHAR(50),
+ supplierFk INT,
freight DECIMAL(10,2) DEFAULT 0,
expeditionCount INT,
margin DECIMAL(10,3) DEFAULT 0,
trolleys INT DEFAULT 0,
+ pallets INT DEFAULT 0,
shipped DATE,
- pallets INT DEFAULT 0)
+ created DATE)
ENGINE = MEMORY;
-
- INSERT INTO tmp.ticketFloramondo(ticketFk, clientName, agencyName, shipped)
- SELECT t.id ticketFk, t.nickname , am.name, t.shipped
+
+ INSERT INTO tmp.ticketFloramondo(ticketFk,
+ clientName,
+ agencyName,
+ agencyModeFk,
+ shipped,
+ supplierName,
+ supplierFk,
+ created)
+ SELECT t.id ticketFk,
+ t.nickname,
+ am.name,
+ am.id,
+ t.shipped,
+ s.name,
+ sat.supplierFk,
+ t.created
FROM vn.ticket t
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.warehouse w ON w.id = t.warehouseFk AND w.code IN ('VNH','FLM')
- AND t.shipped BETWEEN vDateFrom AND TIMESTAMPADD(HOUR, 23, vDateTo);
-
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ AND w.code IN ('VNH','FLM')
+ AND t.shipped BETWEEN vDateFrom AND util.dayend(vDateTo)
+ JOIN vn.agency a ON a.id = am.agencyFk
+ LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
+ LEFT JOIN vn.supplier s ON s.id = sat.supplierFk;
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
CREATE TEMPORARY TABLE tmp.ticket
(ticketFk INT(11) PRIMARY KEY)
SELECT ticketFk
FROM tmp.ticketFloramondo;
-
+
-- Freight
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(sc.value * s.quantity) freight, t.ticketFk
@@ -70047,7 +70300,7 @@ BEGIN
JOIN tmp.ticket t ON t.ticketFk = ts.ticketFk
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.freight = tf.freight + sb.service;
-
+
-- Expedition Count
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT COUNT(e.id) expeditionCount, t.ticketFk
@@ -70055,7 +70308,7 @@ BEGIN
RIGHT JOIN tmp.ticket t ON t.ticketFk = e.ticketFk
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.expeditionCount = sb.expeditionCount;
-
+
-- Margin
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(IF(ct.code = 'COST',sc.value, 0)) cost,
@@ -70068,17 +70321,17 @@ BEGIN
JOIN tmp.ticket t ON t.ticketFk = s.ticketFk
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.margin = sb.margin / sb.cost;
-
+
-- Trolleys
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(tp.quantity) trolleys, t.ticketFk
FROM vn.ticketPackaging tp
JOIN tmp.ticket t ON t.ticketFk = tp.ticketFk
- JOIN vn.packaging p ON p.id = tp.packagingFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
WHERE p.isTrolley
- GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.trolleys = sb.trolleys;
-
+
-- Pallets
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(tp.quantity) pallets, t.ticketFk
@@ -70088,12 +70341,11 @@ BEGIN
WHERE p.isPallet
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.pallets = sb.pallets;
-
+
SELECT * FROM tmp.ticketFloramondo;
-
+
DROP TEMPORARY TABLE tmp.ticket;
DROP TEMPORARY TABLE tmp.ticketFloramondo;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70264,7 +70516,7 @@ BEGIN
DECLARE vAvailableCache INT;
DECLARE vVisibleCache INT;
- CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, CURDATE());
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
CALL `vn`.`zoneClosure_recalc`();
@@ -70291,7 +70543,7 @@ BEGIN
AND s.isPicked = FALSE
AND s.reserved = FALSE
AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND NOT i.generic
AND t.warehouseFk = vWarehouseFk;
@@ -70310,7 +70562,7 @@ BEGIN
AND s.isPicked = FALSE
AND s.reserved = FALSE
AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND NOT i.generic
AND t.warehouseFk = vWarehouseFk;
@@ -70331,7 +70583,7 @@ BEGIN
AND s.isPicked = FALSE
AND s.reserved = FALSE
AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND NOT i.generic
AND t.warehouseFk = vWarehouseFk;
@@ -70378,8 +70630,8 @@ BEGIN
LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id
LEFT JOIN vn.state st2 ON st2.id = tst.stateFk
WHERE (t.id IS NULL
- OR (vDated > util.VN_CURDATE())
- OR (vDated = util.VN_CURDATE() AND vHour >= zc.`hour`))
+ OR (vDated > CURDATE())
+ OR (vDated = CURDATE() AND vHour >= zc.`hour`))
AND ts.etd <= vHour
GROUP BY ts.ticketFk, t.id
ORDER BY ts.etd, ts.ticketFk;
@@ -70577,7 +70829,7 @@ BEGIN
WHERE s.ticketFk = vSelf;
UPDATE vn.ticket t
- SET t.shipped = TIMESTAMPADD(YEAR, - YEAR(util.VN_NOW()) MOD 2000, t.shipped )
+ SET t.shipped = TIMESTAMPADD(YEAR, - YEAR(NOW()) MOD 2000, t.shipped )
WHERE t.id = vSelf;
END ;;
@@ -70785,14 +71037,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_requestRecalc` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_requestRecalc`(vSelf INT)
proc: BEGIN
@@ -70805,7 +71057,7 @@ proc: BEGIN
LEAVE proc;
END IF;
- INSERT IGNORE INTO ticketRecalc SET ticketFk = vSelf;
+ INSERT INTO ticketRecalc SET ticketFk = vSelf;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70834,15 +71086,14 @@ BEGIN
SELECT stateFk INTO vStateFk
FROM ticketState
- WHERE ticketFk = vSelf;
+ WHERE ticketFk = vSelf;
SELECT nextStateFk INTO vNewStateFk
FROM state
- WHERE id = vStateFk;
+ WHERE id = vStateFk;
INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- VALUES (vNewStateFk, vSelf, account.myUser_getId());
-
+ VALUES (vNewStateFk, vSelf, account.myUser_getId());
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70861,40 +71112,43 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setParking`(IN `vTicketFk` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
+/**
+ * Aparca un ticket en un parking
+ *
+ * @param vTicketFk id del ticket
+ * @param vParkingFk id del parking
+ */
DECLARE vDone INT DEFAULT FALSE;
- DECLARE vCollectionTicketFk INT;
- DECLARE vCursor CURSOR FOR
-
- SELECT IFNULL(tc2.ticketFk, t.id)
- FROM ticket t
- LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
- LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
- WHERE t.id = vTicketFk;
+ DECLARE vCollectionTicketFk INT;
+ DECLARE vCursor CURSOR FOR
+ SELECT IFNULL(tc2.ticketFk, t.id)
+ FROM ticket t
+ LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
+ LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
+ WHERE t.id = vTicketFk;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
INSERT INTO vn.ticketParking(ticketFk, parkingFk)
- SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
- FROM ticket t
- LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
- LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
- WHERE t.id = vTicketFk
- ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
+ SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
+ FROM ticket t
+ LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
+ LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
+ WHERE t.id = vTicketFk
+ ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
- OPEN vCursor;
- l: LOOP
+ OPEN vCursor;
+ l: LOOP
+ FETCH vCursor INTO vCollectionTicketFk;
- FETCH vCursor INTO vCollectionTicketFk;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
- IF vDone THEN
- LEAVE l;
- END IF;
+ CALL vn.ticket_setNextState(vCollectionTicketFk);
+ END LOOP;
- CALL vn.ticket_setNextState(vCollectionTicketFk);
-
- END LOOP;
-
- CLOSE vCursor;
+ CLOSE vCursor;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70913,36 +71167,33 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setPreviousState`(vTicketFk INT)
BEGIN
-
DECLARE vControlFk INT;
-
- SELECT MAX(inter_id) INTO vControlFk
+
+ SELECT MAX(inter_id) INTO vControlFk
FROM vncontrol.inter
- WHERE Id_Ticket = vTicketFk;
-
+ WHERE Id_Ticket = vTicketFk;
+
IF (SELECT s.code
- FROM vn.state s
- JOIN vncontrol.inter i ON i.state_id = s.id
- WHERE i.inter_id = vControlFk)
+ FROM vn.state s
+ JOIN vncontrol.inter i ON i.state_id = s.id
+ WHERE i.inter_id = vControlFk)
= 'PREVIOUS_PREPARATION' THEN
-
- SELECT inter_id
+ SELECT inter_id
INTO vControlFk
- FROM vncontrol.inter i
+ FROM vncontrol.inter i
JOIN vn.state s ON i.state_id = s.id
WHERE Id_Ticket = vTicketFk
AND inter_id < vControlFk
- AND s.code != 'PREVIOUS_PREPARATION'
+ AND s.code != 'PREVIOUS_PREPARATION'
ORDER BY inter_id DESC
- LIMIT 1;
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ LIMIT 1;
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
SELECT s.nextStateFk, i.Id_Ticket, account.myUser_getId()
FROM vncontrol.inter i
JOIN vn.state s ON i.state_id = s.id
- WHERE inter_id = vControlFk;
-
- END IF;
+ WHERE inter_id = vControlFk;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70959,31 +71210,41 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(vTicketFk INT, vStateCode VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(vSelf INT, vStateCode VARCHAR(255))
BEGIN
-
- /* Modifica el estado de un ticket
- *
- * @param vTicketFk el id del ticket
- * @param vStateCode estado a modificar del ticket
- *
- */
-
+/**
+ * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
+ *
+ * @param vSelf el id del ticket
+ * @param vStateCode estado a modificar del ticket
+ */
DECLARE vAlertLevel INT;
+ DECLARE vCurrentStateCode VARCHAR(255);
+ DECLARE vCanChangeState BOOL;
+ DECLARE vPackedState INT;
- SELECT s.alertLevel INTO vAlertLevel
- FROM vn.state s
- JOIN vn.ticketState ts ON ts.stateFk = s.id
- WHERE ts.ticketFk = vTicketFk;
-
- IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
-
+ SELECT s.alertLevel, s.`code`
+ INTO vAlertLevel, vCurrentStateCode
+ FROM state s
+ JOIN ticketState ts ON ts.stateFk = s.id
+ WHERE ts.ticketFk = vSelf;
+
+ SELECT id INTO vPackedState
+ FROM alertLevel
+ WHERE code = 'PACKED';
+
+ SET vCanChangeState = (vStateCode <> 'ON_CHECKING' OR vAlertLevel < vPackedState)
+ AND NOT (
+ vCurrentStateCode IN ('CHECKED', 'CHECKING')
+ AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
+ );
+
+ IF vCanChangeState THEN
INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT id, vTicketFk, account.myUser_getId()
- FROM vn.state
- WHERE `code` = vStateCode collate utf8_unicode_ci;
-
- END IF;
+ SELECT id, vSelf, account.myUser_getId()
+ FROM state
+ WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -71030,7 +71291,7 @@ proc:BEGIN
UPDATE vn.ticket
SET landed = vDated + 1,
shipped = vDated,
- nickname = CONCAT('(',DAY(util.VN_CURDATE()),') ', nickname )
+ nickname = CONCAT('(',DAY(curdate()),') ', nickname )
WHERE id = vTicketFk;
SELECT CONCAT("Se ha cambiado el ticket ", vTicketFk, " al dia ", vDated);
@@ -71380,20 +71641,19 @@ BEGIN
at2.discountRate,
cl.hours_week hoursWeek,
at2.isAllowedToWork
- FROM vn.time t
+ FROM time t
LEFT JOIN postgresql.business b ON t.dated BETWEEN b.date_start AND IFNULL(b.date_end, vDatedTo )
LEFT JOIN postgresql.profile pr ON b.client_id = pr.profile_id
- LEFT JOIN postgresql.person p ON pr.person_id = p.person_id
- LEFT JOIN vn.worker w ON p.id_trabajador = w.id
+ LEFT JOIN worker w ON w.id = pr.workerFk
JOIN tmp.`user` u ON u.userFK = w.userFK
JOIN postgresql.business_labour bl ON b.business_id = bl.business_id
LEFT JOIN postgresql.business_labour_payroll bp ON bl.business_id = bp.business_id
LEFT JOIN postgresql.professional_category pc ON bl.professional_category_id = pc.professional_category_id
- LEFT JOIN vn.workCenter wc ON bl.workcenter_id = wc.id
+ LEFT JOIN workCenter wc ON bl.workcenter_id = wc.id
LEFT JOIN postgresql.calendar_labour_type cl ON bl.calendar_labour_type_id = cl.calendar_labour_type_id
LEFT JOIN postgresql.journey j ON j.business_id = b.business_id AND j.day_id=WEEKDAY(t.dated)+1
LEFT JOIN postgresql.calendar_employee ce ON ce.business_id=b.business_id AND ce.date = t.dated
- LEFT JOIN vn.absenceType at2 ON at2.id = ce.calendar_state_id
+ LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
GROUP BY w.userFk,dated
)sub;
@@ -71415,7 +71675,7 @@ BEGIN
WHERE permissionRate <> 0;
UPDATE tmp.timeBusinessCalculate t
- JOIN vn.calendarHolidays ch ON ch.dated = t.dated
+ JOIN calendarHolidays ch ON ch.dated = t.dated
JOIN postgresql.business_labour bl ON bl.business_id = t.businessFk AND bl.workcenter_id = ch.workcenterFk
SET t.timeWorkSeconds = 0,
t.timeWorkSexagesimal = 0,
@@ -71491,17 +71751,16 @@ BEGIN
SELECT DISTINCT w.userFk
FROM postgresql.business AS b
LEFT JOIN postgresql.profile AS pr ON pr.profile_id = b.client_id
- LEFT JOIN postgresql.person AS p ON p.person_id = pr.person_id
LEFT JOIN postgresql.business_labour AS bl ON b.business_id = bl.business_id
- LEFT JOIN vn.worker AS w ON p.id_trabajador = w.id
- LEFT JOIN vn.department AS d ON bl.department_id = d.id
- WHERE ((b.date_start BETWEEN vDatedFrom AND vDatedTo OR b.date_end BETWEEN vDatedFrom AND vDatedTo) OR
- (b.date_end IS NULL AND b.date_start <= vDatedTo) OR
- (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
- ) AND bl.department_id = vDepartmentFk
+ LEFT JOIN worker AS w ON w.id = pr.workerFk
+ LEFT JOIN department AS d ON bl.department_id = d.id
+ WHERE (b.date_start BETWEEN vDatedFrom AND vDatedTo
+ OR IFNULL(b.date_end, vDatedTo) BETWEEN vDatedFrom AND vDatedTo
+ OR (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
+ ) AND bl.department_id = vDepartmentFk
ORDER BY b.date_end DESC;
- CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo);
+ CALL timeBusiness_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
@@ -71830,17 +72089,16 @@ BEGIN
SELECT DISTINCT w.userFk
FROM postgresql.business AS b
LEFT JOIN postgresql.profile AS pr ON pr.profile_id = b.client_id
- LEFT JOIN postgresql.person AS p ON p.person_id = pr.person_id
LEFT JOIN postgresql.business_labour AS bl ON b.business_id = bl.business_id
- LEFT JOIN vn.worker AS w ON p.id_trabajador = w.id
- LEFT JOIN vn.department AS d ON bl.department_id = d.id
- WHERE ((b.date_start BETWEEN vDatedFrom AND vDatedTo OR b.date_end BETWEEN vDatedFrom AND vDatedTo) OR
- (b.date_end IS NULL AND b.date_start <= vDatedTo) OR
- (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
+ LEFT JOIN worker AS w ON w.id = pr.workerFk
+ LEFT JOIN department AS d ON bl.department_id = d.id
+ WHERE (b.date_start BETWEEN vDatedFrom AND vDatedTo
+ OR IFNULL(b.date_end, vDatedTo) BETWEEN vDatedFrom AND vDatedTo
+ OR (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
) AND bl.department_id = vDepartmentFk
ORDER BY b.date_end DESC;
- CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
+ CALL timeControl_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
@@ -72057,7 +72315,7 @@ BEGIN
FROM hedera.tpvTransaction t
WHERE t.receiptFk IS NULL
AND t.status = 'ok'
- AND t.created < DATE_ADD(util.VN_NOW(),INTERVAL - 2 DAY)
+ AND t.created < DATE_ADD(NOW(),INTERVAL - 2 DAY)
GROUP BY t.clientFk;
END ;;
@@ -72095,7 +72353,7 @@ BEGIN
JOIN vn.entry e ON e.id = b.entryFk
JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN vn.agencyMode a ON a.id = tr.agencyFk
+ JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk
JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk
JOIN vn.volumeConfig vc
@@ -72127,7 +72385,7 @@ BEGIN
count(DISTINCT e.id) numEntradas,
FLOOR(sum(item_getVolume(b.itemFk, b.packageFk) * b.stickers / 1000000 )) AS m3
FROM vn.travel tr
- JOIN vn.agencyMode a ON a.id = tr.agencyFk
+ JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
JOIN vn.entry e ON e.travelFk = tr.id
JOIN vn.buy b ON b.entryFk = e.id
WHERE tr.landed BETWEEN vFromDated AND vToDated
@@ -72172,14 +72430,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `travel_clone` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_clone`(vSelf INT, vDays INT, OUT vNewTravelFk INT)
BEGIN
@@ -72195,7 +72453,7 @@ BEGIN
SELECT tr.id INTO vNewTravelFk
FROM vn.travel tr
- JOIN vn.travel tr2 USING(shipped, warehouseInFk, warehouseOutFk, agencyFk, `ref`)
+ JOIN vn.travel tr2 USING(shipped, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`)
WHERE tr2.id = vSelf
AND tr.landed = TIMESTAMPADD(DAY, vDays, tr2.landed);
@@ -72209,7 +72467,7 @@ BEGIN
landingHour,
warehouseInFk,
warehouseOutFk,
- agencyFk,
+ agencyModeFk,
`ref`,
cargoSupplierFk)
SELECT shipped,
@@ -72218,7 +72476,7 @@ BEGIN
landingHour,
warehouseInFk,
warehouseOutFk,
- agencyFk,
+ agencyModeFk,
`ref`,
cargoSupplierFk
FROM vn.travel
@@ -72287,7 +72545,7 @@ BEGIN
END;
START TRANSACTION;
- INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyFk, `ref`, isDelivered, isReceived, m3, kg)
+ INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, kg)
SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3, kg
FROM travel
WHERE id = vTravelFk;
@@ -72303,7 +72561,7 @@ BEGIN
INSERT INTO entry (
supplierFk,
ref,
- isInventory,
+ isExcludedFromAvailable,
isConfirmed,
isOrdered,
isRaid,
@@ -72317,7 +72575,7 @@ BEGIN
invoiceInFk)
SELECT supplierFk,
ref,
- isInventory,
+ isExcludedFromAvailable,
isConfirmed,
isOrdered,
isRaid,
@@ -72592,7 +72850,7 @@ BEGIN
DECLARE vDone BOOLEAN DEFAULT FALSE;
DECLARE vRsTravel CURSOR FOR
SELECT travelFk,
- @a := TIMESTAMPADD(DAY,vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay,util.VN_CURDATE()),
+ @a := TIMESTAMPADD(DAY,vCounter * 7 - WEEKDAY(CURDATE()) - 1 + weekDay,CURDATE()),
@a := TIMESTAMPADD(DAY,duration,@a),
warehouseOutFk,
warehouseInFk,
@@ -72605,8 +72863,8 @@ BEGIN
SET vCounter = vSinceWeek;
vWeekLoop :LOOP
- INSERT IGNORE INTO travel (shipped, landed, warehouseOutFk, warehouseInFk, agencyFk, ref, cargoSupplierFk, kg)
- SELECT @a := TIMESTAMPADD(DAY, vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay,util.VN_CURDATE()),
+ INSERT IGNORE INTO travel (shipped, landed, warehouseOutFk, warehouseInFk, agencyModeFk, ref, cargoSupplierFk, kg)
+ SELECT @a := TIMESTAMPADD(DAY, vCounter * 7 - WEEKDAY(CURDATE()) - 1 + weekDay,CURDATE()),
@a := TIMESTAMPADD(DAY, duration, @a),
warehouseOutFk,
warehouseInFk,
@@ -72990,7 +73248,6 @@ BEGIN
* @param vWorkerFk
* @return tmp.workerCalendarCalculateYear (days, hours, daysEnjoyed, hoursEnjoyed)
*/
-
DECLARE vDone BOOL;
DECLARE vBusinessFk INT;
@@ -72998,9 +73255,8 @@ BEGIN
SELECT b.business_id
FROM postgresql.business b
LEFT JOIN postgresql.profile AS pr ON pr.profile_id = b.client_id
- LEFT JOIN postgresql.person AS p ON p.person_id = pr.person_id
WHERE vYear BETWEEN YEAR(b.date_start) AND IFNULL(YEAR(b.date_end), vYear )
- AND p.id_trabajador = vWorkerFk;
+ AND pr.workerFk = vWorkerFk;
DECLARE CONTINUE HANDLER FOR NOT FOUND
SET vDone = TRUE;
@@ -73056,19 +73312,21 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreate`(
- vFirstname VARCHAR(50),
- vSurnames VARCHAR(50),
- vWorkerCode CHAR(3),
- vBossFk INT,
- vUserFk INT
+ vFirstname VARCHAR(50),
+ vLastName VARCHAR(50),
+ vCode CHAR(3),
+ vBossFk INT,
+ vUserFk INT,
+ vFi VARCHAR(15) ,
+ vBirth DATE
)
BEGIN
/**
* Create new worker
*
*/
- INSERT INTO worker(id, code, firstName, lastName, userFk, bossFk)
- VALUES (vUserFk, vWorkerCode, vFirstname, vSurnames, vUserFk, vBossFk);
+ INSERT INTO worker(id, code, firstName, lastName, userFk, bossFk, fi, birth)
+ VALUES (vUserFk, vCode, vFirstname, vLastName, vUserFk, vBossFk, vFi, vBirth);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73139,30 +73397,24 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.workerDepartmentByDate;
CREATE TEMPORARY TABLE tmp.workerDepartmentByDate
ENGINE = MEMORY
- SELECT
- w.userFk,
- p.name,
- p.firstname,
- d.name AS department,
- d.id as departmentFk,
+ SELECT w.userFk,
+ w.lastName name,
+ w.firstName firstname,
+ d.name department,
+ d.id departmentFk,
b.date_start,
d.isProduction,
- CAST(12 * blp.importepactado / clt.hours_week / 52 AS DECIMAL(10,2)) as costeHora ,
- p.nif
-
- FROM postgresql.person p
- JOIN postgresql.profile pr ON p.person_id = pr.person_id
+ CAST(12 * blp.importepactado / clt.hours_week / 52 AS DECIMAL(10,2)) costeHora,
+ w.fi nif
+ FROM postgresql.profile pr
JOIN postgresql.business b ON b.client_id = pr.profile_id
JOIN postgresql.business_labour bl ON bl.business_id = b.business_id
JOIN postgresql.calendar_labour_type clt ON clt.calendar_labour_type_id = bl.calendar_labour_type_id
JOIN postgresql.business_labour_payroll blp ON blp.business_id = b.business_id
- JOIN vn.department d ON d.id = bl.department_id
- JOIN vn.worker w ON w.id = p.id_trabajador
- WHERE b.date_start <= vDate AND IFNULL(b.date_end,'3000-01-01') > vDate
- ;
-
- -- SELECT * FROM tmp.workerDepartmentByDate;
-
+ JOIN department d ON d.id = bl.department_id
+ JOIN worker w ON w.id = pr.workerFk
+ WHERE b.date_start <= vDate
+ AND (b.date_end > vDate OR b.date_end IS NULL);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73182,7 +73434,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerDisable`(vUserId int)
mainLabel:BEGIN
- IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > util.VN_CURDATE() OR dated IS NULL)) > 0 THEN
+ IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > CURDATE() OR dated IS NULL)) > 0 THEN
LEAVE mainLabel;
END IF;
DELETE FROM account.account
@@ -73226,21 +73478,19 @@ BEGIN
DECLARE rs CURSOR FOR
SELECT a.id
- FROM ((SELECT * FROM (select date_end,date_start,business_id, client_id
- FROM postgresql.business
- ORDER BY client_id, date_end IS NULL DESC , date_end DESC
- LIMIT 10000000000000000000)
- c GROUP BY client_id) c
- INNER JOIN postgresql.business b ON c.client_id = b.client_id AND c.business_id = b.business_id
- INNER JOIN postgresql.profile pr ON b.client_id = pr.profile_id
- INNER JOIN postgresql.person p ON pr.person_id = p.person_id
-
- INNER JOIN vn.worker w ON p.id_trabajador = w.id)
- INNER JOIN account.account a ON w.userFk = a.id
- WHERE ((b.date_end) IS NOT NULL
- AND (b.date_end) < util.VN_CURDATE()
- AND (b.date_end) > TIMESTAMPADD(DAY, -70,util.VN_CURDATE()) );
-
+ FROM (SELECT client_id, business_id
+ FROM (SELECT business_id, client_id
+ FROM postgresql.business
+ ORDER BY client_id, date_end IS NULL DESC , date_end DESC
+ LIMIT 10000000000000000000)sub
+ GROUP BY client_id)sub2
+ JOIN postgresql.business b ON sub2.client_id = b.client_id AND sub2.business_id = b.business_id
+ JOIN postgresql.profile pr ON b.client_id = pr.profile_id
+ JOIN account.account a ON pr.workerFk = a.id
+ WHERE b.date_end IS NOT NULL
+ AND b.date_end < CURDATE()
+ AND b.date_end > TIMESTAMPADD(DAY, -70, CURDATE());
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
OPEN rs;
@@ -73317,22 +73567,25 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(vDatedFrom DATE, vDatedTo DATE, vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(
+ vDatedFrom DATE,
+ vDatedTo DATE,
+ vWorkerFk INT)
BEGIN
/**
- * Actualiza la tabla workerJourney para que actue como caché permanente revisable de las jornadas laborales.
+ * Actualiza la tabla workerJourney para que actue como caché permanente revisable
+ * de las jornadas laborales.
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
* @param vWorkerFk, en caso de pasar 0 ó NULL se aplica a todos
*/
-
DECLARE vDatedTimeTo DATETIME;
DECLARE vMaxTimePerDay INT;
DECLARE vMinHoursToBreak DECIMAL(10,2);
DECLARE vBreakHours DECIMAL(10,2);
DECLARE vMonthByYear INT;
DECLARE vWeeksByYear INT DEFAULT 52;
- DECLARE vMonthsByYear INT DEFAULT 12;
+ DECLARE vMonthsByYear INT DEFAULT 12;
DECLARE vDaysByWeek INT DEFAULT 5;
DECLARE vDatedFromYesterday DATETIME;
DECLARE vDatedToTomorrow DATETIME;
@@ -73356,10 +73609,10 @@ BEGIN
INSERT IGNORE INTO workerJourney(userFk, dated, businessFk)
SELECT w.workerFk, t.dated, w.businessFk
FROM workerLabour w
- JOIN time t ON t.dated BETWEEN w.started AND IFNULL(w.ended,util.VN_CURDATE())
+ JOIN time t ON t.dated BETWEEN w.started AND IFNULL(w.ended,CURDATE())
WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR w.workerFk = vWorkerFk)
- ORDER BY w.workerFk, t.dated, w.businessFk;
+ ORDER BY w.workerFk, t.dated, w.businessFk;
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
@@ -73371,12 +73624,14 @@ BEGIN
CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
SELECT id userFk
- FROM vn.worker w;
+ FROM worker w;
END IF;
UPDATE workerJourney wj
JOIN tmp.timeControlCalculate t ON wj.dated = t.dated AND wj.userFk = t.userFk
- SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak, t.timeWorkDecimal - vBreakHours, t.timeWorkDecimal) AS DECIMAL (10,2)),
+ SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak,
+ t.timeWorkDecimal - vBreakHours,
+ t.timeWorkDecimal) AS DECIMAL (10,2)),
wj.lunch = IF(t.timeWorkDecimal >= vMinHoursToBreak , vBreakHours , 0)
WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
AND NOT wj.isPaid
@@ -73384,11 +73639,11 @@ BEGIN
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk);
-- NOCTURNIDAD
- CALL vn.timeControl_getError(vDatedFrom, vDatedTimeTo);
+ CALL timeControl_getError(vDatedFrom, vDatedTimeTo);
SET @vIsOdd := TRUE;
SET @vDated := NULL;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControl;
CREATE TEMPORARY TABLE tmp.workerTimeControl
(INDEX (userFk), INDEX (timed))
@@ -73416,68 +73671,89 @@ BEGIN
`direction` enum('in', 'out','middle')
) ENGINE=MEMORY;
- SET @counter := 0;
- SET @vIsOdd := FALSE;
+ SET @vIsOdd := TRUE;
+ SET @lastUserFk := NULL;
+ SET @lastDirection := NULL;
-- Cambio de dia en medio de un descanso
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1 id, userFk, util.dayEnd(dated) timed, 'middle' direction
- FROM(SELECT wtc.userFk,
+ SELECT @vCont:= @vCont + 1,
+ lastUserFk,
+ util.dayEnd(dated),
+ 'middle'
+ FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL),
DATE(@lastTimed) dated,
- (@vIsOdd := NOT @vIsOdd) isOdd,
- IF(@vIsOdd AND wtc.direction = 'middle' AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
- @lastTimed := wtc.timed
+ @lastUserFk lastUserFk,
+ IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
+ IF(@vIsOdd
+ AND @lastDirection = 'middle'
+ AND (DATE(@lastTimed) <> date(timed)
+ OR @lastUserFk <> userFk), TRUE, FALSE) hasBreak,
+ @lastTimed := wtc.timed,
+ @lastUserFk := userFk,
+ @lastDirection := direction
FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed
- )sub
+ ORDER BY wtc.userFk, wtc.timed)sub
WHERE hasBreak;
- SET @counter := 0;
- SET @vIsOdd := FALSE;
+ SET @vIsOdd := TRUE;
+ SET @lastUserFk := NULL;
+ SET @lastDirection := NULL;
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1, userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'middle'
- FROM(SELECT wtc.userFk,
+ SELECT @vCont:= @vCont + 1,
+ lastUserFk,
+ DATE_ADD(sub.dated, INTERVAL 1 DAY),
+ 'middle'
+ FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL),
DATE(@lastTimed) dated,
- (@vIsOdd := NOT @vIsOdd) isOdd,
- IF(@vIsOdd AND wtc.direction = 'middle' AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
- @lastTimed := wtc.timed
+ @lastUserFk lastUserFk,
+ IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
+ IF(@vIsOdd
+ AND @lastDirection = 'middle'
+ AND (DATE(@lastTimed)<>date(timed)
+ OR @lastUserFk<>userFk), TRUE, FALSE) hasBreak,
+ @lastTimed := wtc.timed,
+ @lastUserFk := userFk,
+ @lastDirection := direction
FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed
- )sub
+ ORDER BY wtc.userFk, wtc.timed)sub
WHERE hasBreak;
-- Cambio de dia
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1 id, sub.userFk, util.dayEnd(sub.dated) timed, 'out' direction
- FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
- AND tce.id IS NULL
- GROUP BY wtc.userFk, DATE(wtc.timed)
- ) sub
- JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed AND wtc.userFk = sub.userFk
- WHERE wtc.direction <> 'out';
+ SELECT @vCont:= @vCont + 1,
+ wtc.userFk,
+ util.dayEnd(date(wtc.timed)),
+ 'out'
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND wtc.direction <> 'out'
+ GROUP BY wtc.userFk, DATE(wtc.timed);
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1, sub.userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'in'
- FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
- AND tce.id IS NULL
- GROUP BY wtc.userFk, DATE(wtc.timed)
- ) sub
- JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed AND wtc.userFk = sub.userFk
- WHERE wtc.direction <> 'out';
+ SELECT @vCont:= @vCont + 1,
+ wtc.userFk,
+ DATE_ADD(date(wtc.timed), INTERVAL 1 DAY),
+ 'in'
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND wtc.direction <> 'out'
+ GROUP BY wtc.userFk, DATE(wtc.timed);
INSERT INTO tmp.workerTimeControl (id, userFk, timed, direction)
SELECT id, userFk, timed, direction
FROM tmp.workerTimeControlAux;
+ SET @lastUserFk := NULL;
+ SET @vIsOdd := TRUE;
+ SET @vDated := NULL;
+ SET @vLastTimed := NULL;
+
UPDATE workerJourney wj
JOIN (SELECT sub.dated, userFk, SUM(NigthlyHours) NigthlyHours
FROM(SELECT (@vIsOdd := NOT @vIsOdd) isOdd,
@@ -73486,8 +73762,9 @@ BEGIN
IF(direction='in', @vDated := DATE(wtc.timed), @vDated ) dated,
wtc.userFk,
IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay,
- vn.workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
- 0) NigthlyHours
+ workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
+ 0) NigthlyHours,
+ @lastUserFk := userFk
FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
FROM tmp.workerTimeControl wtc
LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
@@ -73496,6 +73773,7 @@ BEGIN
ORDER BY userFk, timed ASC
LIMIT 10000000000000000000
) wtc
+ ORDER BY wtc.userFk, wtc.timed
)sub
WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo
GROUP BY userFk, sub.dated
@@ -73505,12 +73783,18 @@ BEGIN
AND NOT isUpdated
AND night.NigthlyHours <> 0;
+
-- Horas téoricas y precio de la hora ordinaria
UPDATE workerJourney wj
- JOIN postgresql.business_labour_payroll blp ON blp.business_id = wj.businessFk
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
- SET wj.priceOrdinaryHour = (vMonthsByYear * blp.importepactado) / (vWeeksByYear * cl.hours_week),
+ JOIN postgresql.business_labour_payroll blp
+ ON blp.business_id = wj.businessFk
+ JOIN postgresql.business_labour bl
+ ON bl.business_id = wj.businessFk
+ JOIN postgresql.calendar_labour_type cl
+ ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
+ SET wj.priceOrdinaryHour =
+ (vMonthsByYear * blp.importepactado) /
+ (vWeeksByYear * cl.hours_week),
wj.contractJourney = cl.hours_week / vDaysByWeek
WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
@@ -73535,8 +73819,10 @@ BEGIN
-- Elimina el precio de las horas extras para los contratos parciales.
UPDATE workerJourney wj
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
+ JOIN postgresql.business_labour bl
+ ON bl.business_id = wj.businessFk
+ JOIN postgresql.calendar_labour_type cl
+ ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
SET wj.priceExtraHour = 0
WHERE cl.isPartial
AND wj.dated BETWEEN vDatedFrom AND vDatedTo
@@ -73546,7 +73832,8 @@ BEGIN
-- Ausencias
UPDATE workerJourney wj
- JOIN businessCalendar bc ON bc.businessFk = wj.businessFk AND bc.dated = wj.dated
+ JOIN businessCalendar bc ON bc.businessFk = wj.businessFk
+ AND bc.dated = wj.dated
JOIN absenceType ab ON ab.id = bc.absenceTypeFk
JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
SET wj.permission = ab.permissionRate * wj.contractJourney,
@@ -73764,7 +74051,7 @@ BEGIN
CALL vn.workerTimeControlSOWP(vUserFk , vDated);*/
- CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,util.VN_NOW(),FALSE);
+ CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,NOW(),FALSE);
END ;;
@@ -73938,7 +74225,7 @@ BEGIN
@cont cont,
@lastUserFk := userFk
FROM workerTimeControl wtc
- WHERE wtc.timed BETWEEN TIMESTAMPADD(YEAR,-1,util.VN_CURDATE()) AND util.dayEnd(util.VN_CURDATE())
+ WHERE wtc.timed BETWEEN TIMESTAMPADD(YEAR,-1,CURDATE()) AND util.dayEnd(CURDATE())
ORDER BY userFk, timed
LIMIT 10000000000000000000)sub
GROUP BY cont
@@ -74008,10 +74295,10 @@ proc: BEGIN
WHERE w.id = vUserFk;
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
+ IF UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
-- VERIFICAR DESCANSO DIARIO
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
+ IF UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
SELECT "Descansos 12 h" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
@@ -74037,12 +74324,10 @@ proc: BEGIN
FROM postgresql.calendar_employee ce
JOIN postgresql.business b USING(business_id)
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN vn.absenceType at2 ON at2.id = ce.calendar_state_id
- JOIN worker w ON w.id = p.id_trabajador
- WHERE ce.date = util.VN_CURDATE()
+ JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+ WHERE ce.date = CURDATE()
AND at2.isAllowedToWork = FALSE
- AND w.userFk = vUserFk
+ AND pr.workerFk = vUserFk
LIMIT 1;
IF(LENGTH(vCalendarStateType)) THEN
@@ -74059,9 +74344,7 @@ proc: BEGIN
IF (SELECT COUNT(*)
FROM postgresql.business b
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN worker w ON w.id = p.id_trabajador
- WHERE w.userFk = vUserFk
+ WHERE pr.workerFk = vUserFk
AND b.date_start <= vDated
AND IFNULL(b.date_end,vDated) >= vDated
) = 0 THEN
@@ -74075,19 +74358,19 @@ proc: BEGIN
-- VERIFICAR DESCANSO SEMANAL
SET @vHasBreakWeek:= FALSE;
- SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND));
+ SET @vLastTimed:= UNIX_TIMESTAMP((NOW() - INTERVAL vWeekScope SECOND));
DROP TEMPORARY TABLE IF EXISTS tmp.trash;
CREATE TEMPORARY TABLE tmp.trash
SELECT IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
@vLastTimed:= UNIX_TIMESTAMP(timed)
FROM workerTimeControl
- WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
+ WHERE timed>= (NOW() - INTERVAL vWeekScope SECOND)
AND userFk= vUserFk
AND direction IN ('in','out')
ORDER BY timed ASC;
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
+ IF UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
SELECT "Descansos 36 h" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
@@ -74100,7 +74383,7 @@ proc: BEGIN
ELSE -- DIA ACTUAL
-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
- SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked
+ SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(NOW()), 0) INTO vTimedWorked
FROM workerTimeControl wtc
WHERE userFk = vUserFk
AND timed >= vLastIn
@@ -74324,7 +74607,7 @@ BEGIN
/**
* Verifica si el empleado puede fichar
* @param vWorker Identificador del trabajador
- * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = util.VN_NOW()
+ * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW()
* @param vDirection solo se pueden pasa los valores del campo
* workerTimeControl.direction ENUM('in', 'out', 'middle')
* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
@@ -74420,7 +74703,7 @@ BEGIN
END;
IF (vTimed IS NULL) THEN
- SET vTimed = util.VN_NOW();
+ SET vTimed = NOW();
SET vManual = FALSE;
END IF;
@@ -74483,7 +74766,7 @@ BEGIN
LIMIT 1;
-- FICHADAS A FUTURO
- IF vTimed > DATE_ADD(util.VN_NOW(), INTERVAL 60 SECOND) THEN
+ IF vTimed > DATE_ADD(NOW(), INTERVAL 60 SECOND) THEN
SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
CALL util.throw(vErrorCode);
END IF;
@@ -74673,7 +74956,7 @@ BEGIN
DECLARE vIsMiddleOdd BOOLEAN ;
IF (vTimed IS NULL) THEN
- SET vTimed = util.VN_NOW();
+ SET vTimed = NOW();
END IF;
SELECT timed INTO vLastIn
@@ -74688,7 +74971,7 @@ BEGIN
FROM workerTimeControl
WHERE userFk = vWorkerFk
AND direction = 'middle'
- AND timed BETWEEN vLastIn AND util.VN_NOW();
+ AND timed BETWEEN vLastIn AND NOW();
DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
CREATE TEMPORARY TABLE tmp.workerTimeControlDirection
@@ -74835,7 +75118,7 @@ BEGIN
* @return (name, surname, userFk, departmentFk, button1, button2)
* Los valores posibles para button son ('in', 'inMiddle', 'outMiddle', 'out')
*/
- CALL vn.workerTimeControl_direction(vWorkerFk, util.VN_NOW());
+ CALL vn.workerTimeControl_direction(vWorkerFk, NOW());
SELECT wi.name,
wi.surname,
@@ -75022,7 +75305,6 @@ BEGIN
JOIN user u ON u.id = tb.userFk
JOIN department d ON d.id = tb.departmentFk
JOIN postgresql.business b ON b.business_id = tb.businessFk
- JOIN company c ON c.id = b.provider_id
LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated
LEFT JOIN worker w ON w.id = u.id
LEFT JOIN `user` u2 ON u2.id = w.bossFk
@@ -75037,7 +75319,7 @@ BEGIN
)sub ON sub.userFk = u.id
WHERE d.hasToRefill AND
IFNULL(vWorkerFk,u.id) = u.id AND
- c.code = 'VNL'
+ b.companyCodeFk = 'VNL'
ORDER BY u.id, tb.dated;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
@@ -75071,7 +75353,7 @@ BEGIN
isSendMail;
UPDATE workerTimeControlMail
- SET updated = util.VN_NOW(), state = 'SENDED'
+ SET updated = NOW(), state = 'SENDED'
WHERE year = vYear AND
week = vWeek AND
IFNULL(vWorkerFk, workerFk) = workerFk ;
@@ -75201,9 +75483,10 @@ proc: LOOP
FETCH vCursor INTO vReceiver, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk, vPermissionRate, vIsTeleworking;
IF vWorkerFk <> vWorkerFkOld OR vDone THEN
- SELECT CONCAT( IFNULL(nif, ''), ' - ', firstName, ' ', name ) INTO vWorkerInfo
- FROM postgresql.person
- WHERE id_trabajador = vWorkerFkOld;
+ SELECT CONCAT_WS(' ', fi, firstName, lastName) INTO vWorkerInfo
+ FROM worker
+ WHERE id = vWorkerFkOld;
+
SET vHeader = CONCAT("
", vWorkerInfo , "
@@ -75432,8 +75715,8 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_sendMailByDepartm
BEGIN
DECLARE vDatedFrom, vDatedTo DATETIME;
- IF (DAYNAME(util.VN_CURDATE()) = 'miércoles') THEN
- SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
+ IF (DAYNAME(CURDATE()) = 'miércoles') THEN
+ SELECT DATE_SUB(CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
CALL vn.workerTimeControl_sendMailByDepartment(vDatedFrom, vDatedTo, NULL);
END IF;
@@ -75550,10 +75833,10 @@ BEGIN
DECLARE isEnabled BOOLEAN DEFAULT TRUE;
SELECT COUNT(*) INTO vHasSignedToday
- FROM vn.workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
+ FROM workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
SET @day := 0;
- SET @lastTimed := util.VN_NOW();
+ SET @lastTimed := NOW();
SELECT SUM(IF(interval_in_minutes >= v12hoursInMinutes,1,0)), SUM(FLOOR(interval_in_minutes/ v36hoursInMinutes)) , SUM(jornadas)
INTO vDescansos12h, vDescansos36h, vJornadas
@@ -75572,14 +75855,14 @@ BEGIN
(
SELECT day(timed) as dayNumber, dayname(timed) as dayName, timed
FROM
- (SELECT TIMESTAMPADD(DAY, -11, util.VN_NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
+ (SELECT TIMESTAMPADD(DAY, -11, NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
UNION ALL
SELECT timed, userFk
FROM vn.workerTimeControl wtc
WHERE userFk = vUserFk
AND timed >= TIMESTAMPADD(DAY, -10,vDated)
UNION ALL
- SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk
+ SELECT IF(vHasSignedToday, '2000-01-01 00:00', NOW()) as timed, vUserFk
) sub4
ORDER BY timed
) sub
@@ -75598,26 +75881,22 @@ BEGIN
GROUP BY dayNumber
) sub;
- -- Vacaciones
+ -- Vacaciones
SELECT at2.name INTO vCantWork
FROM postgresql.calendar_employee ce
JOIN postgresql.business b USING(business_id)
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN vn.absenceType at2 ON at2.id = ce.calendar_state_id
- JOIN vn.worker w ON w.id = p.id_trabajador
- WHERE ce.date = util.VN_CURDATE()
+ JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+ WHERE ce.date = CURDATE()
AND at2.isAllowedToWork = FALSE
- AND w.userFk = vUserFk
+ AND pr.workerFk = vUserFk
LIMIT 1;
-- Contrato en vigor
SELECT IF(COUNT(*),vCantWork,'Sin contrato') INTO vCantWork
FROM postgresql.business b
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN vn.worker w ON w.id = p.id_trabajador
- WHERE w.userFk = vUserFk
+ WHERE pr.workerFk = vUserFk
AND b.date_start <= vDated
AND IFNULL(b.date_end,vDated) >= vDated;
@@ -75625,11 +75904,11 @@ BEGIN
IF vTabletFk <> '0' THEN
-- 1 Obtener el departamento del usuario
SELECT wtcu.departmentFk INTO vDepartmentFk
- FROM vn.workerTimeControlUserInfo wtcu
+ FROM workerTimeControlUserInfo wtcu
WHERE wtcu.userFk = vUserFk;
-- 2 Comprobar si la tablet pertenece al departamento
SELECT COUNT(td.tabletFk) INTO isEnabled
- FROM vn.tabletDepartment td
+ FROM tabletDepartment td
WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk;
END IF;
@@ -76062,7 +76341,7 @@ BEGIN
JOIN agencyMode am ON am.id= r.agencyModeFk
JOIN agency a ON a.id = am.agencyFk
JOIN workerDistributionCategory wdc ON wdc.workerFk = vWorkerFk
- JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, util.VN_CURDATE()) AND wl.workerFk = wdc.workerFk AND a.workCenterFk = wl.workCenterFk
+ JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()) AND wl.workerFk = wdc.workerFk AND a.workCenterFk = wl.workCenterFk
JOIN department v ON v.id = departmentFk
JOIN routeConfig rc
WHERE r.m3>0 AND created BETWEEN vDateFrom AND vDateTo AND
@@ -76089,7 +76368,7 @@ BEGIN
ORDER BY dated DESC LIMIT 1
) sub
JOIN routeConfig rc
- JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, util.VN_CURDATE()) AND
+ JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()) AND
wl.workerFk = sub.workerFk
JOIN department v ON v.id = departmentFk
WHERE r.m3>0 AND
@@ -76360,7 +76639,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHoursTimeIn`(vUserId INT(11))
BEGIN
INSERT INTO vn.workingHours (timeIn, userId)
- VALUES (util.VN_NOW(),vUserId);
+ VALUES (NOW(),vUserId);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76380,9 +76659,9 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHoursTimeOut`(vUserId INT(11))
BEGIN
UPDATE vn.workingHours
- SET timeOut = util.VN_NOW()
+ SET timeOut = NOW()
WHERE userId = vUserId
- AND DATE(timeIn) = util.VN_CURDATE();
+ AND DATE(timeIn) = CURDATE();
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76446,7 +76725,7 @@ proc: BEGIN
*/
DECLARE vScope INT;
DECLARE vCounter INT DEFAULT 0;
- DECLARE vShipped DATE DEFAULT util.VN_CURDATE();
+ DECLARE vShipped DATE DEFAULT CURDATE();
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
BEGIN
@@ -76932,7 +77211,7 @@ proc:BEGIN
JOIN vn.productionConfig pc
WHERE a.isOwn
AND pc.isZoneClosedByExpeditionActivated
- AND e.created >= util.VN_CURDATE()
+ AND e.created >= CURDATE()
GROUP BY t.zoneFk, t.warehouseFk
HAVING numTickets >= minTicketsToCloseZone) sub;
END ;;
@@ -76974,7 +77253,7 @@ BEGIN
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
WHERE dm.code IN ('AGENCY','DELIVERY');
- CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
+ CALL zone_getOptionsForShipment(CURDATE(),FALSE);
DROP TEMPORARY TABLE IF EXISTS tmp.zoneNodes;
CREATE TEMPORARY TABLE tmp.zoneNodes (
@@ -77042,7 +77321,7 @@ BEGIN
INSERT INTO mail (receiver,replyTo,subject,body)
SELECT 'pepe@verdnatura.es' receiver,
'noreply@verdnatura.es' replyTo,
- CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject,
+ CONCAT('Colisiones en zonas ', CURDATE()) subject,
CONCAT(vTableCollisions,
GROUP_CONCAT(sub.td SEPARATOR ''),
'') body
@@ -77268,7 +77547,7 @@ BEGIN
LEFT JOIN tmp.closedZones cz
ON cz.warehouseFk = zw.warehouseFk
AND cz.zoneFk = zw.zoneFk
- AND zo.shipped = util.VN_CURDATE()
+ AND zo.shipped = CURDATE()
WHERE z.agencyModeFk = vAgencyModeFk
AND zw.warehouseFk = vWarehouseFk
AND (ISNULL(cz.zoneFk) OR vShowExpiredZones);
@@ -77577,8 +77856,8 @@ BEGIN
IF NOT vShowExpiredZones THEN
DELETE FROM tmp.zoneOption
- WHERE shipped < util.VN_CURDATE()
- OR (shipped = util.VN_CURDATE() AND util.VN_CURTIME() > `hour`);
+ WHERE shipped < CURDATE()
+ OR (shipped = CURDATE() AND CURTIME() > `hour`);
END IF;
END ;;
DELIMITER ;
@@ -77605,7 +77884,7 @@ BEGIN
* @param vShipped The shipping date
* @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
*/
- DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
+ DECLARE vHour TIME DEFAULT TIME(NOW());
DROP TEMPORARY TABLE IF EXISTS tLandings;
CREATE TEMPORARY TABLE tLandings
@@ -77665,8 +77944,8 @@ BEGIN
IF NOT vShowExpiredZones THEN
DELETE FROM tmp.zoneOption
- WHERE vShipped < util.VN_CURDATE()
- OR (vShipped = util.VN_CURDATE() AND util.VN_CURTIME() > `hour`);
+ WHERE vShipped < CURDATE()
+ OR (vShipped = CURDATE() AND CURTIME() > `hour`);
END IF;
END ;;
DELIMITER ;
@@ -77721,7 +78000,7 @@ BEGIN
LEFT JOIN tmp.closedZones cz
ON cz.warehouseFk = zw.warehouseFk
AND cz.zoneFk = zw.zoneFk
- AND zo.shipped = util.VN_CURDATE()
+ AND zo.shipped = CURDATE()
WHERE z.agencyModeFk = vAgencyModeFk
AND (ISNULL(cz.zoneFk) OR vShowExpiredZones)
ORDER BY shipped
@@ -77771,7 +78050,7 @@ BEGIN
SELECT zo.zoneFk,
zo.`hour`etd,
- (zo.`hour` <= TIME(util.VN_NOW())) isLate,
+ (zo.`hour` <= TIME(now())) isLate,
!ISNULL(cz.zoneFk) isFull,
zw.warehouseFk,
zo.landed
@@ -77859,7 +78138,7 @@ BEGIN
DECLARE vForwardDays INT;
SELECT forwardDays INTO vForwardDays FROM zoneConfig;
- CALL util.time_createTable(util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL vForwardDays DAY));
+ CALL util.time_createTable(CURDATE(), DATE_ADD(CURDATE(), INTERVAL vForwardDays DAY));
DROP TEMPORARY TABLE IF EXISTS tLandings;
CREATE TEMPORARY TABLE tLandings
@@ -77871,7 +78150,7 @@ BEGIN
ti.dated shipped
FROM zone z
JOIN zoneEvent e ON e.zoneFk = z.id
- JOIN tmp.time ti ON ti.dated BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY, vForwardDays, util.VN_CURDATE());
+ JOIN tmp.time ti ON ti.dated BETWEEN curdate() AND TIMESTAMPADD(DAY, vForwardDays, curdate());
DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
CREATE TEMPORARY TABLE tmp.zoneOption
@@ -78169,7 +78448,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
BEGIN
- DECLARE vDate DATETIME DEFAULT TIMESTAMPADD(MONTH, -2, util.VN_CURDATE());
+ DECLARE vDate DATETIME DEFAULT TIMESTAMPADD(MONTH, -2, CURDATE());
DELETE i FROM inter i JOIN vn.ticket t ON i.Id_Ticket = t.id
WHERE t.shipped <= vDate;
END ;;
@@ -78282,7 +78561,7 @@ USE `bs`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `bajasLaborales` AS select `p`.`firstname` AS `firstname`,`p`.`name` AS `name`,`b`.`business_id` AS `business_id`,max(`ce`.`date`) AS `lastDate`,max(ifnull(`b`.`date_end`,util.VN_CURDATE())) AS `endContract`,`at`.`name` AS `type`,cast(count(0) as decimal(10,0)) AS `dias`,`w`.`userFk` AS `userFk` from (((((`postgresql`.`calendar_employee` `ce` join `postgresql`.`business` `b` on((`b`.`business_id` = `ce`.`business_id`))) join `postgresql`.`profile` `pr` on((`pr`.`profile_id` = `b`.`client_id`))) join `postgresql`.`person` `p` on((`p`.`person_id` = `pr`.`person_id`))) join `vn`.`absenceType` `at` on((`at`.`id` = `ce`.`calendar_state_id`))) join `vn`.`worker` `w` on((`w`.`id` = `p`.`id_trabajador`))) where ((`ce`.`date` >= (util.VN_CURDATE() + interval -(1) year)) and (`at`.`name` not in ('Vacaciones','Vacaciones 1/2 día','Compensar','Festivo'))) group by `p`.`firstname`,`p`.`name`,`at`.`name` having (`endContract` >= util.VN_CURDATE()) */;
+/*!50001 VIEW `bajasLaborales` AS select `w`.`firstName` AS `firstname`,`w`.`lastName` AS `name`,`b`.`business_id` AS `business_id`,max(`ce`.`date`) AS `lastDate`,max(ifnull(`b`.`date_end`,curdate())) AS `endContract`,`at`.`name` AS `type`,cast(count(0) as decimal(10,0)) AS `dias`,`w`.`id` AS `userFk` from ((((`postgresql`.`calendar_employee` `ce` join `postgresql`.`business` `b` on((`b`.`business_id` = `ce`.`business_id`))) join `postgresql`.`profile` `pr` on((`pr`.`profile_id` = `b`.`client_id`))) join `vn`.`worker` `w` on((`w`.`id` = `pr`.`workerFk`))) join `vn`.`absenceType` `at` on((`at`.`id` = `ce`.`calendar_state_id`))) where ((`ce`.`date` >= (curdate() + interval -(1) year)) and (`at`.`name` not in ('Vacaciones','Vacaciones 1/2 día','Compensar','Festivo'))) group by `w`.`firstName`,`w`.`lastName`,`at`.`name` having (`endContract` >= curdate()) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78320,7 +78599,7 @@ USE `bs`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `packingSpeed` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) AS `cm3`,`t`.`warehouseFk` AS `warehouse_id`,`e`.`created` AS `odbc_date` from ((`vn`.`expedition` `e` join `vn`.`packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` between util.VN_CURDATE() and `util`.`dayend`(util.VN_CURDATE())) */;
+/*!50001 VIEW `packingSpeed` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) AS `cm3`,`t`.`warehouseFk` AS `warehouse_id`,`e`.`created` AS `odbc_date` from ((`vn`.`expedition` `e` join `vn`.`packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` between curdate() and `util`.`dayend`(curdate())) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78427,7 +78706,7 @@ USE `edi`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `errorList` AS select `po`.`id` AS `id`,`c`.`name` AS `name`,`i`.`longName` AS `longName`,`po`.`quantity` AS `quantity`,left(`po`.`error`,4) AS `stock`,`po`.`error` AS `error`,`po`.`deliveryInformationID` AS `deliveryInformationID`,`po`.`supplyResponseID` AS `supplyResponseID`,`po`.`OrderTradeLineDateTime` AS `OrderTradeLineDateTime`,`po`.`EndUserPartyGLN` AS `EndUserPartyGLN` from ((`edi`.`putOrder` `po` left join `vn`.`client` `c` on((`c`.`id` = `po`.`EndUserPartyGLN`))) left join `vn`.`item` `i` on((`i`.`supplyResponseFk` = `po`.`supplyResponseID`))) where ((`po`.`OrderTradeLineDateTime` > (util.VN_CURDATE() + interval -(12) hour)) and (`po`.`OrderStatus` = 3) and (left(`po`.`error`,4) <> '(0) ')) */;
+/*!50001 VIEW `errorList` AS select `po`.`id` AS `id`,`c`.`name` AS `name`,`i`.`longName` AS `longName`,`po`.`quantity` AS `quantity`,left(`po`.`error`,4) AS `stock`,`po`.`error` AS `error`,`po`.`deliveryInformationID` AS `deliveryInformationID`,`po`.`supplyResponseID` AS `supplyResponseID`,`po`.`OrderTradeLineDateTime` AS `OrderTradeLineDateTime`,`po`.`EndUserPartyGLN` AS `EndUserPartyGLN` from ((`edi`.`putOrder` `po` left join `vn`.`client` `c` on((`c`.`id` = `po`.`EndUserPartyGLN`))) left join `vn`.`item` `i` on((`i`.`supplyResponseFk` = `po`.`supplyResponseID`))) where ((`po`.`OrderTradeLineDateTime` > (curdate() + interval -(12) hour)) and (`po`.`OrderStatus` = 3) and (left(`po`.`error`,4) <> '(0) ')) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78446,7 +78725,7 @@ USE `edi`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `supplyOffer` AS select `sr`.`vmpID` AS `vmpID`,`di`.`ID` AS `diId`,`sr`.`ID` AS `srId`,`sr`.`Item_ArticleCode` AS `Item_ArticleCode`,`sr`.`VBNOmschrijving` AS `product_name`,`s`.`company_name` AS `company_name`,cast(`sr`.`Price` as decimal(10,3)) AS `Price`,`sr`.`Quality` AS `Quality`,`sr`.`s1` AS `s1`,`sr`.`s2` AS `s2`,`sr`.`s3` AS `s3`,`sr`.`s4` AS `s4`,`sr`.`s5` AS `s5`,`sr`.`s6` AS `s6`,`sr`.`NumberOfUnits` AS `NumberOfUnits`,least(if((`sr`.`EmbalageCode` = 800),((`sr`.`EmbalageCode` * 10) + `sr`.`NumberOfItemsPerCask`),`sr`.`EmbalageCode`),ifnull(`idt`.`bucket_id`,'999')) AS `EmbalageCode`,`di`.`LatestDeliveryDateTime` AS `LatestDeliveryDateTime`,`di`.`EarliestDespatchDateTime` AS `EarliestDespatchDateTime`,`di`.`FirstOrderDateTime` AS `FirstOrderDateTime`,`di`.`LatestOrderDateTime` AS `LatestOrderDateTime`,`sr`.`NumberOfItemsPerCask` AS `NumberOfItemsPerCask`,`sr`.`NumberOfLayersPerTrolley` AS `NumberOfLayersPerTrolley`,`sr`.`MinimumNumberToOrder` AS `MinimumNumberToOrder`,`sr`.`MaximumNumberToOrder` AS `MaximumNumberToOrder`,`sr`.`IncrementalOrderableQuantity` AS `IncrementalOrderableQuantity`,`sr`.`PackingPrice` AS `PackingPrice`,`sr`.`MarketPlaceID` AS `MarketPlaceID`,`sr`.`PictureReference` AS `PictureReference`,`sr`.`updated` AS `supplyResponseUpdated`,`i`.`group_id` AS `group_id`,`mp`.`name` AS `marketPlace`,`di`.`DeliveryPrice` AS `DeliveryPrice`,`di`.`ChargeAmount` AS `ChargeAmount`,`di`.`MinimumQuantity` AS `MinimumQuantity`,`di`.`MaximumQuantity Integer` AS `MaximumQuantity`,cast((`sr`.`MinimumNumberToOrder` * (case `sr`.`MinimumOrderUnitType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `OrderUnit`,cast((`sr`.`IncrementalOrderableQuantity` * (case `sr`.`IncrementalOrderableQuantityType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `IncrementalOrderUnit`,`mp`.`isEarlyBird` AS `isEarlyBird`,`v`.`isVNHSupplier` AS `isVNHSupplier`,`igo`.`expenseFk` AS `expenseFk`,`igo`.`intrastatFk` AS `intrastatFk`,`igo`.`originFk` AS `originFk`,ifnull(`idt`.`itemTypeFk`,`igo`.`itemTypeFk`) AS `itemTypeFk` from (((((((((`edi`.`deliveryInformation` `di` join `edi`.`supplyResponse` `sr` on((`sr`.`ID` = `di`.`supplyResponseID`))) left join `edi`.`supplier` `s` on((`s`.`glnAddressCode` = `sr`.`SupplierGLN`))) join `edi`.`bucket` `b` on((`b`.`bucket_id` = `sr`.`EmbalageCode`))) join `edi`.`item` `i` on((`i`.`id` = `sr`.`Item_ArticleCode`))) join `edi`.`marketPlace` `mp` on((`mp`.`id` = `sr`.`MarketPlaceID`))) join `vn`.`floramondoConfig` `fm`) left join `edi`.`item_defaultType` `idt` on((`idt`.`item_id` = `i`.`id`))) join `edi`.`VMPSettings` `v` on((`v`.`VMPID` = `sr`.`vmpID`))) join `edi`.`item_groupToOffer` `igo` on((`igo`.`group_code` = `i`.`group_id`))) where ((`v`.`isBlocked` = 0) and (`s`.`isBanned` = 0) and (`sr`.`NumberOfUnits` > 0) and (util.VN_NOW() between `di`.`FirstOrderDateTime` and `di`.`LatestOrderDateTime`) and (`mp`.`isOffered` = 1) and (`di`.`LatestDeliveryDateTime` between cast(`fm`.`nextLanded` as date) and concat(cast(`fm`.`nextLanded` as date),' ',`fm`.`MaxLatestDeliveryHour`))) group by `sr`.`ID` having (`EmbalageCode` <> 999) */;
+/*!50001 VIEW `supplyOffer` AS select `sr`.`vmpID` AS `vmpID`,`di`.`ID` AS `diId`,`sr`.`ID` AS `srId`,`sr`.`Item_ArticleCode` AS `Item_ArticleCode`,`sr`.`VBNOmschrijving` AS `product_name`,`s`.`company_name` AS `company_name`,cast(`sr`.`Price` as decimal(10,3)) AS `Price`,`sr`.`Quality` AS `Quality`,`sr`.`s1` AS `s1`,`sr`.`s2` AS `s2`,`sr`.`s3` AS `s3`,`sr`.`s4` AS `s4`,`sr`.`s5` AS `s5`,`sr`.`s6` AS `s6`,`sr`.`NumberOfUnits` AS `NumberOfUnits`,least(if((`sr`.`EmbalageCode` = 800),((`sr`.`EmbalageCode` * 10) + `sr`.`NumberOfItemsPerCask`),`sr`.`EmbalageCode`),ifnull(`idt`.`bucket_id`,'999')) AS `EmbalageCode`,`di`.`LatestDeliveryDateTime` AS `LatestDeliveryDateTime`,`di`.`EarliestDespatchDateTime` AS `EarliestDespatchDateTime`,`di`.`FirstOrderDateTime` AS `FirstOrderDateTime`,`di`.`LatestOrderDateTime` AS `LatestOrderDateTime`,`sr`.`NumberOfItemsPerCask` AS `NumberOfItemsPerCask`,`sr`.`NumberOfLayersPerTrolley` AS `NumberOfLayersPerTrolley`,`sr`.`MinimumNumberToOrder` AS `MinimumNumberToOrder`,`sr`.`MaximumNumberToOrder` AS `MaximumNumberToOrder`,`sr`.`IncrementalOrderableQuantity` AS `IncrementalOrderableQuantity`,`sr`.`PackingPrice` AS `PackingPrice`,`sr`.`MarketPlaceID` AS `MarketPlaceID`,`sr`.`PictureReference` AS `PictureReference`,`sr`.`updated` AS `supplyResponseUpdated`,`i`.`group_id` AS `group_id`,`mp`.`name` AS `marketPlace`,`di`.`DeliveryPrice` AS `DeliveryPrice`,`di`.`ChargeAmount` AS `ChargeAmount`,`di`.`MinimumQuantity` AS `MinimumQuantity`,`di`.`MaximumQuantity Integer` AS `MaximumQuantity`,cast((`sr`.`MinimumNumberToOrder` * (case `sr`.`MinimumOrderUnitType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `OrderUnit`,cast((`sr`.`IncrementalOrderableQuantity` * (case `sr`.`IncrementalOrderableQuantityType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `IncrementalOrderUnit`,`mp`.`isEarlyBird` AS `isEarlyBird`,`v`.`isVNHSupplier` AS `isVNHSupplier`,`igo`.`expenseFk` AS `expenseFk`,`igo`.`intrastatFk` AS `intrastatFk`,`igo`.`originFk` AS `originFk`,ifnull(`idt`.`itemTypeFk`,`igo`.`itemTypeFk`) AS `itemTypeFk` from (((((((((`edi`.`deliveryInformation` `di` join `edi`.`supplyResponse` `sr` on((`sr`.`ID` = `di`.`supplyResponseID`))) left join `edi`.`supplier` `s` on((`s`.`glnAddressCode` = `sr`.`SupplierGLN`))) join `edi`.`bucket` `b` on((`b`.`bucket_id` = `sr`.`EmbalageCode`))) join `edi`.`item` `i` on((`i`.`id` = `sr`.`Item_ArticleCode`))) join `edi`.`marketPlace` `mp` on((`mp`.`id` = `sr`.`MarketPlaceID`))) join `vn`.`floramondoConfig` `fm`) left join `edi`.`item_defaultType` `idt` on((`idt`.`item_id` = `i`.`id`))) join `edi`.`VMPSettings` `v` on((`v`.`VMPID` = `sr`.`vmpID`))) join `edi`.`item_groupToOffer` `igo` on((`igo`.`group_code` = `i`.`group_id`))) where ((`v`.`isBlocked` = 0) and (`s`.`isBanned` = 0) and (`sr`.`NumberOfUnits` > 0) and (now() between `di`.`FirstOrderDateTime` and `di`.`LatestOrderDateTime`) and (`mp`.`isOffered` = 1) and (`di`.`LatestDeliveryDateTime` between cast(`fm`.`nextLanded` as date) and concat(cast(`fm`.`nextLanded` as date),' ',`fm`.`MaxLatestDeliveryHour`))) group by `sr`.`ID` having (`EmbalageCode` <> 999) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78976,25 +79255,6 @@ USE `postgresql`;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
---
--- Final view structure for view `person`
---
-
-/*!50001 DROP TABLE IF EXISTS `person`*/;
-/*!50001 DROP VIEW IF EXISTS `person`*/;
-/*!50001 SET @saved_cs_client = @@character_set_client */;
-/*!50001 SET @saved_cs_results = @@character_set_results */;
-/*!50001 SET @saved_col_connection = @@collation_connection */;
-/*!50001 SET character_set_client = utf8mb4 */;
-/*!50001 SET character_set_results = utf8mb4 */;
-/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `person` AS select `p`.`id` AS `person_id`,`p`.`surnames` AS `name`,`p`.`nickname` AS `nickname`,`p`.`fi` AS `nif`,`p`.`birth` AS `birth`,`p`.`firstname` AS `firstname`,`p`.`p2` AS `p2`,`p`.`workerFk` AS `id_trabajador`,`p`.`isDisable` AS `isDisable`,`p`.`isFreelance` AS `isFreelance`,`p`.`isSsDiscounted` AS `isSsDiscounted`,`p`.`sex` AS `sex` from `vn`.`person` `p` */;
-/*!50001 SET character_set_client = @saved_cs_client */;
-/*!50001 SET character_set_results = @saved_cs_results */;
-/*!50001 SET collation_connection = @saved_col_connection */;
-
--
-- Current Database: `sage`
--
@@ -79015,7 +79275,7 @@ USE `sage`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `clientLastTwoMonths` AS select `vn`.`invoiceOut`.`clientFk` AS `clientFk`,`vn`.`invoiceOut`.`companyFk` AS `companyFk` from `vn`.`invoiceOut` where (`vn`.`invoiceOut`.`issued` > (util.VN_CURDATE() - interval 2 month)) union select `vn`.`receipt`.`clientFk` AS `clientFk`,`vn`.`receipt`.`companyFk` AS `companyFk` from `vn`.`receipt` where (`vn`.`receipt`.`payed` > (util.VN_CURDATE() - interval 2 month)) */;
+/*!50001 VIEW `clientLastTwoMonths` AS select `vn`.`invoiceOut`.`clientFk` AS `clientFk`,`vn`.`invoiceOut`.`companyFk` AS `companyFk` from `vn`.`invoiceOut` where (`vn`.`invoiceOut`.`issued` > (curdate() - interval 2 month)) union select `vn`.`receipt`.`clientFk` AS `clientFk`,`vn`.`receipt`.`companyFk` AS `companyFk` from `vn`.`receipt` where (`vn`.`receipt`.`payed` > (curdate() - interval 2 month)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79034,17 +79294,17 @@ USE `sage`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,if((`vn`.`invoiceIn`.`expenceFkDeductible` > 0),1,0) AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` >= (date_format(util.VN_CURDATE(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,`c`.`id` AS `supplierFk`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from (`vn`.`dua` join `vn`.`company` `c` on((`c`.`code` = 'VNL'))) */;
+/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,if((`vn`.`invoiceIn`.`expenceFkDeductible` > 0),1,0) AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` >= (date_format(curdate(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,`c`.`id` AS `supplierFk`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from (`vn`.`dua` join `vn`.`company` `c` on((`c`.`code` = 'VNL'))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
--
--- Final view structure for view `providerLastThreeMonths`
+-- Final view structure for view `supplierLastThreeMonths`
--
-/*!50001 DROP TABLE IF EXISTS `providerLastThreeMonths`*/;
-/*!50001 DROP VIEW IF EXISTS `providerLastThreeMonths`*/;
+/*!50001 DROP TABLE IF EXISTS `supplierLastThreeMonths`*/;
+/*!50001 DROP VIEW IF EXISTS `supplierLastThreeMonths`*/;
/*!50001 SET @saved_cs_client = @@character_set_client */;
/*!50001 SET @saved_cs_results = @@character_set_results */;
/*!50001 SET @saved_col_connection = @@collation_connection */;
@@ -79053,7 +79313,7 @@ USE `sage`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `providerLastThreeMonths` AS select `vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`companyFk` AS `companyFk` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` > (util.VN_CURDATE() - interval 3 month)) union select `vn`.`payment`.`supplierFk` AS `supplierFk`,`vn`.`payment`.`companyFk` AS `companyFk` from `vn`.`payment` where (`vn`.`payment`.`received` > (util.VN_CURDATE() + interval -(3) month)) */;
+/*!50001 VIEW `supplierLastThreeMonths` AS select `vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`companyFk` AS `companyFk` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` > (curdate() - interval 3 month)) union select `vn`.`payment`.`supplierFk` AS `supplierFk`,`vn`.`payment`.`companyFk` AS `companyFk` from `vn`.`payment` where (`vn`.`payment`.`received` > (curdate() + interval -(3) month)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79172,7 +79432,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `NewView` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (util.VN_CURDATE() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (util.VN_CURDATE() + interval -(`notBuyingMonths`) month))) */;
+/*!50001 VIEW `NewView` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (curdate() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (curdate() + interval -(`notBuyingMonths`) month))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79248,7 +79508,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `awbVolume` AS select `d`.`awbFk` AS `awbFk`,(((`b`.`stickers` * `i`.`density`) * if((`p`.`volume` > 0),`p`.`volume`,((`p`.`width` * `p`.`depth`) * if((`p`.`height` = 0),(`i`.`size` + 10),`p`.`height`)))) / 167000) AS `volume`,`b`.`id` AS `buyFk` from (((((((`buy` `b` join `item` `i` on((`b`.`itemFk` = `i`.`id`))) join `itemType` `it` on((`i`.`typeFk` = `it`.`id`))) join `packaging` `p` on((`p`.`id` = `b`.`packageFk`))) join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`t`.`id` = `e`.`travelFk`))) join `duaEntry` `de` on((`de`.`entryFk` = `e`.`id`))) join `dua` `d` on((`d`.`id` = `de`.`duaFk`))) where (`t`.`shipped` > makedate((year(util.VN_CURDATE()) - 1),1)) */;
+/*!50001 VIEW `awbVolume` AS select `d`.`awbFk` AS `awbFk`,(((`b`.`stickers` * `i`.`density`) * if((`p`.`volume` > 0),`p`.`volume`,((`p`.`width` * `p`.`depth`) * if((`p`.`height` = 0),(`i`.`size` + 10),`p`.`height`)))) / 167000) AS `volume`,`b`.`id` AS `buyFk` from (((((((`buy` `b` join `item` `i` on((`b`.`itemFk` = `i`.`id`))) join `itemType` `it` on((`i`.`typeFk` = `it`.`id`))) join `packaging` `p` on((`p`.`id` = `b`.`packageFk`))) join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`t`.`id` = `e`.`travelFk`))) join `duaEntry` `de` on((`de`.`entryFk` = `e`.`id`))) join `dua` `d` on((`d`.`id` = `de`.`duaFk`))) where (`t`.`shipped` > makedate((year(curdate()) - 1),1)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79362,7 +79622,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `clientLost` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (util.VN_CURDATE() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (util.VN_CURDATE() + interval -(`notBuyingMonths`) month))) */;
+/*!50001 VIEW `clientLost` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (curdate() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (curdate() + interval -(`notBuyingMonths`) month))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79538,25 +79798,6 @@ USE `vn`;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
---
--- Final view structure for view `entryList`
---
-
-/*!50001 DROP TABLE IF EXISTS `entryList`*/;
-/*!50001 DROP VIEW IF EXISTS `entryList`*/;
-/*!50001 SET @saved_cs_client = @@character_set_client */;
-/*!50001 SET @saved_cs_results = @@character_set_results */;
-/*!50001 SET @saved_col_connection = @@collation_connection */;
-/*!50001 SET character_set_client = utf8mb4 */;
-/*!50001 SET character_set_results = utf8mb4 */;
-/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `entryList` AS select `e`.`id` AS `entryFk`,if(`tr`.`isReceived`,' x','') AS `isHere`,`tr`.`landed` AS `landed`,ifnull(`s`.`nickname`,`s`.`name`) AS `supplier`,`e`.`ref` AS `entryRef`,`a`.`name` AS `agency`,`tr`.`ref` AS `travelRef`,`tr`.`appointment` AS `appointment`,`e`.`supplierFk` AS `supplierFk`,`tr`.`warehouseInFk` AS `warehouseInFk` from (((`entry` `e` join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) join `supplier` `s` on((`s`.`id` = `e`.`supplierFk`))) left join `agency` `a` on((`tr`.`agencyFk` = `a`.`id`))) where (`tr`.`landed` between (util.VN_CURDATE() + interval -(1) week) and (util.VN_CURDATE() + interval 3 month)) order by (`tr`.`landed` < (util.VN_CURDATE() + interval 2 day)) desc,`tr`.`landed` desc,ifnull(`s`.`nickname`,`s`.`name`),`e`.`id` desc */;
-/*!50001 SET character_set_client = @saved_cs_client */;
-/*!50001 SET character_set_results = @saved_cs_results */;
-/*!50001 SET collation_connection = @saved_col_connection */;
-
--
-- Final view structure for view `exchangeInsuranceEntry`
--
@@ -79571,7 +79812,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `exchangeInsuranceEntry` AS select max(`tr`.`landed`) AS `dated`,cast(sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) as decimal(10,2)) AS `Dolares`,cast((sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) / sum(((((100 + `e`.`commission`) / 100) * (`b`.`buyingValue` + `b`.`freightValue`)) * `b`.`quantity`))) as decimal(10,4)) AS `rate` from ((`entry` `e` join `buy` `b` on((`e`.`id` = `b`.`entryFk`))) join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) where ((`tr`.`landed` between '2016-01-31' and util.VN_CURDATE()) and (`e`.`commission` < 0) and (`e`.`currencyFk` = 2)) group by month(`tr`.`landed`),year(`tr`.`landed`) */;
+/*!50001 VIEW `exchangeInsuranceEntry` AS select max(`tr`.`landed`) AS `dated`,cast(sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) as decimal(10,2)) AS `Dolares`,cast((sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) / sum(((((100 + `e`.`commission`) / 100) * (`b`.`buyingValue` + `b`.`freightValue`)) * `b`.`quantity`))) as decimal(10,4)) AS `rate` from ((`entry` `e` join `buy` `b` on((`e`.`id` = `b`.`entryFk`))) join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) where ((`tr`.`landed` between '2016-01-31' and curdate()) and (`e`.`commission` < 0) and (`e`.`currencyFk` = 2)) group by month(`tr`.`landed`),year(`tr`.`landed`) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79647,7 +79888,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionCommon` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `etd`,ifnull(ucase(`et`.`description`),'SIN ESCANEAR') AS `description`,`es`.`palletFk` AS `palletFk`,`t`.`routeFk` AS `routeFk`,`es`.`id` AS `scanFk`,`e`.`id` AS `expeditionFk`,`r`.`expeditionTruckFk` AS `expeditionTruckFk`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `lastPacked`,`t`.`id` AS `ticketFk` from (((((`expeditionTruck` `et` left join `routesMonitor` `r` on((`et`.`id` = `r`.`expeditionTruckFk`))) left join `ticket` `t` on((`r`.`routeFk` = `t`.`routeFk`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `expeditionScan` `es` on((`e`.`id` = `es`.`expeditionFk`))) left join `expeditionPallet` `ep` on((`es`.`palletFk` = `ep`.`id`))) where (`et`.`ETD` >= util.VN_CURDATE()) */;
+/*!50001 VIEW `expeditionCommon` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `etd`,ifnull(ucase(`et`.`description`),'SIN ESCANEAR') AS `description`,`es`.`palletFk` AS `palletFk`,`t`.`routeFk` AS `routeFk`,`es`.`id` AS `scanFk`,`e`.`id` AS `expeditionFk`,`r`.`expeditionTruckFk` AS `expeditionTruckFk`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `lastPacked`,`t`.`id` AS `ticketFk` from (((((`expeditionTruck` `et` left join `routesMonitor` `r` on((`et`.`id` = `r`.`expeditionTruckFk`))) left join `ticket` `t` on((`r`.`routeFk` = `t`.`routeFk`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `expeditionScan` `es` on((`e`.`id` = `es`.`expeditionFk`))) left join `expeditionPallet` `ep` on((`es`.`palletFk` = `ep`.`id`))) where (`et`.`ETD` >= curdate()) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79666,7 +79907,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk`,if((`r`.`created` > (util.VN_CURDATE() + interval 1 day)),ucase(dayname(`r`.`created`)),NULL) AS `nombreDia` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */;
+/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk`,if((`r`.`created` > (curdate() + interval 1 day)),ucase(dayname(`r`.`created`)),NULL) AS `nombreDia` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79742,7 +79983,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionSticker` AS select `e`.`id` AS `expeditionFk`,`e`.`ticketFk` AS `ticketFk`,`t`.`addressFk` AS `addressFk`,`t`.`clientFk` AS `clientFk`,`a`.`street` AS `street`,`a`.`postalCode` AS `postalCode`,`a`.`city` AS `city`,`a`.`nickname` AS `nickname`,concat('R(',convert(right(`t`.`routeFk`,3) using utf8mb4),')') AS `routeFk`,`rm`.`beachFk` AS `beachFk`,if(`t`.`routeFk`,replace(`am`.`name`,'ZONA ','Z'),`z`.`name`) AS `zona`,`p`.`name` AS `province`,ifnull(`c`.`mobile`,ifnull(`a`.`mobile`,ifnull(`c`.`phone`,`a`.`phone`))) AS `phone`,`w`.`code` AS `workerCode` from ((((((((((`expedition` `e` join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) left join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) left join `beach` `b` on((`b`.`code` = `rm`.`beachFk`))) left join `zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `agencyMode` `am` on((`am`.`id` = `r`.`agencyModeFk`))) join `client` `c` on((`c`.`id` = `a`.`clientFk`))) join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) */;
+/*!50001 VIEW `expeditionSticker` AS select `e`.`id` AS `expeditionFk`,`e`.`ticketFk` AS `ticketFk`,`t`.`addressFk` AS `addressFk`,`t`.`clientFk` AS `clientFk`,`a`.`street` AS `street`,`a`.`postalCode` AS `postalCode`,`a`.`city` AS `city`,`a`.`nickname` AS `nickname`,concat('R(',convert(right(`t`.`routeFk`,3) using utf8mb4),')') AS `routeFk`,`rm`.`beachFk` AS `beachFk`,if(`t`.`routeFk`,ifnull(`et`.`description`,replace(`am`.`name`,'ZONA ','Z')),`z`.`name`) AS `zona`,`p`.`name` AS `province`,ifnull(`c`.`mobile`,ifnull(`a`.`mobile`,ifnull(`c`.`phone`,`a`.`phone`))) AS `phone`,`w`.`code` AS `workerCode` from (((((((((((`expedition` `e` join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) left join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) left join `expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) left join `beach` `b` on((`b`.`code` = `rm`.`beachFk`))) left join `zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `agencyMode` `am` on((`am`.`id` = `r`.`agencyModeFk`))) join `client` `c` on((`c`.`id` = `a`.`clientFk`))) join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79761,7 +80002,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTicket_NoBoxes` AS select `t`.`id` AS `ticketFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`routeFk` AS `routeFk`,`et`.`description` AS `description` from (((`ticket` `t` left join `expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) join `expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) where (isnull(`e`.`id`) and (`et`.`ETD` > util.VN_CURDATE())) */;
+/*!50001 VIEW `expeditionTicket_NoBoxes` AS select `t`.`id` AS `ticketFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`routeFk` AS `routeFk`,`et`.`description` AS `description` from (((`ticket` `t` left join `expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) join `expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) where (isnull(`e`.`id`) and (`et`.`ETD` > curdate())) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79780,7 +80021,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTimeExpended` AS select `e`.`ticketFk` AS `ticketFk`,min(`e`.`created`) AS `started`,max(`e`.`created`) AS `finished`,max(`e`.`counter`) AS `cajas`,`w`.`code` AS `code`,`t`.`warehouseFk` AS `warehouseFk` from ((`expedition` `e` join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` > util.VN_CURDATE()) group by `e`.`ticketFk` */;
+/*!50001 VIEW `expeditionTimeExpended` AS select `e`.`ticketFk` AS `ticketFk`,min(`e`.`created`) AS `started`,max(`e`.`created`) AS `finished`,max(`e`.`counter`) AS `cajas`,`w`.`code` AS `code`,`t`.`warehouseFk` AS `warehouseFk` from ((`expedition` `e` join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` > curdate()) group by `e`.`ticketFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79913,7 +80154,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceCorrectionDataSource` AS select `s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped` from (`sale` `s` join `ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) where (`t`.`shipped` > (util.VN_CURDATE() + interval -(3) year)) */;
+/*!50001 VIEW `invoiceCorrectionDataSource` AS select `s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped` from (`sale` `s` join `ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) where (`t`.`shipped` > (curdate() + interval -(3) year)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80046,7 +80287,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) where (`ips`.`created` >= util.VN_CURDATE()) group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
+/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) where (`ips`.`created` >= curdate()) group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80103,7 +80344,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(util.VN_CURDATE())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`isPreviousPreparable`) */;
+/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`isPreviousPreparable`) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80350,7 +80591,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastHourProduction` AS select `t`.`warehouseFk` AS `warehouseFk`,cast(sum((ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) / 1000000)) as decimal(5,1)) AS `m3` from (((`warehouse` `w` join `ticket` `t` on((`t`.`warehouseFk` = `w`.`id`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) where (`e`.`created` between (util.VN_NOW() - interval 1 hour) and util.VN_NOW()) group by `t`.`warehouseFk` */;
+/*!50001 VIEW `lastHourProduction` AS select `t`.`warehouseFk` AS `warehouseFk`,cast(sum((ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) / 1000000)) as decimal(5,1)) AS `m3` from (((`warehouse` `w` join `ticket` `t` on((`t`.`warehouseFk` = `w`.`id`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) where (`e`.`created` between (now() - interval 1 hour) and now()) group by `t`.`warehouseFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80388,7 +80629,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (util.VN_CURDATE() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimsNumber` desc */;
+/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (curdate() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimsNumber` desc */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80502,7 +80743,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `personMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on((`po`.`person_id` = `p`.`person_id`))) join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil personal') */;
+/*!50001 VIEW `personMedia` AS select `po`.`workerFk` AS `workerFk`,`m`.`value` AS `mediaValue` from (((`postgresql`.`profile` `po` join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil personal') */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80540,7 +80781,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `productionVolume` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,ifnull(((`p`.`width` * `p`.`height`) * `p`.`depth`),94500)) AS `cm3`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `created` from (((`expedition` `e` left join `packaging` `p` on((`p`.`itemFk` = `e`.`itemFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `client` `c` on((`c`.`id` = `t`.`clientFk`))) where ((`e`.`created` between util.VN_CURDATE() and `util`.`dayend`(util.VN_CURDATE())) and `c`.`isRelevant`) */;
+/*!50001 VIEW `productionVolume` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,ifnull(((`p`.`width` * `p`.`height`) * `p`.`depth`),94500)) AS `cm3`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `created` from (((`expedition` `e` left join `packaging` `p` on((`p`.`itemFk` = `e`.`itemFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `client` `c` on((`c`.`id` = `t`.`clientFk`))) where ((`e`.`created` between curdate() and `util`.`dayend`(curdate())) and `c`.`isRelevant`) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80559,7 +80800,26 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `productionVolume_LastHour` AS select cast(sum((`productionVolume`.`cm3` / 1000000)) as decimal(10,0)) AS `m3`,`productionVolume`.`warehouseFk` AS `warehouseFk` from `productionVolume` where ((`productionVolume`.`created` > (util.VN_NOW() + interval -(1) hour)) and (`productionVolume`.`warehouseFk` in (1,44,60))) group by `productionVolume`.`warehouseFk` */;
+/*!50001 VIEW `productionVolume_LastHour` AS select cast(sum((`productionVolume`.`cm3` / 1000000)) as decimal(10,0)) AS `m3`,`productionVolume`.`warehouseFk` AS `warehouseFk` from `productionVolume` where ((`productionVolume`.`created` > (now() + interval -(1) hour)) and (`productionVolume`.`warehouseFk` in (1,44,60))) group by `productionVolume`.`warehouseFk` */;
+/*!50001 SET character_set_client = @saved_cs_client */;
+/*!50001 SET character_set_results = @saved_cs_results */;
+/*!50001 SET collation_connection = @saved_col_connection */;
+
+--
+-- Final view structure for view `returnBuckets`
+--
+
+/*!50001 DROP TABLE IF EXISTS `returnBuckets`*/;
+/*!50001 DROP VIEW IF EXISTS `returnBuckets`*/;
+/*!50001 SET @saved_cs_client = @@character_set_client */;
+/*!50001 SET @saved_cs_results = @@character_set_results */;
+/*!50001 SET @saved_col_connection = @@collation_connection */;
+/*!50001 SET character_set_client = utf8mb4 */;
+/*!50001 SET character_set_results = utf8mb4 */;
+/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `returnBuckets` AS select `cr`.`idCubos_Retorno` AS `id`,`cr`.`Soporte` AS `freightContainerType`,`cr`.`Vacio` AS `freightPackagingEmpty`,`cr`.`Lleno` AS `freightPackagingFull` from `vn2008`.`Cubos_Retorno` `cr` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80692,7 +80952,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleSaleTracking` AS select distinct `st`.`saleFk` AS `saleFk` from `saleTracking` `st` where (`st`.`created` >= (util.VN_CURDATE() + interval -(1) day)) */;
+/*!50001 VIEW `saleSaleTracking` AS select distinct `st`.`saleFk` AS `saleFk` from `saleTracking` `st` where (`st`.`created` >= (curdate() + interval -(1) day)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80749,7 +81009,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleVolume_Today_VNH` AS select `t`.`nickname` AS `Cliente`,`p`.`name` AS `Provincia`,`c`.`country` AS `Pais`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `volume` from (((((`saleVolume` `sv` join `ticket` `t` on((`t`.`id` = `sv`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) join `country` `c` on((`c`.`id` = `p`.`countryFk`))) join `warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) where ((`w`.`name` = 'VNH') and (`t`.`shipped` between util.VN_CURDATE() and `util`.`dayend`(util.VN_CURDATE()))) group by `t`.`nickname`,`p`.`name` */;
+/*!50001 VIEW `saleVolume_Today_VNH` AS select `t`.`nickname` AS `Cliente`,`p`.`name` AS `Provincia`,`c`.`country` AS `Pais`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `volume` from (((((`saleVolume` `sv` join `ticket` `t` on((`t`.`id` = `sv`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) join `country` `c` on((`c`.`id` = `p`.`countryFk`))) join `warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) where ((`w`.`name` = 'VNH') and (`t`.`shipped` between curdate() and `util`.`dayend`(curdate()))) group by `t`.`nickname`,`p`.`name` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80787,7 +81047,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPersonSince` AS select `p`.`id_trabajador` AS `workerFk`,min(`b`.`date_start`) AS `started` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) left join `postgresql`.`business` `b` on((`pr`.`profile_id` = `b`.`client_id`))) left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `postgresql`.`professional_category` `pc` on((`pc`.`professional_category_id` = `bl`.`professional_category_id`))) where (`pc`.`category_name` = 'Aux ventas') group by `p`.`id_trabajador` */;
+/*!50001 VIEW `salesPersonSince` AS select `pr`.`workerFk` AS `workerFk`,min(`b`.`date_start`) AS `started` from (((`postgresql`.`profile` `pr` left join `postgresql`.`business` `b` on((`pr`.`profile_id` = `b`.`client_id`))) left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `postgresql`.`professional_category` `pc` on((`pc`.`professional_category_id` = `bl`.`professional_category_id`))) where (`pc`.`category_name` = 'Aux ventas') group by `pr`.`workerFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80806,7 +81066,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPreparedLastHour` AS select `t`.`warehouseFk` AS `warehouseFk`,`st`.`saleFk` AS `saleFk`,`st`.`isChecked` AS `isChecked`,`st`.`originalQuantity` AS `originalQuantity`,`a`.`accion` AS `accion`,`st`.`created` AS `created`,`e`.`code` AS `code`,`w`.`firstName` AS `firstname`,`w`.`lastName` AS `lastName`,`w`.`code` AS `workerCode`,((`ic`.`cm3delivery` * `s`.`quantity`) / 1000) AS `litros`,`s`.`concept` AS `concept`,`d`.`name` AS `departmentName` from (((((((((`vn`.`saleTracking` `st` left join `vn`.`salesPreviousPreparated` `prevPrepSales` on((`prevPrepSales`.`saleFk` = `st`.`saleFk`))) join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`itemCost` `ic` on(((`ic`.`warehouseFk` = `t`.`warehouseFk`) and (`ic`.`itemFk` = `s`.`itemFk`)))) join `vn`.`worker` `w` on((`w`.`id` = `st`.`workerFk`))) join `vn`.`state` `e` on((`e`.`id` = `st`.`stateFk`))) join `vncontrol`.`accion` `a` on((`a`.`accion_id` = `st`.`actionFk`))) join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `st`.`workerFk`))) join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) where ((`st`.`created` > (util.VN_NOW() + interval -(1) hour)) and isnull(`prevPrepSales`.`saleFk`) and (not((`d`.`name` like 'EQUIPO%')))) */;
+/*!50001 VIEW `salesPreparedLastHour` AS select `t`.`warehouseFk` AS `warehouseFk`,`st`.`saleFk` AS `saleFk`,`st`.`isChecked` AS `isChecked`,`st`.`originalQuantity` AS `originalQuantity`,`a`.`accion` AS `accion`,`st`.`created` AS `created`,`e`.`code` AS `code`,`w`.`firstName` AS `firstname`,`w`.`lastName` AS `lastName`,`w`.`code` AS `workerCode`,((`ic`.`cm3delivery` * `s`.`quantity`) / 1000) AS `litros`,`s`.`concept` AS `concept`,`d`.`name` AS `departmentName` from (((((((((`vn`.`saleTracking` `st` left join `vn`.`salesPreviousPreparated` `prevPrepSales` on((`prevPrepSales`.`saleFk` = `st`.`saleFk`))) join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`itemCost` `ic` on(((`ic`.`warehouseFk` = `t`.`warehouseFk`) and (`ic`.`itemFk` = `s`.`itemFk`)))) join `vn`.`worker` `w` on((`w`.`id` = `st`.`workerFk`))) join `vn`.`state` `e` on((`e`.`id` = `st`.`stateFk`))) join `vncontrol`.`accion` `a` on((`a`.`accion_id` = `st`.`actionFk`))) join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `st`.`workerFk`))) join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) where ((`st`.`created` > (now() + interval -(1) hour)) and isnull(`prevPrepSales`.`saleFk`) and (not((`d`.`name` like 'EQUIPO%')))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80825,7 +81085,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPreviousPreparated` AS select `st`.`saleFk` AS `saleFk` from (`saleTracking` `st` join `state` `e` on((`e`.`id` = `st`.`stateFk`))) where ((`st`.`created` > util.VN_CURDATE()) and (`e`.`code` like 'PREVIOUS_PREPARATION')) */;
+/*!50001 VIEW `salesPreviousPreparated` AS select `st`.`saleFk` AS `saleFk` from (`saleTracking` `st` join `state` `e` on((`e`.`id` = `st`.`stateFk`))) where ((`st`.`created` > curdate()) and (`e`.`code` like 'PREVIOUS_PREPARATION')) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80901,7 +81161,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketLastUpdatedList` AS select `s`.`ticketFk` AS `ticketFk`,`st`.`created` AS `created` from (`vn`.`saleTracking` `st` join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) where (`st`.`created` > util.VN_CURDATE()) union all select `i`.`Id_Ticket` AS `Id_Ticket`,`i`.`odbc_date` AS `odbc_date` from `vncontrol`.`inter` `i` where (`i`.`odbc_date` > util.VN_CURDATE()) union all select `s`.`ticketFk` AS `ticketFk`,`iss`.`created` AS `created` from (`vn`.`itemShelvingSale` `iss` join `vn`.`sale` `s` on((`s`.`id` = `iss`.`saleFk`))) where (`iss`.`created` > util.VN_CURDATE()) */;
+/*!50001 VIEW `ticketLastUpdatedList` AS select `s`.`ticketFk` AS `ticketFk`,`st`.`created` AS `created` from (`vn`.`saleTracking` `st` join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) where (`st`.`created` > curdate()) union all select `i`.`Id_Ticket` AS `Id_Ticket`,`i`.`odbc_date` AS `odbc_date` from `vncontrol`.`inter` `i` where (`i`.`odbc_date` > curdate()) union all select `s`.`ticketFk` AS `ticketFk`,`iss`.`created` AS `created` from (`vn`.`itemShelvingSale` `iss` join `vn`.`sale` `s` on((`s`.`id` = `iss`.`saleFk`))) where (`iss`.`created` > curdate()) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80996,7 +81256,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketPreviousPreparingList` AS select `s`.`ticketFk` AS `ticketFk`,`w`.`code` AS `code`,count(`s`.`id`) AS `saleLines`,sum((`s`.`isPicked` <> 0)) AS `alreadyMadeSaleLines`,(sum((`s`.`isPicked` <> 0)) / count(`s`.`id`)) AS `madeRate`,`sg`.`created` AS `created`,`p`.`code` AS `parking`,`iss`.`sectorFk` AS `sectorFk`,`al`.`code` AS `alertCode` from (((((((`vn`.`saleGroup` `sg` join `vn`.`saleGroupDetail` `sgd` on((`sgd`.`saleGroupFk` = `sg`.`id`))) join `vn`.`sale` `s` on((`s`.`id` = `sgd`.`saleFk`))) join `vn`.`ticketState` `tls` on((`tls`.`ticketFk` = `s`.`ticketFk`))) join `vn`.`alertLevel` `al` on((`al`.`id` = `tls`.`alertLevel`))) join `vn`.`worker` `w` on((`w`.`id` = `sg`.`userFk`))) left join `vn`.`parking` `p` on((`p`.`id` = `sg`.`parkingFk`))) join `vn`.`itemShelvingStock` `iss` on((`iss`.`itemFk` = `s`.`itemFk`))) where (`sg`.`created` >= (util.VN_CURDATE() + interval 0.1 day)) group by `sg`.`id` */;
+/*!50001 VIEW `ticketPreviousPreparingList` AS select `s`.`ticketFk` AS `ticketFk`,`w`.`code` AS `code`,count(`s`.`id`) AS `saleLines`,sum((`s`.`isPicked` <> 0)) AS `alreadyMadeSaleLines`,(sum((`s`.`isPicked` <> 0)) / count(`s`.`id`)) AS `madeRate`,`sg`.`created` AS `created`,`p`.`code` AS `parking`,`iss`.`sectorFk` AS `sectorFk`,`al`.`code` AS `alertCode` from (((((((`vn`.`saleGroup` `sg` join `vn`.`saleGroupDetail` `sgd` on((`sgd`.`saleGroupFk` = `sg`.`id`))) join `vn`.`sale` `s` on((`s`.`id` = `sgd`.`saleFk`))) join `vn`.`ticketState` `tls` on((`tls`.`ticketFk` = `s`.`ticketFk`))) join `vn`.`alertLevel` `al` on((`al`.`id` = `tls`.`alertLevel`))) join `vn`.`worker` `w` on((`w`.`id` = `sg`.`userFk`))) left join `vn`.`parking` `p` on((`p`.`id` = `sg`.`parkingFk`))) join `vn`.`itemShelvingStock` `iss` on((`iss`.`itemFk` = `s`.`itemFk`))) where (`sg`.`created` >= (curdate() + interval 0.1 day)) group by `sg`.`id` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81034,7 +81294,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`vn`.`ticketState` `ts` join `vn`.`ticket` `t` on((`t`.`id` = `ts`.`ticket`))) where (`t`.`shipped` between util.VN_CURDATE() and `MIDNIGHT`(util.VN_CURDATE())) */;
+/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`vn`.`ticketState` `ts` join `vn`.`ticket` `t` on((`t`.`id` = `ts`.`ticket`))) where (`t`.`shipped` between curdate() and `MIDNIGHT`(curdate())) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81072,7 +81332,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `tr2` AS select `travel`.`id` AS `id`,`travel`.`shipped` AS `shipped`,`travel`.`shipmentHour` AS `shipmentHour`,`travel`.`landed` AS `landed`,`travel`.`landingHour` AS `landingHour`,`travel`.`warehouseInFk` AS `warehouseInFk`,`travel`.`warehouseOutFk` AS `warehouseOutFk`,`travel`.`agencyFk` AS `agencyFk`,`travel`.`ref` AS `ref`,`travel`.`isDelivered` AS `isDelivered`,`travel`.`isReceived` AS `isReceived`,`travel`.`m3` AS `m3`,`travel`.`kg` AS `kg`,`travel`.`cargoSupplierFk` AS `cargoSupplierFk`,`travel`.`totalEntries` AS `totalEntries` from `travel` */;
+/*!50001 VIEW `tr2` AS select `travel`.`id` AS `id`,`travel`.`shipped` AS `shipped`,`travel`.`shipmentHour` AS `shipmentHour`,`travel`.`landed` AS `landed`,`travel`.`landingHour` AS `landingHour`,`travel`.`warehouseInFk` AS `warehouseInFk`,`travel`.`warehouseOutFk` AS `warehouseOutFk`,`travel`.`agencyModeFk` AS `agencyFk`,`travel`.`ref` AS `ref`,`travel`.`isDelivered` AS `isDelivered`,`travel`.`isReceived` AS `isReceived`,`travel`.`m3` AS `m3`,`travel`.`kg` AS `kg`,`travel`.`cargoSupplierFk` AS `cargoSupplierFk`,`travel`.`totalEntries` AS `totalEntries` from `travel` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81148,7 +81408,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerBusinessDated` AS select `t`.`dated` AS `dated`,`b`.`business_id` AS `business_id`,`w`.`id` AS `workerFk` from ((((`vn`.`time` `t` left join `postgresql`.`business` `b` on((`t`.`dated` between `b`.`date_start` and ifnull(`b`.`date_end`,util.VN_CURDATE())))) left join `postgresql`.`profile` `pr` on((`b`.`client_id` = `pr`.`profile_id`))) left join `postgresql`.`person` `p` on((`pr`.`person_id` = `p`.`person_id`))) left join `vn`.`worker` `w` on((`p`.`id_trabajador` = `w`.`id`))) where (`t`.`dated` > (util.VN_CURDATE() + interval -(2) year)) */;
+/*!50001 VIEW `workerBusinessDated` AS select `t`.`dated` AS `dated`,`b`.`business_id` AS `business_id`,`pr`.`workerFk` AS `workerFk` from ((`vn`.`time` `t` left join `postgresql`.`business` `b` on((`t`.`dated` between `b`.`date_start` and ifnull(`b`.`date_end`,curdate())))) left join `postgresql`.`profile` `pr` on((`b`.`client_id` = `pr`.`profile_id`))) where (`t`.`dated` > (curdate() + interval -(2) year)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81167,7 +81427,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerCalendar` AS select `ce`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`ce`.`calendar_state_id` AS `absenceTypeFk`,`ce`.`date` AS `dated` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`calendar_employee` `ce` on((`ce`.`business_id` = `b`.`business_id`))) */;
+/*!50001 VIEW `workerCalendar` AS select `ce`.`business_id` AS `businessFk`,`pr`.`workerFk` AS `workerFk`,`ce`.`calendar_state_id` AS `absenceTypeFk`,`ce`.`date` AS `dated` from ((`postgresql`.`profile` `pr` join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`calendar_employee` `ce` on((`ce`.`business_id` = `b`.`business_id`))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81186,26 +81446,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerDepartment` AS select `p`.`id_trabajador` AS `workerFk`,`d`.`id` AS `departmentFk` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) left join (`postgresql`.`business` `b` left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) on((`pr`.`profile_id` = `b`.`client_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) where ((isnull(`b`.`date_end`) and (`b`.`date_start` <= util.VN_CURDATE())) or ((`b`.`date_end` >= util.VN_CURDATE()) and (`b`.`date_start` <= util.VN_CURDATE()))) */;
-/*!50001 SET character_set_client = @saved_cs_client */;
-/*!50001 SET character_set_results = @saved_cs_results */;
-/*!50001 SET collation_connection = @saved_col_connection */;
-
---
--- Final view structure for view `workerDepartmentTest`
---
-
-/*!50001 DROP TABLE IF EXISTS `workerDepartmentTest`*/;
-/*!50001 DROP VIEW IF EXISTS `workerDepartmentTest`*/;
-/*!50001 SET @saved_cs_client = @@character_set_client */;
-/*!50001 SET @saved_cs_results = @@character_set_results */;
-/*!50001 SET @saved_col_connection = @@collation_connection */;
-/*!50001 SET character_set_client = utf8mb4 */;
-/*!50001 SET character_set_results = utf8mb4 */;
-/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerDepartmentTest` AS select `p`.`workerFk` AS `workerFk`,`d`.`id` AS `departmentFk` from ((((`vn`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) where (util.VN_CURDATE() between `b`.`date_start` and ifnull(`b`.`date_end`,util.VN_CURDATE())) */;
+/*!50001 VIEW `workerDepartment` AS select `pr`.`workerFk` AS `workerFk`,`bl`.`department_id` AS `departmentFk` from (`postgresql`.`profile` `pr` left join (`postgresql`.`business` `b` left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) on((`pr`.`profile_id` = `b`.`client_id`))) where ((isnull(`b`.`date_end`) and (`b`.`date_start` <= curdate())) or ((`b`.`date_end` >= curdate()) and (`b`.`date_start` <= curdate()))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81224,7 +81465,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerLabour` AS select `b`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`bl`.`workcenter_id` AS `workCenterFk`,`b`.`date_start` AS `started`,`b`.`date_end` AS `ended`,`d`.`id` AS `departmentFk`,`b`.`payedHolidays` AS `payedHolidays` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) order by `b`.`date_start` desc */;
+/*!50001 VIEW `workerLabour` AS select `b`.`business_id` AS `businessFk`,`pr`.`workerFk` AS `workerFk`,`bl`.`workcenter_id` AS `workCenterFk`,`b`.`date_start` AS `started`,`b`.`date_end` AS `ended`,`d`.`id` AS `departmentFk`,`b`.`payedHolidays` AS `payedHolidays` from (((`postgresql`.`profile` `pr` join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) order by `b`.`date_start` desc */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81243,7 +81484,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on((`po`.`person_id` = `p`.`person_id`))) join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil empresa') */;
+/*!50001 VIEW `workerMedia` AS select `po`.`workerFk` AS `workerFk`,`m`.`value` AS `mediaValue` from (((`postgresql`.`profile` `po` join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil empresa') */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81262,7 +81503,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerSpeedExpedition` AS select `sv`.`ticketFk` AS `ticketFk`,sum(`sv`.`litros`) AS `litros`,sum(if((`sub`.`started` > (util.VN_NOW() + interval -(1) hour)),`sv`.`litros`,0)) AS `literLastHour`,cast(((60 * sum(`sv`.`litros`)) / time_to_sec(timediff(max(`sub`.`finished`),min(`sub`.`started`)))) as decimal(10,1)) AS `litersByMinute`,`sub`.`code` AS `workerCode`,`sub`.`cajas` AS `cajas`,`sub`.`warehouseFk` AS `warehouseFk` from (`saleVolume` `sv` join `expeditionTimeExpended` `sub` on((`sub`.`ticketFk` = `sv`.`ticketFk`))) group by `workerCode` */;
+/*!50001 VIEW `workerSpeedExpedition` AS select `sv`.`ticketFk` AS `ticketFk`,sum(`sv`.`litros`) AS `litros`,sum(if((`sub`.`started` > (now() + interval -(1) hour)),`sv`.`litros`,0)) AS `literLastHour`,cast(((60 * sum(`sv`.`litros`)) / time_to_sec(timediff(max(`sub`.`finished`),min(`sub`.`started`)))) as decimal(10,1)) AS `litersByMinute`,`sub`.`code` AS `workerCode`,`sub`.`cajas` AS `cajas`,`sub`.`warehouseFk` AS `warehouseFk` from (`saleVolume` `sv` join `expeditionTimeExpended` `sub` on((`sub`.`ticketFk` = `sv`.`ticketFk`))) group by `workerCode` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81281,7 +81522,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerSpeedSaleTracking` AS select `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`,`salesPreparedLastHour`.`accion` AS `accion`,`salesPreparedLastHour`.`workerCode` AS `workerCode`,sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`,min(`salesPreparedLastHour`.`created`) AS `started`,max(`salesPreparedLastHour`.`created`) AS `finished`,sum(if((`salesPreparedLastHour`.`created` >= (util.VN_NOW() + interval -(1) hour)),`salesPreparedLastHour`.`litros`,0)) AS `sumaLitrosLastHour`,cast(((60 * sum(`salesPreparedLastHour`.`litros`)) / time_to_sec(timediff(max(`salesPreparedLastHour`.`created`),min(`salesPreparedLastHour`.`created`)))) as decimal(10,1)) AS `litersByMinute`,`salesPreparedLastHour`.`departmentName` AS `departmentName` from `vn`.`salesPreparedLastHour` group by `salesPreparedLastHour`.`warehouseFk`,`salesPreparedLastHour`.`accion`,`salesPreparedLastHour`.`workerCode` */;
+/*!50001 VIEW `workerSpeedSaleTracking` AS select `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`,`salesPreparedLastHour`.`accion` AS `accion`,`salesPreparedLastHour`.`workerCode` AS `workerCode`,sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`,min(`salesPreparedLastHour`.`created`) AS `started`,max(`salesPreparedLastHour`.`created`) AS `finished`,sum(if((`salesPreparedLastHour`.`created` >= (now() + interval -(1) hour)),`salesPreparedLastHour`.`litros`,0)) AS `sumaLitrosLastHour`,cast(((60 * sum(`salesPreparedLastHour`.`litros`)) / time_to_sec(timediff(max(`salesPreparedLastHour`.`created`),min(`salesPreparedLastHour`.`created`)))) as decimal(10,1)) AS `litersByMinute`,`salesPreparedLastHour`.`departmentName` AS `departmentName` from `vn`.`salesPreparedLastHour` group by `salesPreparedLastHour`.`warehouseFk`,`salesPreparedLastHour`.`accion`,`salesPreparedLastHour`.`workerCode` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81338,7 +81579,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeControlWorking` AS select `wtc`.`userFk` AS `userFk`,`wtc`.`timed` AS `timed`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`pm`.`mediaValue` AS `phone`,`wm`.`mediaValue` AS `workerPhone`,`d`.`name` AS `department`,`wc`.`name` AS `workerCenter`,count(`wtc`.`order`) AS `maxOrder` from (((((((`vn`.`workerTimeControl` `wtc` join `vn`.`worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) left join `vn`.`personMedia` `pm` on((`pm`.`workerFk` = `w`.`id`))) left join `vn`.`workerMedia` `wm` on((`wm`.`workerFk` = `w`.`id`))) left join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `w`.`id`))) left join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) left join `vn`.`workerLabour` `wl` on((`wl`.`businessFk` = (select `wl2`.`businessFk` from `vn`.`workerLabour` `wl2` where (`wl2`.`workerFk` = `w`.`id`) order by `wl2`.`started` desc limit 1)))) left join `vn`.`workCenter` `wc` on((`wc`.`id` = `wl`.`workCenterFk`))) where (cast(`wtc`.`timed` as date) = util.VN_CURDATE()) group by `wtc`.`userFk` having ((`maxOrder` % 2) = 1) order by `wtc`.`timed` desc */;
+/*!50001 VIEW `workerTimeControlWorking` AS select `wtc`.`userFk` AS `userFk`,`wtc`.`timed` AS `timed`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`pm`.`mediaValue` AS `phone`,`wm`.`mediaValue` AS `workerPhone`,`d`.`name` AS `department`,`wc`.`name` AS `workerCenter`,count(`wtc`.`order`) AS `maxOrder` from (((((((`vn`.`workerTimeControl` `wtc` join `vn`.`worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) left join `vn`.`personMedia` `pm` on((`pm`.`workerFk` = `w`.`id`))) left join `vn`.`workerMedia` `wm` on((`wm`.`workerFk` = `w`.`id`))) left join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `w`.`id`))) left join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) left join `vn`.`workerLabour` `wl` on((`wl`.`businessFk` = (select `wl2`.`businessFk` from `vn`.`workerLabour` `wl2` where (`wl2`.`workerFk` = `w`.`id`) order by `wl2`.`started` desc limit 1)))) left join `vn`.`workCenter` `wc` on((`wc`.`id` = `wl`.`workCenterFk`))) where (cast(`wtc`.`timed` as date) = curdate()) group by `wtc`.`userFk` having ((`maxOrder` % 2) = 1) order by `wtc`.`timed` desc */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81376,7 +81617,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerWithoutTractor` AS select `c`.`workerFk` AS `workerFk`,`cl`.`name` AS `Trabajador`,count(distinct `c`.`id`) AS `Colecciones`,max(`c`.`created`) AS `created` from ((`collection` `c` join `client` `cl` on((`cl`.`id` = `c`.`workerFk`))) left join `machineWorker` `mw` on(((`mw`.`workerFk` = `c`.`workerFk`) and (`mw`.`inTimed` > util.VN_CURDATE())))) where ((`c`.`created` > util.VN_CURDATE()) and isnull(`mw`.`workerFk`)) group by `c`.`workerFk` */;
+/*!50001 VIEW `workerWithoutTractor` AS select `c`.`workerFk` AS `workerFk`,`cl`.`name` AS `Trabajador`,count(distinct `c`.`id`) AS `Colecciones`,max(`c`.`created`) AS `created` from ((`collection` `c` join `client` `cl` on((`cl`.`id` = `c`.`workerFk`))) left join `machineWorker` `mw` on(((`mw`.`workerFk` = `c`.`workerFk`) and (`mw`.`inTimed` > curdate())))) where ((`c`.`created` > curdate()) and isnull(`mw`.`workerFk`)) group by `c`.`workerFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81395,7 +81636,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,cast((util.VN_CURDATE() + interval ((hour(ifnull(`zc`.`hour`,`z`.`hour`)) * 60) + minute(ifnull(`zc`.`hour`,`z`.`hour`))) minute) as time) AS `hourTheoretical`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `totalVolume`,cast(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0)) as decimal(5,1)) AS `remainingVolume`,greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) AS `speed`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `hourEffective`,floor(((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)))) AS `minutesLess`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `etc` from (((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `s` on((`s`.`id` = `tst`.`state`))) join `vn`.`saleVolume` `sv` on((`sv`.`ticketFk` = `t`.`id`))) left join `vn`.`lastHourProduction` `lhp` on((`lhp`.`warehouseFk` = `t`.`warehouseFk`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`warehouseAlias` `wa` on((`wa`.`id` = `w`.`aliasFk`))) join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`zoneClosure` `zc` on(((`zc`.`zoneFk` = `t`.`zoneFk`) and (`zc`.`dated` = util.VN_CURDATE())))) left join `cache`.`departure_limit` `dl` on(((`dl`.`warehouse_id` = `t`.`warehouseFk`) and (`dl`.`fecha` = util.VN_CURDATE())))) where (`w`.`hasProduction` and (cast(`t`.`shipped` as date) = util.VN_CURDATE())) group by `t`.`zoneFk` */;
+/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,cast((curdate() + interval ((hour(ifnull(`zc`.`hour`,`z`.`hour`)) * 60) + minute(ifnull(`zc`.`hour`,`z`.`hour`))) minute) as time) AS `hourTheoretical`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `totalVolume`,cast(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0)) as decimal(5,1)) AS `remainingVolume`,greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) AS `speed`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `hourEffective`,floor(((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)))) AS `minutesLess`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `etc` from (((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `s` on((`s`.`id` = `tst`.`state`))) join `vn`.`saleVolume` `sv` on((`sv`.`ticketFk` = `t`.`id`))) left join `vn`.`lastHourProduction` `lhp` on((`lhp`.`warehouseFk` = `t`.`warehouseFk`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`warehouseAlias` `wa` on((`wa`.`id` = `w`.`aliasFk`))) join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`zoneClosure` `zc` on(((`zc`.`zoneFk` = `t`.`zoneFk`) and (`zc`.`dated` = curdate())))) left join `cache`.`departure_limit` `dl` on(((`dl`.`warehouse_id` = `t`.`warehouseFk`) and (`dl`.`fecha` = curdate())))) where (`w`.`hasProduction` and (cast(`t`.`shipped` as date) = curdate())) group by `t`.`zoneFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81415,4 +81656,4 @@ USE `vncontrol`;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-06-23 12:12:10
+-- Dump completed on 2022-08-03 9:39:55
diff --git a/e2e/paths/12-entry/02_descriptor.spec.js b/e2e/paths/12-entry/02_descriptor.spec.js
index 699d00517..997a6065c 100644
--- a/e2e/paths/12-entry/02_descriptor.spec.js
+++ b/e2e/paths/12-entry/02_descriptor.spec.js
@@ -29,7 +29,7 @@ describe('Entry descriptor path', () => {
it('should click the travels button to be redirected to the travels index filtered by the current agency', async() => {
await page.waitToClick(selectors.entryDescriptor.travelsQuicklink);
await page.expectURL('/travel/index');
- await page.expectURL('agencyFk');
+ await page.expectURL('agencyModeFk');
});
it('should go back to the entry summary', async() => {
diff --git a/front/core/components/smart-table/index.html b/front/core/components/smart-table/index.html
index a3295c47e..f26a6b4a2 100644
--- a/front/core/components/smart-table/index.html
+++ b/front/core/components/smart-table/index.html
@@ -10,9 +10,9 @@
-
- {{model.data.length}}
-
results
+
+ {{model.data.length}}
+ results
Shown columns
-
@@ -101,4 +102,4 @@
-
\ No newline at end of file
+
diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js
index 401541c2c..9e6e7009c 100644
--- a/front/core/components/smart-table/index.js
+++ b/front/core/components/smart-table/index.js
@@ -511,6 +511,12 @@ export default class SmartTable extends Component {
return this.model.save()
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
}
+
+ refresh() {
+ this.isRefreshing = true;
+ this.model.refresh()
+ .then(() => this.isRefreshing = false);
+ }
}
SmartTable.$inject = ['$element', '$scope', '$transclude'];
diff --git a/front/module-import.js b/front/module-import.js
index ab1eb73d6..bc547deeb 100755
--- a/front/module-import.js
+++ b/front/module-import.js
@@ -21,6 +21,7 @@ export default function moduleImport(moduleName) {
case 'entry' : return import('entry/front');
case 'account' : return import('account/front');
case 'supplier' : return import('supplier/front');
+ case 'shelving' : return import('shelving/front');
case 'monitor' : return import('monitor/front');
}
}
diff --git a/jest-front.js b/jest-front.js
index 7a692f57c..6d7532260 100644
--- a/jest-front.js
+++ b/jest-front.js
@@ -13,6 +13,7 @@ import './modules/route/front/module.js';
import './modules/ticket/front/module.js';
import './modules/travel/front/module.js';
import './modules/worker/front/module.js';
+import './modules/shelving/front/module.js';
core.run(vnInterceptor => {
vnInterceptor.setApiPath(null);
diff --git a/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js b/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
index e2f842a15..1c4d53266 100644
--- a/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
+++ b/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
@@ -24,6 +24,6 @@ describe('Model rewriteDbError()', () => {
error = e;
}
- expect(error.message).toEqual(`The tag can't be repeated`);
+ expect(error.message).toEqual(`The tag or priority can't be repeated for an item`);
});
});
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 38ac2d86c..07a00024a 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -44,7 +44,7 @@
"is not a valid date": "No es una fecha valida",
"Barcode must be unique": "El código de barras debe ser único",
"The warehouse can't be repeated": "El almacén no puede repetirse",
- "The tag can't be repeated": "El tag no puede repetirse",
+ "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
"The observation type can't be repeated": "El tipo de observación no puede repetirse",
"A claim with that sale already exists": "Ya existe una reclamación para esta línea",
"You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
diff --git a/modules/account/back/models/role-config.js b/modules/account/back/models/role-config.js
index 6051f2060..ba7bf9d52 100644
--- a/modules/account/back/models/role-config.js
+++ b/modules/account/back/models/role-config.js
@@ -56,6 +56,12 @@ module.exports = Self => {
if (!userExists) {
await Self.rawSql('CREATE USER ?@? IDENTIFIED BY ?',
[mysqlUser, this.userHost, password]);
+ await Self.rawSql(
+ `UPDATE mysql.global_priv
+ SET Priv = JSON_SET(Priv, '$.autogenerated' , TRUE)
+ WHERE User = ? AND Host = ?`,
+ [mysqlUser, this.userHost]
+ );
userExists = true;
} else {
switch (this.dbType) {
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 059764ae2..35e788290 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -2,36 +2,36 @@
url="ClaimEnds/filter"
link="{claimFk: $ctrl.$params.id}"
data="$ctrl.salesClaimed"
- auto-load="true"
+ auto-load="true"
on-save="$ctrl.onSave()">
-
-
-
-
@@ -80,13 +92,13 @@
ng-repeat="saleClaimed in $ctrl.salesClaimed"
vn-repeat-last on-last="$ctrl.focusLastInput()">
-
-
{{::saleClaimed.itemFk | zeroFill:6}}
@@ -94,7 +106,7 @@
{{::saleClaimed.ticketFk}}
@@ -129,7 +141,7 @@
-
@@ -140,17 +152,17 @@
vn-id="item-descriptor"
warehouse-fk="$ctrl.vnConfig.warehouseFk">
-
-
-
+
@@ -173,4 +185,4 @@
Save
-
\ No newline at end of file
+
diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html
index d522763a1..eec8cd727 100644
--- a/modules/claim/front/search-panel/index.html
+++ b/modules/claim/front/search-panel/index.html
@@ -28,7 +28,7 @@
url="Workers/activeWithRole"
search-function="{firstName: $search}"
value-field="id"
- where="{role: {inq: ['salesBoss', 'salesPerson', 'officeBoss']}}"
+ where="{role: {inq: ['salesTeamBoss', 'salesPerson', 'officeBoss']}}"
label="Salesperson">
{{firstName}} {{name}}
@@ -38,7 +38,7 @@
url="Workers/activeWithRole"
search-function="{firstName: $search}"
value-field="id"
- where="{role: {inq: ['salesBoss', 'salesPerson']}}"
+ where="{role: {inq: ['salesTeamBoss', 'salesPerson']}}"
label="Attended by">
{{firstName}} {{name}}
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index 33a237ad7..410681930 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -16,7 +16,7 @@
@@ -39,7 +39,7 @@
ng-model="$ctrl.client.iban"
rule
on-change="$ctrl.autofillBic()"
- vn-acl="salesAssistant">
+ vn-acl="salesAssistant, hr">
{{bic}} {{name}}
@@ -61,7 +61,7 @@
icon="add_circle"
vn-click-stop="bankEntity.show({countryFk: $ctrl.client.countryFk})"
vn-tooltip="New bank entity"
- vn-acl="salesAssistant">
+ vn-acl="salesAssistant, hr">
@@ -71,19 +71,19 @@
vn-one
label="Received LCR"
ng-model="$ctrl.client.hasLcr"
- vn-acl="salesAssistant">
+ vn-acl="salesAssistant, hr">
+ vn-acl="salesAssistant, hr">
+ vn-acl="salesAssistant, hr">
diff --git a/modules/client/front/notification/index.js b/modules/client/front/notification/index.js
index 0506ea4ba..336005783 100644
--- a/modules/client/front/notification/index.js
+++ b/modules/client/front/notification/index.js
@@ -108,6 +108,7 @@ export default class Controller extends Section {
case 'fi':
case 'postcode':
case 'salesPersonFk':
+ case 'provinceFk':
return {[param]: value};
}
}
diff --git a/modules/client/front/routes.json b/modules/client/front/routes.json
index b395b102a..c7462e46c 100644
--- a/modules/client/front/routes.json
+++ b/modules/client/front/routes.json
@@ -37,7 +37,7 @@
{"state": "client.card.unpaid", "icon": "icon-defaulter"}
]
}
- ]
+ ]
},
"keybindings": [
{"key": "c", "state": "client.index"}
diff --git a/modules/entry/back/methods/entry/getEntry.js b/modules/entry/back/methods/entry/getEntry.js
index 66238d0dc..cac3c65f8 100644
--- a/modules/entry/back/methods/entry/getEntry.js
+++ b/modules/entry/back/methods/entry/getEntry.js
@@ -43,7 +43,7 @@ module.exports = Self => {
'name',
'shipped',
'landed',
- 'agencyFk',
+ 'agencyModeFk',
'warehouseOutFk',
'warehouseInFk',
'isReceived',
diff --git a/modules/entry/back/methods/entry/importBuysPreview.js b/modules/entry/back/methods/entry/importBuysPreview.js
index 5b88b587c..730ecab0a 100644
--- a/modules/entry/back/methods/entry/importBuysPreview.js
+++ b/modules/entry/back/methods/entry/importBuysPreview.js
@@ -20,7 +20,7 @@ module.exports = Self => {
},
http: {
path: `/:id/importBuysPreview`,
- verb: 'GET'
+ verb: 'POST'
}
});
diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index 9a21d4472..00f72ea14 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -148,6 +148,8 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`CALL cache.visible_refresh(@calc_id, FALSE, ?)`, [warehouse.id]);
stmts.push(stmt);
+ const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
+
const date = new Date();
date.setHours(0, 0, 0, 0);
stmt = new ParameterizedSQL(`
@@ -201,7 +203,7 @@ module.exports = Self => {
LEFT JOIN cache.visible v ON v.item_id = lb.item_id
AND v.calc_id = @calc_id
JOIN item i ON i.id = lb.item_id
- JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = it.warehouseFk
+ JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = ?
JOIN buy b ON b.id = lb.buy_id
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
LEFT JOIN itemType t ON t.id = i.typeFk
@@ -209,7 +211,7 @@ module.exports = Self => {
LEFT JOIN origin ori ON ori.id = i.originFk
LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR)
LEFT JOIN supplier s ON s.id = e.supplierFk`
- , [date]);
+ , [userConfig.warehouseFk, date]);
if (ctx.args.tags) {
let i = 1;
diff --git a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
index 2413c18f6..8e1921a0e 100644
--- a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
+++ b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
@@ -9,7 +9,8 @@ describe('Buy editLatestsBuys()', () => {
const ctx = {
args: {
search: 'Ranged weapon longbow 2m'
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const [original] = await models.Buy.latestBuysFilter(ctx, null, options);
@@ -40,7 +41,8 @@ describe('Buy editLatestsBuys()', () => {
const ctx = {
args: {
filter: filter
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const field = 'size';
diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
index 7c813ea89..9b1e60532 100644
--- a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
+++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
@@ -9,7 +9,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
search: 'Ranged weapon longbow 2m'
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -33,7 +34,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
id: 1
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -57,7 +59,8 @@ describe('Entry latests buys filter()', () => {
tags: [
{tagFk: 27, value: '2m'}
]
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -79,7 +82,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
categoryFk: 1
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -101,7 +105,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
typeFk: 2
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -123,7 +128,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
active: true
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -145,7 +151,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
active: false
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -167,7 +174,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
visible: true
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -189,7 +197,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
visible: false
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -211,7 +220,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
floramondo: true
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -233,7 +243,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
floramondo: false
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -255,7 +266,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
salesPersonFk: 35
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -277,7 +289,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
description: 'Increases block'
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -299,7 +312,8 @@ describe('Entry latests buys filter()', () => {
const ctx = {
args: {
supplierFk: 1
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -328,7 +342,8 @@ describe('Entry latests buys filter()', () => {
args: {
from: from,
to: to
- }
+ },
+ req: {accessToken: {userId: 1}}
};
const results = await models.Buy.latestBuysFilter(ctx, options);
diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
index 8787853a5..423e9d70d 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -137,7 +137,7 @@
diff --git a/modules/entry/front/basic-data/index.js b/modules/entry/front/basic-data/index.js
index 80870c3f3..564a3df5c 100644
--- a/modules/entry/front/basic-data/index.js
+++ b/modules/entry/front/basic-data/index.js
@@ -46,7 +46,7 @@ class Controller extends Section {
if (!value) continue;
switch (key) {
- case 'agencyFk':
+ case 'agencyModeFk':
case 'warehouseInFk':
case 'warehouseOutFk':
case 'shipped':
diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js
index a2a28ef69..ba0a98e62 100644
--- a/modules/entry/front/buy/import/index.js
+++ b/modules/entry/front/buy/import/index.js
@@ -58,7 +58,7 @@ class Controller extends Section {
fetchBuys(buys) {
const params = {buys};
const query = `Entries/${this.$params.id}/importBuysPreview`;
- this.$http.get(query, {params}).then(res => {
+ this.$http.post(query, params).then(res => {
this.import.buys = res.data;
});
}
diff --git a/modules/entry/front/buy/import/index.spec.js b/modules/entry/front/buy/import/index.spec.js
index bf100dc83..036f52074 100644
--- a/modules/entry/front/buy/import/index.spec.js
+++ b/modules/entry/front/buy/import/index.spec.js
@@ -111,9 +111,8 @@ describe('Entry', () => {
'volume': 1125}
];
- const serializedParams = $httpParamSerializer({buys});
- const query = `Entries/1/importBuysPreview?${serializedParams}`;
- $httpBackend.expectGET(query).respond(200, buys);
+ const query = `Entries/1/importBuysPreview`;
+ $httpBackend.expectPOST(query).respond(200, buys);
controller.fetchBuys(buys);
$httpBackend.flush();
diff --git a/modules/entry/front/card/index.js b/modules/entry/front/card/index.js
index eafed171b..96f4702e2 100644
--- a/modules/entry/front/card/index.js
+++ b/modules/entry/front/card/index.js
@@ -14,7 +14,7 @@ class Controller extends ModuleCard {
{
relation: 'travel',
scope: {
- fields: ['id', 'landed', 'agencyFk', 'warehouseOutFk'],
+ fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
include: [
{
relation: 'agency',
diff --git a/modules/entry/front/descriptor/index.js b/modules/entry/front/descriptor/index.js
index fed3787d4..34aa162f9 100644
--- a/modules/entry/front/descriptor/index.js
+++ b/modules/entry/front/descriptor/index.js
@@ -14,9 +14,9 @@ class Controller extends Descriptor {
let travelFilter;
const entryTravel = this.entry && this.entry.travel;
- if (entryTravel && entryTravel.agencyFk) {
+ if (entryTravel && entryTravel.agencyModeFk) {
travelFilter = this.entry && JSON.stringify({
- agencyFk: entryTravel.agencyFk
+ agencyModeFk: entryTravel.agencyModeFk
});
}
return travelFilter;
@@ -49,7 +49,7 @@ class Controller extends Descriptor {
{
relation: 'travel',
scope: {
- fields: ['id', 'landed', 'agencyFk', 'warehouseOutFk'],
+ fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
include: [
{
relation: 'agency',
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index 3dd9a4be5..ffd8aafab 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -123,12 +123,12 @@
{{::line.weight}}
- {{::line.packing | dashIfEmpty}}
+ {{::line.packing | dashIfEmpty}}
- {{::line.grouping | dashIfEmpty}}
+ {{::line.grouping | dashIfEmpty}}
{{::line.buyingValue | currency: 'EUR':2}}
diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index 5755de69b..8b2a014e6 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -86,6 +86,7 @@ module.exports = Self => {
Self.filter = async(ctx, filter, options) => {
const conn = Self.dataSource.connector;
+ const models = Self.app.models;
const myOptions = {};
if (typeof options == 'object')
@@ -140,6 +141,8 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
+ const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
+
const stmts = [];
const stmt = new ParameterizedSQL(
`SELECT
@@ -179,11 +182,11 @@ module.exports = Self => {
LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
LEFT JOIN producer pr ON pr.id = i.producerFk
LEFT JOIN origin ori ON ori.id = i.originFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = it.warehouseFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = ?
LEFT JOIN buy b ON b.id = lb.buy_id
LEFT JOIN entry e ON e.id = b.entryFk
LEFT JOIN supplier s ON s.id = e.supplierFk`
- );
+ , [userConfig.warehouseFk]);
if (ctx.args.tags) {
let i = 1;
diff --git a/modules/item/back/methods/item/getCard.js b/modules/item/back/methods/item/getCard.js
index 8bb88fc86..c4ee09d95 100644
--- a/modules/item/back/methods/item/getCard.js
+++ b/modules/item/back/methods/item/getCard.js
@@ -30,7 +30,7 @@ module.exports = Self => {
{
relation: 'itemType',
scope: {
- fields: ['id', 'name', 'workerFk', 'warehouseFk'],
+ fields: ['id', 'name', 'workerFk'],
include: [{
relation: 'worker',
scope: {
diff --git a/modules/item/back/methods/item/getSummary.js b/modules/item/back/methods/item/getSummary.js
index ffcfc806e..738976e60 100644
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@@ -34,7 +34,7 @@ module.exports = Self => {
include: [
{relation: 'itemType',
scope: {
- fields: ['id', 'name', 'workerFk', 'warehouseFk'],
+ fields: ['id', 'name', 'workerFk'],
include: [{
relation: 'worker',
scope: {
diff --git a/modules/item/back/methods/item/specs/filter.spec.js b/modules/item/back/methods/item/specs/filter.spec.js
index 6a173576d..14467d1d8 100644
--- a/modules/item/back/methods/item/specs/filter.spec.js
+++ b/modules/item/back/methods/item/specs/filter.spec.js
@@ -7,7 +7,7 @@ describe('item filter()', () => {
try {
const filter = {};
- const ctx = {args: {filter: filter, search: 1}};
+ const ctx = {args: {filter: filter, search: 1}, req: {accessToken: {userId: 1}}};
const result = await models.Item.filter(ctx, filter, options);
expect(result.length).toEqual(1);
@@ -26,7 +26,7 @@ describe('item filter()', () => {
try {
const filter = {};
- const ctx = {args: {filter: filter, search: 4444444444}};
+ const ctx = {args: {filter: filter, search: 4444444444}, req: {accessToken: {userId: 1}}};
const result = await models.Item.filter(ctx, filter, options);
expect(result.length).toEqual(1);
@@ -49,7 +49,7 @@ describe('item filter()', () => {
limit: 8
};
const tags = [{value: 'medical box', tagFk: 58}];
- const ctx = {args: {filter: filter, typeFk: 5, tags: tags}};
+ const ctx = {args: {filter: filter, typeFk: 5, tags: tags}, req: {accessToken: {userId: 1}}};
const result = await models.Item.filter(ctx, filter, options);
expect(result.length).toEqual(2);
@@ -67,7 +67,7 @@ describe('item filter()', () => {
try {
const filter = {};
- const ctx = {args: {filter: filter, isFloramondo: true}};
+ const ctx = {args: {filter: filter, isFloramondo: true}, req: {accessToken: {userId: 1}}};
const result = await models.Item.filter(ctx, filter, options);
expect(result.length).toEqual(3);
@@ -86,7 +86,7 @@ describe('item filter()', () => {
try {
const filter = {};
- const ctx = {args: {filter: filter, buyerFk: 16}};
+ const ctx = {args: {filter: filter, buyerFk: 16}, req: {accessToken: {userId: 1}}};
const result = await models.Item.filter(ctx, filter, options);
expect(result.length).toEqual(2);
@@ -106,7 +106,7 @@ describe('item filter()', () => {
try {
const filter = {};
- const ctx = {args: {filter: filter, supplierFk: 1}};
+ const ctx = {args: {filter: filter, supplierFk: 1}, req: {accessToken: {userId: 1}}};
const result = await models.Item.filter(ctx, filter, options);
expect(result.length).toEqual(2);
diff --git a/modules/item/back/models/item-tag.js b/modules/item/back/models/item-tag.js
index 891d11558..5b7163913 100644
--- a/modules/item/back/models/item-tag.js
+++ b/modules/item/back/models/item-tag.js
@@ -5,7 +5,7 @@ module.exports = Self => {
Self.rewriteDbError(function(err) {
if (err.code === 'ER_DUP_ENTRY')
- return new UserError(`The tag can't be repeated`);
+ return new UserError(`The tag or priority can't be repeated for an item`);
if (err.code === 'ER_BAD_NULL_ERROR')
return new UserError(`Tag value cannot be blank`);
return err;
diff --git a/modules/item/back/models/item-type.json b/modules/item/back/models/item-type.json
index 843d9877f..74cdf3fc8 100644
--- a/modules/item/back/models/item-type.json
+++ b/modules/item/back/models/item-type.json
@@ -34,11 +34,6 @@
"model": "Worker",
"foreignKey": "workerFk"
},
- "warehouse": {
- "type": "belongsTo",
- "model": "Warehouse",
- "foreignKey": "warehouseFk"
- },
"category": {
"type": "belongsTo",
"model": "ItemCategory",
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 29047c613..0348d4f66 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -70,12 +70,12 @@
{{entry.stickers | dashIfEmpty}}
- {{::entry.packing | dashIfEmpty}}
+ {{::entry.packing | dashIfEmpty}}
- {{::entry.grouping | dashIfEmpty}}
+ {{::entry.grouping | dashIfEmpty}}
{{::entry.stems | dashIfEmpty}}
diff --git a/modules/mdb/back/methods/mdbVersion/upload.js b/modules/mdb/back/methods/mdbVersion/upload.js
index 3d54c0250..57df35ce7 100644
--- a/modules/mdb/back/methods/mdbVersion/upload.js
+++ b/modules/mdb/back/methods/mdbVersion/upload.js
@@ -88,17 +88,19 @@ module.exports = Self => {
await fs.mkdir(branchPath, {recursive: true});
const destinationBranch = path.join(branchPath, `${appName}.7z`);
- const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+ const destinationRelative = `../../.archive/${appName}/${newVersion}.7z`;
try {
await fs.unlink(destinationBranch);
} catch (e) {}
- await fs.symlink(destinationFile, destinationBranch);
+ await fs.symlink(destinationRelative, destinationBranch);
if (branch == 'master') {
+ const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+ const rootRelative = `./.archive/${appName}/${newVersion}.7z`;
try {
await fs.unlink(destinationRoot);
} catch (e) {}
- await fs.symlink(destinationFile, destinationRoot);
+ await fs.symlink(rootRelative, destinationRoot);
}
}
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 9a7415055..ff642b088 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -164,6 +164,10 @@ module.exports = Self => {
let stmt;
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
+
+ stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
+ stmts.push(`SET SESSION optimizer_search_depth = 0`);
+
stmt = new ParameterizedSQL(
`CREATE TEMPORARY TABLE tmp.filter
(PRIMARY KEY (id))
@@ -207,7 +211,7 @@ module.exports = Self => {
LEFT JOIN province p ON p.id = a.provinceFk
LEFT JOIN warehouse w ON w.id = t.warehouseFk
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+ STRAIGHT_JOIN ticketState ts ON ts.ticketFk = t.id
LEFT JOIN state st ON st.id = ts.stateFk
LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
@@ -224,10 +228,12 @@ module.exports = Self => {
stmt.merge(conn.makeWhere(filter.where));
stmts.push(stmt);
+ stmts.push(`SET SESSION optimizer_search_depth = @_optimizer_search_depth`);
+
// Get client debt balance
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt');
stmts.push(`
- CREATE TEMPORARY TABLE tmp.clientGetDebt
+ CREATE TEMPORARY TABLE tmp.clientGetDebt
(PRIMARY KEY (clientFk))
ENGINE = MEMORY
SELECT DISTINCT clientFk FROM tmp.filter`);
@@ -238,7 +244,7 @@ module.exports = Self => {
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.tickets');
stmt = new ParameterizedSQL(`
- CREATE TEMPORARY TABLE tmp.tickets
+ CREATE TEMPORARY TABLE tmp.tickets
(PRIMARY KEY (id))
ENGINE = MEMORY
SELECT f.*, r.risk AS debt
@@ -268,10 +274,10 @@ module.exports = Self => {
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems');
stmt = new ParameterizedSQL(`
- CREATE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE TEMPORARY TABLE tmp.sale_getProblems
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
+ SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
@@ -377,7 +383,7 @@ module.exports = Self => {
const ticketsIndex = stmts.push(stmt) - 1;
stmts.push(
- `DROP TEMPORARY TABLE
+ `DROP TEMPORARY TABLE
tmp.filter,
tmp.ticket_problems,
tmp.sale_getProblems,
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index a4fb1b0af..0682cef09 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -147,16 +147,12 @@ describe('SalesMonitor salesFilter()', () => {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 9}}, args: {pending: false}};
- const filter = {};
+ const filter = {order: 'alertLevel ASC'};
const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
const firstRow = result[0];
- const secondRow = result[1];
- const thirdRow = result[2];
expect(result.length).toEqual(12);
- expect(firstRow.state).toEqual('Entregado');
- expect(secondRow.state).toEqual('Entregado');
- expect(thirdRow.state).toEqual('Entregado');
+ expect(firstRow.alertLevel).not.toEqual(0);
await tx.rollback();
} catch (e) {
diff --git a/modules/route/back/methods/route/specs/updateWorkCenter.spec.js b/modules/route/back/methods/route/specs/updateWorkCenter.spec.js
new file mode 100644
index 000000000..5328dc240
--- /dev/null
+++ b/modules/route/back/methods/route/specs/updateWorkCenter.spec.js
@@ -0,0 +1,51 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('route updateWorkCenter()', () => {
+ const routeId = 1;
+
+ it('should set the commission work center if the worker has workCenter', async() => {
+ const tx = await models.Route.beginTransaction({});
+ try {
+ const developerId = 9;
+ const ctx = {
+ req: {
+ accessToken: {userId: developerId}
+ }
+ };
+ const options = {transaction: tx};
+
+ const expectedResult = 1;
+ const updatedRoute = await models.Route.updateWorkCenter(ctx, routeId, options);
+
+ expect(updatedRoute.commissionWorkCenterFk).toEqual(expectedResult);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`shoul set the default commision work center if that worker didn't have one yet`, async() => {
+ const tx = await models.Route.beginTransaction({});
+ try {
+ const userWithoutWorkCenter = 2;
+ const ctx = {
+ req: {
+ accessToken: {userId: userWithoutWorkCenter}
+ }
+ };
+ const options = {transaction: tx};
+
+ const expectedResult = 9;
+ const updatedRoute = await models.Route.updateWorkCenter(ctx, routeId, options);
+
+ expect(updatedRoute.commissionWorkCenterFk).toEqual(expectedResult);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/route/back/methods/route/updateWorkCenter.js b/modules/route/back/methods/route/updateWorkCenter.js
new file mode 100644
index 000000000..7796fba41
--- /dev/null
+++ b/modules/route/back/methods/route/updateWorkCenter.js
@@ -0,0 +1,54 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('updateWorkCenter', {
+ description: 'Update the commission work center through user salix connected',
+ accessType: 'WRITE',
+ accepts: {
+ arg: 'id',
+ type: 'number',
+ description: 'Route Id',
+ http: {source: 'path'}
+ },
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/:id/updateWorkCenter`,
+ verb: 'POST'
+ }
+ });
+
+ Self.updateWorkCenter = async(ctx, id, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+ const userId = ctx.req.accessToken.userId;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const [result] = await Self.rawSql(`
+ SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter
+ FROM vn.routeConfig r
+ LEFT JOIN vn.workerLabour wl ON wl.workerFk = ?
+ AND CURDATE() BETWEEN wl.started AND IFNULL(wl.ended, CURDATE());
+ `, [userId], myOptions);
+
+ const route = await models.Route.findById(id, null, myOptions);
+ await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions);
+
+ if (tx) await tx.commit();
+
+ return route;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index c82d1722e..4050e62fe 100644
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@@ -9,6 +9,7 @@ module.exports = Self => {
require('../methods/route/clone')(Self);
require('../methods/route/getSuggestedTickets')(Self);
require('../methods/route/unlink')(Self);
+ require('../methods/route/updateWorkCenter')(Self);
Self.validate('kmStart', validateDistance, {
message: 'Distance must be lesser than 1000'
diff --git a/modules/route/back/models/route.json b/modules/route/back/models/route.json
index 3f9e7c8d2..12b9785db 100644
--- a/modules/route/back/models/route.json
+++ b/modules/route/back/models/route.json
@@ -50,6 +50,9 @@
},
"isOk": {
"type": "boolean"
+ },
+ "commissionWorkCenterFk": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/route/front/create/index.js b/modules/route/front/create/index.js
index 56c8cc25a..c81394c10 100644
--- a/modules/route/front/create/index.js
+++ b/modules/route/front/create/index.js
@@ -4,7 +4,12 @@ import Section from 'salix/components/section';
export default class Controller extends Section {
onSubmit() {
this.$.watcher.submit().then(
- res => this.$state.go('route.card.summary', {id: res.data.id})
+ res => {
+ this.$http.post(`Routes/${res.data.id}/updateWorkCenter`, null)
+ .then(() => {
+ this.$state.go('route.card.summary', {id: res.data.id});
+ });
+ }
);
}
}
diff --git a/modules/shelving/back/methods/shelving/getSummary.js b/modules/shelving/back/methods/shelving/getSummary.js
new file mode 100644
index 000000000..da357c7bf
--- /dev/null
+++ b/modules/shelving/back/methods/shelving/getSummary.js
@@ -0,0 +1,52 @@
+module.exports = Self => {
+ Self.remoteMethod('getSummary', {
+ description: 'Returns the shelving summary',
+ accessType: 'READ',
+ accepts: {
+ arg: 'code',
+ type: 'string',
+ required: true,
+ description: 'The shelving code',
+ http: {source: 'path'}
+ },
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/:code/getSummary`,
+ verb: 'GET'
+ }
+ });
+ Self.getSummary = async code => {
+ let filter = {
+ where: {code: code},
+ fields: [
+ 'code',
+ 'parkingFk',
+ 'priority',
+ 'userFk',
+ 'isRecyclable'
+ ],
+ include: [
+ {
+ relation: 'parking'
+ },
+ {
+ relation: 'worker',
+ scope: {
+ fields: ['id', 'userFk'],
+ include: {
+ relation: 'user',
+ scope: {
+ fields: ['id', 'nickname']
+ }
+ }
+ }
+ }
+ ]
+ };
+
+ return Self.app.models.Shelving.findOne(filter);
+ };
+};
diff --git a/modules/shelving/back/model-config.json b/modules/shelving/back/model-config.json
new file mode 100644
index 000000000..b5619d8c5
--- /dev/null
+++ b/modules/shelving/back/model-config.json
@@ -0,0 +1,11 @@
+{
+ "Parking": {
+ "dataSource": "vn"
+ },
+ "Shelving": {
+ "dataSource": "vn"
+ },
+ "ShelvingLog": {
+ "dataSource": "vn"
+ }
+}
diff --git a/modules/shelving/back/models/parking.json b/modules/shelving/back/models/parking.json
new file mode 100644
index 000000000..7efcf72d3
--- /dev/null
+++ b/modules/shelving/back/models/parking.json
@@ -0,0 +1,33 @@
+{
+ "name": "Parking",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "parking"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "column": {
+ "type": "string",
+ "required": true
+ },
+ "row": {
+ "type": "string",
+ "required": true
+ },
+ "sectorFk": {
+ "type": "number"
+ },
+ "code": {
+ "type": "string"
+ },
+ "pickingOrder": {
+ "type": "number"
+ }
+ }
+}
diff --git a/modules/shelving/back/models/shelving-log.json b/modules/shelving/back/models/shelving-log.json
new file mode 100644
index 000000000..a2267394e
--- /dev/null
+++ b/modules/shelving/back/models/shelving-log.json
@@ -0,0 +1,58 @@
+{
+ "name": "ShelvingLog",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "shelvingLog"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "forceId": false
+ },
+ "originFk": {
+ "type": "number",
+ "required": true
+ },
+ "userFk": {
+ "type": "number"
+ },
+ "action": {
+ "type": "string",
+ "required": true
+ },
+ "changedModel": {
+ "type": "string"
+ },
+ "oldInstance": {
+ "type": "object"
+ },
+ "newInstance": {
+ "type": "object"
+ },
+ "creationDate": {
+ "type": "date"
+ },
+ "changedModelId": {
+ "type": "number"
+ },
+ "changedModelValue": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "user": {
+ "type": "belongsTo",
+ "model": "Account",
+ "foreignKey": "userFk"
+ }
+ },
+ "scope": {
+ "order": ["creationDate DESC", "id DESC"]
+ }
+}
diff --git a/modules/shelving/back/models/shelving.js b/modules/shelving/back/models/shelving.js
new file mode 100644
index 000000000..3e27f5863
--- /dev/null
+++ b/modules/shelving/back/models/shelving.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+ require('../methods/shelving/getSummary')(Self);
+};
diff --git a/modules/shelving/back/models/shelving.json b/modules/shelving/back/models/shelving.json
new file mode 100644
index 000000000..508ac428f
--- /dev/null
+++ b/modules/shelving/back/models/shelving.json
@@ -0,0 +1,51 @@
+{
+ "name": "Shelving",
+ "base": "Loggable",
+ "log": {
+ "model": "ShelvingLog",
+ "showField": "id"
+ },
+ "options": {
+ "mysql": {
+ "table": "shelving"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "code": {
+ "type": "string",
+ "required": true
+ },
+ "parkingFk": {
+ "type": "number"
+ },
+ "isPrinted": {
+ "type": "boolean"
+ },
+ "priority": {
+ "type": "number"
+ },
+ "userFk": {
+ "type": "number"
+ },
+ "isRecyclable": {
+ "type": "boolean"
+ }
+ },
+ "relations": {
+ "parking": {
+ "type": "belongsTo",
+ "model": "Parking",
+ "foreignKey": "parkingFk"
+ },
+ "worker": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "userFk"
+ }
+ }
+}
diff --git a/modules/shelving/front/basic-data/index.html b/modules/shelving/front/basic-data/index.html
new file mode 100644
index 000000000..68d61e169
--- /dev/null
+++ b/modules/shelving/front/basic-data/index.html
@@ -0,0 +1,52 @@
+
+
+
\ No newline at end of file
diff --git a/modules/shelving/front/basic-data/index.js b/modules/shelving/front/basic-data/index.js
new file mode 100644
index 000000000..e17c9feee
--- /dev/null
+++ b/modules/shelving/front/basic-data/index.js
@@ -0,0 +1,10 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+ngModule.vnComponent('vnShelvingBasicData', {
+ template: require('./index.html'),
+ controller: Section,
+ bindings: {
+ shelving: '<'
+ }
+});
diff --git a/modules/shelving/front/card/index.html b/modules/shelving/front/card/index.html
new file mode 100644
index 000000000..c83afc288
--- /dev/null
+++ b/modules/shelving/front/card/index.html
@@ -0,0 +1,8 @@
+
+
+
+
+
');
+ controller = $componentController('vnShelvingCard', {$element});
+
+ $stateParams.id = data.id;
+ $httpBackend.whenRoute('GET', 'Shelvings/:id').respond(data);
+ }));
+
+ it('should reload the controller data', () => {
+ controller.reload();
+ $httpBackend.flush();
+
+ expect(controller.shelving).toEqual(data);
+ });
+});
diff --git a/modules/shelving/front/create/index.html b/modules/shelving/front/create/index.html
new file mode 100644
index 000000000..edb3a7d3b
--- /dev/null
+++ b/modules/shelving/front/create/index.html
@@ -0,0 +1,51 @@
+
+
+
\ No newline at end of file
diff --git a/modules/shelving/front/create/index.js b/modules/shelving/front/create/index.js
new file mode 100644
index 000000000..bb0e441eb
--- /dev/null
+++ b/modules/shelving/front/create/index.js
@@ -0,0 +1,15 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ onSubmit() {
+ return this.$.watcher.submit().then(res =>
+ this.$state.go('shelving.card.basicData', {id: res.data.id})
+ );
+ }
+}
+
+ngModule.vnComponent('vnShelvingCreate', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/shelving/front/create/index.spec.js b/modules/shelving/front/create/index.spec.js
new file mode 100644
index 000000000..0bdde9145
--- /dev/null
+++ b/modules/shelving/front/create/index.spec.js
@@ -0,0 +1,38 @@
+import './index';
+
+describe('Shelving', () => {
+ describe('Component vnShelvingCreate', () => {
+ let $scope;
+ let $state;
+ let controller;
+
+ beforeEach(ngModule('shelving'));
+
+ beforeEach(inject(($componentController, $rootScope, _$state_) => {
+ $scope = $rootScope.$new();
+ $state = _$state_;
+ $scope.watcher = {
+ submit: () => {
+ return {
+ then: callback => {
+ callback({data: {id: 1}});
+ }
+ };
+ }
+ };
+ const $element = angular.element('
+
+
+ Delete
+
+
+
+
+
+
+
+
+
+
+ {{::$ctrl.shelving.worker.user.nickname}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/shelving/front/descriptor/index.js b/modules/shelving/front/descriptor/index.js
new file mode 100644
index 000000000..931dbb6dc
--- /dev/null
+++ b/modules/shelving/front/descriptor/index.js
@@ -0,0 +1,26 @@
+import ngModule from '../module';
+import Descriptor from 'salix/components/descriptor';
+
+class Controller extends Descriptor {
+ get shelving() {
+ return this.entity;
+ }
+
+ set shelving(value) {
+ this.entity = value;
+ }
+
+ onDelete() {
+ return this.$http.delete(`Shelvings/${this.shelving.id}`)
+ .then(() => this.$state.go('shelving.index'))
+ .then(() => this.vnApp.showSuccess(this.$t('Shelving removed')));
+ }
+}
+
+ngModule.vnComponent('vnShelvingDescriptor', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ shelving: '<'
+ }
+});
diff --git a/modules/shelving/front/descriptor/index.spec.js b/modules/shelving/front/descriptor/index.spec.js
new file mode 100644
index 000000000..3ee33580b
--- /dev/null
+++ b/modules/shelving/front/descriptor/index.spec.js
@@ -0,0 +1,29 @@
+import './index.js';
+
+describe('component vnShelvingDescriptor', () => {
+ let $httpBackend;
+ let controller;
+
+ const shelving = {id: 1, code: 'AA6'};
+
+ beforeEach(ngModule('shelving'));
+
+ beforeEach(inject(($componentController, _$httpBackend_, _$httpParamSerializer_) => {
+ $httpBackend = _$httpBackend_;
+ controller = $componentController('vnShelvingDescriptor', {$element: null}, {shelving});
+ jest.spyOn(controller.vnApp, 'showSuccess');
+ }));
+
+ describe('onDelete()', () => {
+ it('should delete entity and go to index', () => {
+ controller.$state.go = jest.fn();
+
+ $httpBackend.expectDELETE('Shelvings/1').respond();
+ controller.onDelete();
+ $httpBackend.flush();
+
+ expect(controller.$state.go).toHaveBeenCalledWith('shelving.index');
+ expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/modules/shelving/front/index.js b/modules/shelving/front/index.js
new file mode 100644
index 000000000..2ad9bc1b9
--- /dev/null
+++ b/modules/shelving/front/index.js
@@ -0,0 +1,11 @@
+export * from './module';
+
+import './basic-data';
+import './card';
+import './create';
+import './descriptor';
+import './index/';
+import './main';
+import './search-panel';
+import './summary';
+import './log';
diff --git a/modules/shelving/front/index/index.html b/modules/shelving/front/index/index.html
new file mode 100644
index 000000000..1532abd42
--- /dev/null
+++ b/modules/shelving/front/index/index.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/shelving/front/index/index.js b/modules/shelving/front/index/index.js
new file mode 100644
index 000000000..04d8ea9cd
--- /dev/null
+++ b/modules/shelving/front/index/index.js
@@ -0,0 +1,14 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ preview(shelving) {
+ this.selectedShelving = shelving;
+ this.$.summary.show();
+ }
+}
+
+ngModule.vnComponent('vnShelvingIndex', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/shelving/front/index/index.spec.js b/modules/shelving/front/index/index.spec.js
new file mode 100644
index 000000000..aad79fb0e
--- /dev/null
+++ b/modules/shelving/front/index/index.spec.js
@@ -0,0 +1,39 @@
+import './index.js';
+describe('Component vnShelvingIndex', () => {
+ let controller;
+ let $window;
+ let shelvings = [{
+ id: 1,
+ code: 'AAA'
+ }, {
+ id: 2,
+ code: 'AA1'
+ }, {
+ id: 3,
+ code: 'AA2'
+ }];
+
+ beforeEach(ngModule('shelving'));
+
+ beforeEach(inject(($componentController, _$window_) => {
+ $window = _$window_;
+ const $element = angular.element('
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/shelving/front/search-panel/index.js b/modules/shelving/front/search-panel/index.js
new file mode 100644
index 000000000..51b81538b
--- /dev/null
+++ b/modules/shelving/front/search-panel/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.vnComponent('vnShelvingSearchPanel', {
+ template: require('./index.html'),
+ controller: SearchPanel
+});
diff --git a/modules/shelving/front/search-panel/locale/es.yml b/modules/shelving/front/search-panel/locale/es.yml
new file mode 100644
index 000000000..bd19b1b33
--- /dev/null
+++ b/modules/shelving/front/search-panel/locale/es.yml
@@ -0,0 +1 @@
+Search shelvings by code: Busca carros por código
\ No newline at end of file
diff --git a/modules/shelving/front/summary/index.html b/modules/shelving/front/summary/index.html
new file mode 100644
index 000000000..61e44d278
--- /dev/null
+++ b/modules/shelving/front/summary/index.html
@@ -0,0 +1,51 @@
+
+
+
+
+ {{::$ctrl.summary.code}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$ctrl.summary.worker.user.nickname}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/shelving/front/summary/index.js b/modules/shelving/front/summary/index.js
new file mode 100644
index 000000000..10a905f1d
--- /dev/null
+++ b/modules/shelving/front/summary/index.js
@@ -0,0 +1,41 @@
+import ngModule from '../module';
+import Summary from 'salix/components/summary';
+import './style.scss';
+
+class Controller extends Summary {
+ set shelving(value) {
+ this._shelving = value;
+ this.summary = null;
+ if (!value) return;
+
+ const filter = {
+ include: [
+ {relation: 'worker',
+ scope: {
+ fields: ['userFk'],
+ include: {
+ relation: 'user',
+ scope: {
+ fields: ['nickname']
+ }
+ }
+ }},
+ {relation: 'parking'}
+ ]
+ };
+ this.$http.get(`Shelvings/${value.id}`, {filter})
+ .then(res => this.summary = res.data);
+ }
+
+ get shelving() {
+ return this._shelving;
+ }
+}
+
+ngModule.vnComponent('vnShelvingSummary', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ shelving: '<'
+ }
+});
diff --git a/modules/shelving/front/summary/locale/es.yml b/modules/shelving/front/summary/locale/es.yml
new file mode 100644
index 000000000..d5d14d52a
--- /dev/null
+++ b/modules/shelving/front/summary/locale/es.yml
@@ -0,0 +1,5 @@
+Code: Código
+Parking: Parking
+Priority: Prioridad
+Worker: Trabajador
+Recyclable: Reciclable
\ No newline at end of file
diff --git a/modules/shelving/front/summary/style.scss b/modules/shelving/front/summary/style.scss
new file mode 100644
index 000000000..1eb6b2323
--- /dev/null
+++ b/modules/shelving/front/summary/style.scss
@@ -0,0 +1,7 @@
+@import "variables";
+
+vn-client-summary {
+ .alert span {
+ color: $color-alert
+ }
+}
\ No newline at end of file
diff --git a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
index 3d07b90f9..e1fdeb0c5 100644
--- a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
+++ b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
-describe('ticket listPackaging()', () => {
+// 4376
+xdescribe('ticket listPackaging()', () => {
it('should return the packaging', async() => {
const tx = await models.Packaging.beginTransaction({});
@@ -8,9 +9,9 @@ describe('ticket listPackaging()', () => {
const options = {transaction: tx};
const filter = {where: {packagingFk: 1}};
- const response = await models.Packaging.listPackaging(filter, options);
+ const [response] = await models.Packaging.listPackaging(filter, options);
- expect(response[0].name).toEqual('Container ammo box 1m');
+ expect(response.name).toEqual('Container ammo box 1m');
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index 66c0550e0..c0c431636 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -98,7 +98,7 @@ module.exports = Self => {
const createdSale = await models.Sale.create({
ticketFk: refundTicketId,
itemFk: sale.itemFk,
- quantity: sale.quantity,
+ quantity: - sale.quantity,
concept: sale.concept,
price: sale.price,
discount: sale.discount,
@@ -122,7 +122,7 @@ module.exports = Self => {
await models.TicketService.create({
description: service.description,
- quantity: service.quantity,
+ quantity: - service.quantity,
price: service.price,
taxClassFk: service.taxClassFk,
ticketFk: refundTicketId,
diff --git a/modules/travel/back/methods/travel/cloneWithEntries.js b/modules/travel/back/methods/travel/cloneWithEntries.js
index 393194f06..611f4e429 100644
--- a/modules/travel/back/methods/travel/cloneWithEntries.js
+++ b/modules/travel/back/methods/travel/cloneWithEntries.js
@@ -35,7 +35,7 @@ module.exports = Self => {
'landed',
'warehouseInFk',
'warehouseOutFk',
- 'agencyFk',
+ 'agencyModeFk',
'ref'
]
});
@@ -56,7 +56,7 @@ module.exports = Self => {
travel.warehouseOutFk,
travel.warehouseInFk,
travel.ref,
- travel.agencyFk
+ travel.agencyModeFk
]
);
stmts.push(stmt);
@@ -76,7 +76,7 @@ module.exports = Self => {
'landed',
'warehouseInFk',
'warehouseOutFk',
- 'agencyFk',
+ 'agencyModeFk',
'ref'
]
});
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index af6e1ec0a..7769b7f21 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -34,7 +34,7 @@ module.exports = Self => {
description: 'The landed to date filter'
},
{
- arg: 'agencyFk',
+ arg: 'agencyModeFk',
type: 'number',
description: 'The agencyModeFk id'
},
@@ -96,7 +96,7 @@ module.exports = Self => {
case 'continent':
return {'cnt.code': value};
case 'id':
- case 'agencyFk':
+ case 'agencyModeFk':
case 'warehouseOutFk':
case 'warehouseInFk':
case 'totalEntries':
@@ -143,7 +143,7 @@ module.exports = Self => {
JOIN warehouse wo ON wo.id = t.warehouseOutFk
JOIN country c ON c.id = wo.countryFk
LEFT JOIN continent cnt ON cnt.id = c.continentFk
- JOIN agencyMode am ON am.id = t.agencyFk`
+ JOIN agencyMode am ON am.id = t.agencyModeFk`
);
stmt.merge(conn.makeWhere(filter.where));
diff --git a/modules/travel/back/methods/travel/filter.js b/modules/travel/back/methods/travel/filter.js
index 586b4e5aa..3fa1d65f9 100644
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@@ -44,7 +44,7 @@ module.exports = Self => {
description: 'The landed to date filter',
http: {source: 'query'}
}, {
- arg: 'agencyFk',
+ arg: 'agencyModeFk',
type: 'number',
description: 'The agencyModeFk id',
http: {source: 'query'}
@@ -102,7 +102,7 @@ module.exports = Self => {
case 'landedTo':
return {'t.landed': {lte: value}};
case 'id':
- case 'agencyFk':
+ case 'agencyModeFk':
case 'warehouseOutFk':
case 'warehouseInFk':
case 'totalEntries':
@@ -124,7 +124,7 @@ module.exports = Self => {
t.landed,
t.warehouseInFk,
t.warehouseOutFk,
- t.agencyFk,
+ t.agencyModeFk,
t.ref,
t.isDelivered,
t.isReceived,
@@ -137,7 +137,7 @@ module.exports = Self => {
wout.name warehouseOutName,
cnt.code continent
FROM vn.travel t
- JOIN vn.agencyMode am ON am.id = t.agencyFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.warehouse win ON win.id = t.warehouseInFk
JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk
JOIN warehouse wo ON wo.id = t.warehouseOutFk
diff --git a/modules/travel/back/methods/travel/getAverageDays.js b/modules/travel/back/methods/travel/getAverageDays.js
index 9a9649d84..d888d80c1 100644
--- a/modules/travel/back/methods/travel/getAverageDays.js
+++ b/modules/travel/back/methods/travel/getAverageDays.js
@@ -32,9 +32,9 @@ module.exports = Self => {
t.warehouseOutFk,
t.landed,
t.shipped,
- t.agencyFk
+ t.agencyModeFk
FROM travel t
- WHERE t.agencyFk = ? LIMIT 50)`, [agencyModeFk]);
+ WHERE t.agencyModeFk = ? LIMIT 50)`, [agencyModeFk]);
stmts.push(stmt);
stmt = new ParameterizedSQL(`
@@ -44,10 +44,10 @@ module.exports = Self => {
t.warehouseOutFk,
(SELECT ROUND(AVG(DATEDIFF(t.landed, t.shipped )))
FROM tmp.travel t
- WHERE t.agencyFk
+ WHERE t.agencyModeFk
ORDER BY id DESC LIMIT 50) AS dayDuration
FROM tmp.travel t
- WHERE t.agencyFk
+ WHERE t.agencyModeFk
ORDER BY t.id DESC LIMIT 1`);
const avgDaysIndex = stmts.push(stmt) - 1;
diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
index aa92fa308..2e79ff193 100644
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@@ -71,7 +71,7 @@ describe('Travel cloneWithEntries()', () => {
expect(newTravel.ref).toEqual('fifth travel');
expect(newTravel.warehouseInFk).toEqual(warehouseThree);
expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
- expect(newTravel.agencyFk).toEqual(agencyModeOne);
+ expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
expect(travelEntries.length).toBeGreaterThan(0);
});
});
diff --git a/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js b/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
index b74160efe..3693aae82 100644
--- a/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
+++ b/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
@@ -70,10 +70,10 @@ describe('Travel extraCommunityFilter()', () => {
expect(result.length).toEqual(3);
});
- it('should return the travel matching "agencyFk"', async() => {
+ it('should return the travel matching "agencyModeFk"', async() => {
const ctx = {
args: {
- agencyFk: 1
+ agencyModeFk: 1
}
};
diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json
index 95330e263..c20b7b0bf 100644
--- a/modules/travel/back/models/travel.json
+++ b/modules/travel/back/models/travel.json
@@ -44,17 +44,14 @@
"type": "number"
},
"agencyModeFk": {
- "type": "number",
- "mysql": {
- "columnName": "agencyFk"
- }
+ "type": "number"
}
},
"relations": {
"agency": {
"type": "belongsTo",
"model": "AgencyMode",
- "foreignKey": "agencyFk"
+ "foreignKey": "agencyModeFk"
},
"warehouseIn": {
"type": "belongsTo",
diff --git a/modules/travel/front/descriptor-menu/index.js b/modules/travel/front/descriptor-menu/index.js
index 25922815e..0630bb618 100644
--- a/modules/travel/front/descriptor-menu/index.js
+++ b/modules/travel/front/descriptor-menu/index.js
@@ -25,7 +25,7 @@ class Controller extends Section {
'shipped',
'landed',
'totalEntries',
- 'agencyFk',
+ 'agencyModeFk',
'warehouseInFk',
'warehouseOutFk',
'cargoSupplierFk'
@@ -64,7 +64,7 @@ class Controller extends Section {
onCloneAccept() {
const params = JSON.stringify({
ref: this.travel.ref,
- agencyModeFk: this.travel.agencyFk,
+ agencyModeFk: this.travel.agencyModeFk,
shipped: this.travel.shipped,
landed: this.travel.landed,
warehouseInFk: this.travel.warehouseInFk,
diff --git a/modules/travel/front/descriptor-menu/index.spec.js b/modules/travel/front/descriptor-menu/index.spec.js
index 4ca93a6d6..40319e8e2 100644
--- a/modules/travel/front/descriptor-menu/index.spec.js
+++ b/modules/travel/front/descriptor-menu/index.spec.js
@@ -18,7 +18,7 @@ describe('Travel Component vnTravelDescriptorMenu', () => {
controller.travel = {
ref: 'the ref',
- agencyFk: 'the agency',
+ agencyModeFk: 'the agency',
shipped: 'the shipped date',
landed: 'the landing date',
warehouseInFk: 'the receiver warehouse',
@@ -29,7 +29,7 @@ describe('Travel Component vnTravelDescriptorMenu', () => {
const params = JSON.stringify({
ref: controller.travel.ref,
- agencyModeFk: controller.travel.agencyFk,
+ agencyModeFk: controller.travel.agencyModeFk,
shipped: controller.travel.shipped,
landed: controller.travel.landed,
warehouseInFk: controller.travel.warehouseInFk,
diff --git a/modules/travel/front/descriptor/index.js b/modules/travel/front/descriptor/index.js
index dc19f68af..b1f2f53be 100644
--- a/modules/travel/front/descriptor/index.js
+++ b/modules/travel/front/descriptor/index.js
@@ -14,9 +14,9 @@ class Controller extends Descriptor {
let travelFilter;
const travel = this.travel;
- if (travel && travel.agencyFk) {
+ if (travel && travel.agencyModeFk) {
travelFilter = this.travel && JSON.stringify({
- agencyFk: this.travel.agencyFk
+ agencyModeFk: this.travel.agencyModeFk
});
}
return travelFilter;
diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html
index 8e51acc15..ab1e88891 100644
--- a/modules/travel/front/extra-community-search-panel/index.html
+++ b/modules/travel/front/extra-community-search-panel/index.html
@@ -29,7 +29,7 @@
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 8510cf328..27a700083 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -11,7 +11,7 @@
Id
Reference
- Agency
+ Agency
Warehouse Out
Shipped
Delivered
diff --git a/modules/travel/front/index/index.js b/modules/travel/front/index/index.js
index 5cae6fa06..50036831f 100644
--- a/modules/travel/front/index/index.js
+++ b/modules/travel/front/index/index.js
@@ -10,7 +10,7 @@ export default class Controller extends Section {
onCloneAccept(travel) {
const params = JSON.stringify({
ref: travel.ref,
- agencyModeFk: travel.agencyFk,
+ agencyModeFk: travel.agencyModeFk,
shipped: travel.shipped,
landed: travel.landed,
warehouseInFk: travel.warehouseInFk,
@@ -44,7 +44,7 @@ export default class Controller extends Section {
case 'landed':
return {'t.landed': {between: this.dateRange(value)}};
case 'id':
- case 'agencyFk':
+ case 'agencyModeFk':
case 'warehouseOutFk':
case 'warehouseInFk':
case 'totalEntries':
diff --git a/modules/travel/front/index/index.spec.js b/modules/travel/front/index/index.spec.js
index 1b2ab0a87..9abe46a64 100644
--- a/modules/travel/front/index/index.spec.js
+++ b/modules/travel/front/index/index.spec.js
@@ -35,11 +35,11 @@ describe('Travel Component vnTravelIndex', () => {
const travel = {
ref: 1,
- agencyFk: 1
+ agencyModeFk: 1
};
const travelParams = {
ref: travel.ref,
- agencyModeFk: travel.agencyFk
+ agencyModeFk: travel.agencyModeFk
};
const queryParams = JSON.stringify(travelParams);
controller.onCloneAccept(travel);
diff --git a/modules/travel/front/search-panel/index.html b/modules/travel/front/search-panel/index.html
index 8d4edec1a..2e9c796c3 100644
--- a/modules/travel/front/search-panel/index.html
+++ b/modules/travel/front/search-panel/index.html
@@ -29,7 +29,7 @@
diff --git a/modules/worker/back/methods/department/specs/removeChild.spec.js b/modules/worker/back/methods/department/specs/removeChild.spec.js
index 03216ac13..b769bcaa6 100644
--- a/modules/worker/back/methods/department/specs/removeChild.spec.js
+++ b/modules/worker/back/methods/department/specs/removeChild.spec.js
@@ -8,7 +8,7 @@ describe('department removeChild()', () => {
});
it('should remove a child department', async() => {
- const childId = 130;
+ const childId = 44;
removedChild = await app.models.Department.findById(childId);
const result = await app.models.Department.removeChild(childId);
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index b3a3fce16..430ec7dfc 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -88,9 +88,8 @@ module.exports = Self => {
FROM vn.calendar c
JOIN postgresql.business b ON b.business_id = c.businessFk
JOIN postgresql.profile p ON p.profile_id = b.client_id
- JOIN vn.person pe ON pe.id = p.person_id
WHERE c.dayOffTypeFk = 6
- AND pe.workerFk = ?
+ AND p.workerFk = ?
AND c.dated BETWEEN util.firstDayOfYear(?)
AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index f7a344358..3d41707ce 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -49,6 +49,9 @@
},
"labelerFk": {
"type" : "number"
+ },
+ "mobileExtension": {
+ "type" : "number"
}
},
"relations": {
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index cbe683185..5a3acdde5 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -25,10 +25,18 @@
+
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
User data
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 3cdb2c36f..c2ad107d5 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -34,7 +34,7 @@ class Controller extends Summary {
},
{
relation: 'client',
- scope: {fields: ['fi']}
+ scope: {fields: ['fi', 'phone']}
},
{
relation: 'boss',
diff --git a/modules/worker/front/summary/locale/es.yml b/modules/worker/front/summary/locale/es.yml
new file mode 100644
index 000000000..e9c8e5583
--- /dev/null
+++ b/modules/worker/front/summary/locale/es.yml
@@ -0,0 +1,3 @@
+Business phone: Teléfono de empresa
+Personal phone: Teléfono personal
+Mobile extension: Extensión móvil
\ No newline at end of file
diff --git a/modules/zone/back/methods/zone/exclusionGeo.js b/modules/zone/back/methods/zone/exclusionGeo.js
new file mode 100644
index 000000000..5026c58c5
--- /dev/null
+++ b/modules/zone/back/methods/zone/exclusionGeo.js
@@ -0,0 +1,64 @@
+
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethod('exclusionGeo', {
+ description: 'Exclude a geo from a zone',
+ accepts: [
+ {
+ arg: 'zoneFk',
+ type: 'number',
+ description: 'The zone id'
+ },
+ {
+ arg: 'date',
+ type: 'date',
+ description: 'The date to exclude'
+ },
+ {
+ arg: 'geoIds',
+ type: ['number'],
+ description: 'The geos id'
+ }
+
+ ],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/exclusionGeo`,
+ verb: 'POST'
+ }
+ });
+
+ Self.exclusionGeo = async(zoneFk, date, geoIds, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!geoIds[0]) throw new UserError(`You must select a location`);
+
+ const newZoneExclusion = await models.ZoneExclusion.create({
+ zoneFk: zoneFk,
+ dated: date
+ }, myOptions);
+
+ const promises = [];
+
+ for (const geoId of geoIds) {
+ const newZoneExclusionGeo = await models.ZoneExclusionGeo.create({
+ zoneExclusionFk: newZoneExclusion.id,
+ geoFk: geoId
+ }, myOptions);
+
+ promises.push(newZoneExclusionGeo);
+ }
+
+ const newZoneExclusionGeos = await Promise.all(promises);
+
+ return newZoneExclusionGeos;
+ };
+};
diff --git a/modules/zone/back/methods/zone/getEventsFiltered.js b/modules/zone/back/methods/zone/getEventsFiltered.js
index 316652fa3..b7875785d 100644
--- a/modules/zone/back/methods/zone/getEventsFiltered.js
+++ b/modules/zone/back/methods/zone/getEventsFiltered.js
@@ -56,12 +56,23 @@ module.exports = Self => {
[zoneFk, started, ended, started, ended, started, ended, started, ended], myOptions);
query = `
- SELECT *
- FROM vn.zoneExclusion
- WHERE zoneFk = ?
- AND dated BETWEEN ? AND ?;`;
+ SELECT e.*
+ FROM vn.zoneExclusion e
+ LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE e.zoneFk = ?
+ AND e.dated BETWEEN ? AND ?
+ AND eg.zoneExclusionFk IS NULL;`;
const exclusions = await Self.rawSql(query, [zoneFk, started, ended], myOptions);
- return {events, exclusions};
+ query = `
+ SELECT eg.*, e.zoneFk, e.dated, e.created, e.userFk
+ FROM vn.zoneExclusion e
+ LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE e.zoneFk = ?
+ AND e.dated BETWEEN ? AND ?
+ AND eg.zoneExclusionFk IS NOT NULL;`;
+ const geoExclusions = await Self.rawSql(query, [zoneFk, started, ended], myOptions);
+
+ return {events, exclusions, geoExclusions};
};
};
diff --git a/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js b/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
new file mode 100644
index 000000000..3a345f2ce
--- /dev/null
+++ b/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
@@ -0,0 +1,41 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('zone exclusionGeo()', () => {
+ const zoneId = 1;
+ const today = new Date();
+
+ it(`should show an error when location isn't selected`, async() => {
+ const tx = await models.Zone.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const geoIds = [];
+
+ await models.Zone.exclusionGeo(zoneId, today, geoIds, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toContain(`You must select a location`);
+ });
+
+ it('should create two exclusion by geo', async() => {
+ const tx = await models.Zone.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const geoIds = [1, 2];
+ const result = await models.Zone.exclusionGeo(zoneId, today, geoIds, options);
+
+ expect(result.length).toEqual(2);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/zone/back/methods/zone/specs/updateExclusionGeo.spec.js b/modules/zone/back/methods/zone/specs/updateExclusionGeo.spec.js
new file mode 100644
index 000000000..9db2e24be
--- /dev/null
+++ b/modules/zone/back/methods/zone/specs/updateExclusionGeo.spec.js
@@ -0,0 +1,40 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('zone updateExclusionGeo()', () => {
+ it(`should show an error when location isn't selected`, async() => {
+ const tx = await models.Zone.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const zoneId = 1;
+ const geoIds = [];
+
+ await models.Zone.updateExclusionGeo(zoneId, geoIds, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toContain(`You must select a location`);
+ });
+
+ it('should delete all exclusion and then create two exclusion by geo for a zone', async() => {
+ const tx = await models.Zone.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const zoneId = 2;
+ const geoIds = [1, 2];
+ const result = await models.Zone.updateExclusionGeo(zoneId, geoIds, options);
+
+ expect(result.length).toEqual(2);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/zone/back/methods/zone/updateExclusionGeo.js b/modules/zone/back/methods/zone/updateExclusionGeo.js
new file mode 100644
index 000000000..237e336e0
--- /dev/null
+++ b/modules/zone/back/methods/zone/updateExclusionGeo.js
@@ -0,0 +1,55 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethod('updateExclusionGeo', {
+ description: 'Update the geos excluded from a zone',
+ accepts: [
+ {
+ arg: 'zoneExclusionFk',
+ type: 'number',
+ description: 'The zoneExclusion id'
+ },
+ {
+ arg: 'geoIds',
+ type: ['number'],
+ description: 'The geos id'
+ }
+
+ ],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/updateExclusionGeo`,
+ verb: 'POST'
+ }
+ });
+
+ Self.updateExclusionGeo = async(zoneExclusionFk, geoIds, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!geoIds[0]) throw new UserError(`You must select a location`);
+
+ await models.ZoneExclusionGeo.destroyAll({
+ zoneExclusionFk: zoneExclusionFk
+ }, myOptions);
+
+ const promises = [];
+
+ for (const geoId of geoIds) {
+ const params = {
+ zoneExclusionFk: zoneExclusionFk,
+ geoFk: geoId
+ };
+ const deletedZoneExclusionGeos = models.ZoneExclusionGeo.create(params, myOptions);
+ promises.push(deletedZoneExclusionGeos);
+ }
+
+ return Promise.all(promises);
+ };
+};
diff --git a/modules/zone/back/model-config.json b/modules/zone/back/model-config.json
index ee555f3f4..261a89902 100644
--- a/modules/zone/back/model-config.json
+++ b/modules/zone/back/model-config.json
@@ -23,6 +23,9 @@
"ZoneExclusion": {
"dataSource": "vn"
},
+ "ZoneExclusionGeo": {
+ "dataSource": "vn"
+ },
"ZoneGeo": {
"dataSource": "vn"
},
diff --git a/modules/zone/back/models/zone-exclusion-geo.json b/modules/zone/back/models/zone-exclusion-geo.json
new file mode 100644
index 000000000..816e4b650
--- /dev/null
+++ b/modules/zone/back/models/zone-exclusion-geo.json
@@ -0,0 +1,21 @@
+{
+ "name": "ZoneExclusionGeo",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "zoneExclusionGeo"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "zoneExclusionFk": {
+ "type": "number"
+ },
+ "geoFk": {
+ "type": "number"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/zone/back/models/zone.js b/modules/zone/back/models/zone.js
index ef1c8c5d9..6d5a6cdca 100644
--- a/modules/zone/back/models/zone.js
+++ b/modules/zone/back/models/zone.js
@@ -8,6 +8,8 @@ module.exports = Self => {
require('../methods/zone/deleteZone')(Self);
require('../methods/zone/includingExpired')(Self);
require('../methods/zone/getZoneClosing')(Self);
+ require('../methods/zone/exclusionGeo')(Self);
+ require('../methods/zone/updateExclusionGeo')(Self);
Self.validatesPresenceOf('agencyModeFk', {
message: `Agency cannot be blank`
diff --git a/modules/zone/front/calendar/index.js b/modules/zone/front/calendar/index.js
index a24d10aef..3bc7158ef 100644
--- a/modules/zone/front/calendar/index.js
+++ b/modules/zone/front/calendar/index.js
@@ -75,6 +75,17 @@ class Controller extends Component {
}
}
+ this.geoExclusions = {};
+ let geoExclusions = value.geoExclusions;
+
+ if (geoExclusions) {
+ for (let geoExclusion of geoExclusions) {
+ let stamp = toStamp(geoExclusion.dated);
+ if (!this.geoExclusions[stamp]) this.geoExclusions[stamp] = [];
+ this.geoExclusions[stamp].push(geoExclusion);
+ }
+ }
+
let events = value.events;
if (events) {
@@ -135,11 +146,13 @@ class Controller extends Component {
onSelection($event, $days, $type, $weekday) {
let $events = [];
let $exclusions = [];
+ let $geoExclusions = [];
for (let day of $days) {
let stamp = day.getTime();
$events = $events.concat(this.days[stamp] || []);
$exclusions = $exclusions.concat(this.exclusions[stamp] || []);
+ $geoExclusions = $geoExclusions.concat(this.geoExclusions[stamp] || []);
}
this.emit('selection', {
@@ -148,19 +161,23 @@ class Controller extends Component {
$type,
$weekday,
$events,
- $exclusions
+ $exclusions,
+ $geoExclusions
});
}
hasEvents(day) {
let stamp = day.getTime();
- return this.days[stamp] || this.exclusions[stamp];
+ return this.days[stamp] || this.exclusions[stamp] || this.geoExclusions[stamp];
}
getClass(day) {
let stamp = day.getTime();
- return this.exclusions[stamp] && !this.days[stamp]
- ? 'excluded' : '';
+ if (this.geoExclusions[stamp])
+ return 'geoExcluded';
+ else if (this.exclusions[stamp])
+ return 'excluded';
+ else return '';
}
}
Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
diff --git a/modules/zone/front/calendar/index.spec.js b/modules/zone/front/calendar/index.spec.js
index be002925e..338f47917 100644
--- a/modules/zone/front/calendar/index.spec.js
+++ b/modules/zone/front/calendar/index.spec.js
@@ -15,6 +15,7 @@ describe('component vnZoneCalendar', () => {
controller.zone = {id: 1};
controller.days = [];
controller.exclusions = [];
+ controller.geoExclusions = [];
}));
describe('date() setter', () => {
@@ -57,7 +58,7 @@ describe('component vnZoneCalendar', () => {
});
describe('data() setter', () => {
- it('should set the events and exclusions and then call the refreshEvents() method', () => {
+ it('should set the events, exclusions and geoExclusions and then call the refreshEvents() method', () => {
jest.spyOn(controller, 'refreshEvents').mockReturnThis();
controller.data = {
@@ -66,13 +67,17 @@ describe('component vnZoneCalendar', () => {
}],
events: [{
dated: new Date()
- }]
+ }],
+ geoExclusions: [{
+ dated: new Date()
+ }],
};
expect(controller.refreshEvents).toHaveBeenCalledWith();
expect(controller.events).toBeDefined();
expect(controller.events.length).toEqual(1);
expect(controller.exclusions).toBeDefined();
+ expect(controller.geoExclusions).toBeDefined();
expect(Object.keys(controller.exclusions).length).toEqual(1);
});
});
@@ -122,7 +127,8 @@ describe('component vnZoneCalendar', () => {
$events: [],
$exclusions: [],
$type: 'day',
- $weekday: 1
+ $weekday: 1,
+ $geoExclusions: [],
}
);
});
@@ -151,5 +157,16 @@ describe('component vnZoneCalendar', () => {
expect(result).toEqual('excluded');
});
+
+ it('should return the className "geoExcluded" for a date with geo excluded', () => {
+ const dated = new Date();
+
+ controller.geoExclusions = [];
+ controller.geoExclusions[dated.getTime()] = true;
+
+ const result = controller.getClass(dated);
+
+ expect(result).toEqual('geoExcluded');
+ });
});
});
diff --git a/modules/zone/front/calendar/style.scss b/modules/zone/front/calendar/style.scss
index 25b6a87d1..38491af58 100644
--- a/modules/zone/front/calendar/style.scss
+++ b/modules/zone/front/calendar/style.scss
@@ -33,6 +33,9 @@ vn-zone-calendar {
&.excluded .day-number {
background-color: $color-alert;
}
+ &.geoExcluded .day-number {
+ background-color: $color-main;
+ }
}
}
}
diff --git a/modules/zone/front/events/index.html b/modules/zone/front/events/index.html
index e71a1ae26..46ba87dea 100644
--- a/modules/zone/front/events/index.html
+++ b/modules/zone/front/events/index.html
@@ -2,7 +2,7 @@
id="calendar"
vn-id="calendar"
data="data"
- on-selection="$ctrl.onSelection($days, $type, $weekday, $events, $exclusions)"
+ on-selection="$ctrl.onSelection($days, $type, $weekday, $events, $exclusions, $geoExclusions)"
on-step="$ctrl.refresh()"
class="vn-w-md">
@@ -98,7 +98,7 @@
fixed-bottom-right>
@@ -198,3 +198,80 @@
message="This item will be deleted"
question="Are you sure you want to continue?">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add
+ Save
+
+
+
diff --git a/modules/zone/front/events/index.js b/modules/zone/front/events/index.js
index 0df16a42a..b86330126 100644
--- a/modules/zone/front/events/index.js
+++ b/modules/zone/front/events/index.js
@@ -1,5 +1,6 @@
import ngModule from '../module';
import Section from 'salix/components/section';
+import './style.scss';
class Controller extends Section {
constructor($element, $, vnWeekDays) {
@@ -20,6 +21,16 @@ class Controller extends Section {
return `Zones/${this.$params.id}/exclusions`;
}
+ get checked() {
+ const geos = this.$.model.data || [];
+ const checkedLines = [];
+ for (let geo of geos) {
+ if (geo.checked)
+ checkedLines.push(geo);
+ }
+ return checkedLines;
+ }
+
refresh() {
this.$.data = null;
this.$.$applyAsync(() => {
@@ -48,33 +59,56 @@ class Controller extends Section {
: this.$t('Everyday');
}
- onSelection(days, type, weekday, events, exclusions) {
+ onSelection(days, type, weekday, events, exclusions, exclusionGeos) {
if (this.editMode == 'include') {
if (events.length)
- this.edit(events[0]);
- else
- this.create(type, days, weekday);
- } else {
- if (exclusions.length)
- this.exclusionDelete(exclusions);
- else
- this.exclusionCreate(days);
+ return this.editInclusion(events[0]);
+ return this.createInclusion(type, days, weekday);
+ } else if (this.editMode == 'exclude') {
+ if (exclusions.length || exclusionGeos.length)
+ return this.editExclusion(exclusions[0] || {}, exclusionGeos);
+ return this.createExclusion(days);
}
}
+ editExclusion(exclusion, exclusionGeos) {
+ this.isNew = false;
+ this.excludeSelected = angular.copy(exclusion);
+ this.excludeSelected.type = exclusionGeos.length ?
+ 'specificLocations' : 'all';
+
+ this.exclusionGeos = new Set();
+ if (exclusionGeos.length) {
+ this.excludeSelected.id = exclusionGeos[0].zoneExclusionFk;
+ exclusionGeos.forEach(x => this.exclusionGeos.add(x.geoFk));
+ }
+
+ this.$.excludeDialog.show();
+ }
+
+ createExclusion(days) {
+ this.isNew = true;
+ this.excludeSelected = {
+ type: 'all',
+ dated: days[0]
+ };
+ this.exclusionGeos = new Set();
+ this.$.excludeDialog.show();
+ }
+
onEditClick(row, event) {
if (event.defaultPrevented) return;
- this.edit(row);
+ this.editInclusion(row);
}
- edit(row) {
+ editInclusion(row) {
this.isNew = false;
this.selected = angular.copy(row);
this.selected.wdays = this.vnWeekDays.fromSet(row.weekDays);
- this.$.dialog.show();
+ this.$.includeDialog.show();
}
- create(type, days, weekday) {
+ createInclusion(type, days, weekday) {
this.isNew = true;
if (type == 'weekday') {
@@ -92,7 +126,7 @@ class Controller extends Section {
};
}
- this.$.dialog.show();
+ this.$.includeDialog.show();
}
onIncludeResponse(response) {
@@ -132,6 +166,19 @@ class Controller extends Section {
}
}
+ onExcludeResponse(response) {
+ const type = this.excludeSelected.type;
+ switch (response) {
+ case 'accept': {
+ if (type == 'all')
+ return this.exclusionCreate();
+ return this.exclusionGeoCreate();
+ }
+ case 'delete':
+ return this.exclusionDelete(this.excludeSelected);
+ }
+ }
+
onDeleteClick(id, event) {
if (event.defaultPrevented) return;
event.preventDefault();
@@ -149,31 +196,121 @@ class Controller extends Section {
.then(() => this.refresh());
}
- exclusionCreate(days) {
- let exclusions = days.map(dated => {
- return {dated};
- });
+ exclusionCreate() {
+ const excludeSelected = this.excludeSelected;
+ const dated = excludeSelected.dated;
+ let req;
- this.$http.post(this.exclusionsPath, exclusions)
+ if (this.isNew)
+ req = this.$http.post(this.exclusionsPath, [{dated}]);
+ if (!this.isNew)
+ req = this.$http.put(`${this.exclusionsPath}/${excludeSelected.id}`, {dated});
+
+ return req.then(() => {
+ this.refresh();
+ });
+ }
+
+ exclusionGeoCreate() {
+ const excludeSelected = this.excludeSelected;
+ let req;
+ const geoIds = [];
+ this.exclusionGeos.forEach(id => geoIds.push(id));
+
+ if (this.isNew) {
+ const params = {
+ zoneFk: parseInt(this.$params.id),
+ date: excludeSelected.dated,
+ geoIds
+ };
+ req = this.$http.post(`Zones/exclusionGeo`, params);
+ } else {
+ const params = {
+ zoneExclusionFk: this.excludeSelected.id,
+ geoIds
+ };
+ req = this.$http.post(`Zones/updateExclusionGeo`, params);
+ }
+ return req.then(() => this.refresh());
+ }
+
+ exclusionDelete(exclusion) {
+ const path = `${this.exclusionsPath}/${exclusion.id}`;
+ return this.$http.delete(path)
.then(() => this.refresh());
}
- exclusionDelete(exclusions) {
- let reqs = [];
+ set excludeSearch(value) {
+ this._excludeSearch = value;
+ if (!value) this.onSearch();
+ }
- for (let exclusion of exclusions) {
- if (!exclusion.id) continue;
- let path = `${this.exclusionsPath}/${exclusion.id}`;
- reqs.push(this.$http.delete(path));
+ get excludeSearch() {
+ return this._excludeSearch;
+ }
+
+ onKeyDown(event) {
+ if (event.key == 'Enter') {
+ event.preventDefault();
+ this.onSearch();
+ }
+ }
+
+ onSearch() {
+ const params = {search: this._excludeSearch};
+ if (this.excludeSelected.type == 'specificLocations') {
+ this.$.model.applyFilter({}, params).then(() => {
+ const data = this.$.model.data;
+ this.getChecked(data);
+ this.$.treeview.data = data;
+ });
+ }
+ }
+
+ onFetch(item) {
+ const params = item ? {parentId: item.id} : null;
+ return this.$.model.applyFilter({}, params).then(() => {
+ const data = this.$.model.data;
+ this.getChecked(data);
+ return data;
+ });
+ }
+
+ onSort(a, b) {
+ if (b.selected !== a.selected) {
+ if (a.selected == null)
+ return 1;
+ if (b.selected == null)
+ return -1;
+ return b.selected - a.selected;
}
- this.$q.all(reqs)
- .then(() => this.refresh());
+ return a.name.localeCompare(b.name);
+ }
+
+ getChecked(data) {
+ for (let geo of data) {
+ geo.checked = this.exclusionGeos.has(geo.id);
+ if (geo.childs) this.getChecked(geo.childs);
+ }
+ }
+
+ onItemCheck(geoId, checked) {
+ if (checked)
+ this.exclusionGeos.add(geoId);
+ else
+ this.exclusionGeos.delete(geoId);
}
}
Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
ngModule.vnComponent('vnZoneEvents', {
template: require('./index.html'),
- controller: Controller
+ controller: Controller,
+ bindings: {
+ zone: '<'
+ },
+ require: {
+ card: '^vnZoneCard'
+ }
});
diff --git a/modules/zone/front/events/index.spec.js b/modules/zone/front/events/index.spec.js
index ed2c91c31..b4ff800d6 100644
--- a/modules/zone/front/events/index.spec.js
+++ b/modules/zone/front/events/index.spec.js
@@ -1,4 +1,5 @@
import './index';
+import crudModel from 'core/mocks/crud-model';
describe('component vnZoneEvents', () => {
let $scope;
@@ -34,7 +35,8 @@ describe('component vnZoneEvents', () => {
const query = `Zones/getEventsFiltered?ended=${date}&started=${date}&zoneFk=${params.zoneFk}`;
const response = {
events: 'myEvents',
- exclusions: 'myExclusions'
+ exclusions: 'myExclusions',
+ geoExclusions: 'myGeoExclusions',
};
$httpBackend.whenGET(query).respond(response);
controller.refresh();
@@ -48,71 +50,129 @@ describe('component vnZoneEvents', () => {
});
describe('onSelection()', () => {
- it('should call the edit() method', () => {
- jest.spyOn(controller, 'edit').mockReturnThis();
+ it('should call the editInclusion() method', () => {
+ jest.spyOn(controller, 'editInclusion').mockReturnThis();
const weekday = {};
const days = [];
const type = 'EventType';
const events = [{name: 'Event'}];
const exclusions = [];
+ const exclusionsGeo = [];
controller.editMode = 'include';
- controller.onSelection(days, type, weekday, events, exclusions);
+ controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
- expect(controller.edit).toHaveBeenCalledWith({name: 'Event'});
+ expect(controller.editInclusion).toHaveBeenCalledWith({name: 'Event'});
});
- it('should call the create() method', () => {
- jest.spyOn(controller, 'create').mockReturnThis();
+ it('should call the createInclusion() method', () => {
+ jest.spyOn(controller, 'createInclusion').mockReturnThis();
const weekday = {dated: new Date()};
const days = [weekday];
const type = 'EventType';
const events = [];
const exclusions = [];
+ const exclusionsGeo = [];
controller.editMode = 'include';
- controller.onSelection(days, type, weekday, events, exclusions);
+ controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
- expect(controller.create).toHaveBeenCalledWith(type, days, weekday);
+ expect(controller.createInclusion).toHaveBeenCalledWith(type, days, weekday);
});
- it('should call the exclusionDelete() method', () => {
- jest.spyOn(controller, 'exclusionDelete').mockReturnThis();
+ it('should call the editExclusion() method with exclusions', () => {
+ jest.spyOn(controller, 'editExclusion').mockReturnThis();
const weekday = {};
const days = [];
const type = 'EventType';
const events = [];
- const exclusions = [{id: 1}];
- controller.editMode = 'delete';
- controller.onSelection(days, type, weekday, events, exclusions);
+ const exclusions = [{name: 'Exclusion'}];
+ const exclusionsGeo = [];
+ controller.editMode = 'exclude';
+ controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
- expect(controller.exclusionDelete).toHaveBeenCalledWith(exclusions);
+ expect(controller.editExclusion).toHaveBeenCalled();
});
- it('should call the exclusionCreate() method', () => {
- jest.spyOn(controller, 'exclusionCreate').mockReturnThis();
+ it('should call the editExclusion() method with exclusionsGeo', () => {
+ jest.spyOn(controller, 'editExclusion').mockReturnThis();
+
+ const weekday = {};
+ const days = [];
+ const type = 'EventType';
+ const events = [];
+ const exclusions = [];
+ const exclusionsGeo = [{name: 'GeoExclusion'}];
+ controller.editMode = 'exclude';
+ controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
+
+ expect(controller.editExclusion).toHaveBeenCalled();
+ });
+
+ it('should call the createExclusion() method', () => {
+ jest.spyOn(controller, 'createExclusion').mockReturnThis();
const weekday = {};
const days = [{dated: new Date()}];
const type = 'EventType';
const events = [];
const exclusions = [];
- controller.editMode = 'delete';
- controller.onSelection(days, type, weekday, events, exclusions);
+ const exclusionsGeo = [];
+ controller.editMode = 'exclude';
+ controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
- expect(controller.exclusionCreate).toHaveBeenCalledWith(days);
+ expect(controller.createExclusion).toHaveBeenCalledWith(days);
});
});
- describe('create()', () => {
- it('shoud set the selected property and then call the dialog show() method', () => {
- controller.$.dialog = {show: jest.fn()};
+ describe('editExclusion()', () => {
+ it('shoud set the excludeSelected.type = "specificLocations" and then call the excludeDialog show() method', () => {
+ controller.$.excludeDialog = {show: jest.fn()};
+
+ const exclusionGeos = [{id: 1}];
+ const exclusions = [];
+
+ controller.editExclusion(exclusions, exclusionGeos);
+
+ expect(controller.excludeSelected.type).toEqual('specificLocations');
+ expect(controller.$.excludeDialog.show).toHaveBeenCalledWith();
+ });
+
+ it('shoud set the excludeSelected.type = "all" and then call the excludeDialog show() method', () => {
+ controller.$.excludeDialog = {show: jest.fn()};
+
+ const exclusionGeos = [];
+ const exclusions = [{id: 1}];
+
+ controller.editExclusion(exclusions, exclusionGeos);
+
+ expect(controller.excludeSelected.type).toEqual('all');
+ expect(controller.$.excludeDialog.show).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('createExclusion()', () => {
+ it('shoud set the excludeSelected property and then call the excludeDialog show() method', () => {
+ controller.$.excludeDialog = {show: jest.fn()};
+
+ const days = [new Date()];
+ controller.createExclusion(days);
+
+ expect(controller.excludeSelected).toBeDefined();
+ expect(controller.isNew).toBeTruthy();
+ expect(controller.$.excludeDialog.show).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('createInclusion()', () => {
+ it('shoud set the selected property and then call the includeDialog show() method', () => {
+ controller.$.includeDialog = {show: jest.fn()};
const type = 'weekday';
const days = [new Date()];
const weekday = 1;
- controller.create(type, days, weekday);
+ controller.createInclusion(type, days, weekday);
const selection = controller.selected;
const firstWeekday = selection.wdays[weekday];
@@ -120,23 +180,23 @@ describe('component vnZoneEvents', () => {
expect(selection.type).toEqual('indefinitely');
expect(firstWeekday).toBeTruthy();
expect(controller.isNew).toBeTruthy();
- expect(controller.$.dialog.show).toHaveBeenCalledWith();
+ expect(controller.$.includeDialog.show).toHaveBeenCalledWith();
});
- it('shoud set the selected property with the first day and then call the dialog show() method', () => {
- controller.$.dialog = {show: jest.fn()};
+ it('shoud set the selected property with the first day and then call the includeDialog show() method', () => {
+ controller.$.includeDialog = {show: jest.fn()};
const type = 'nonListedType';
const days = [new Date()];
const weekday = 1;
- controller.create(type, days, weekday);
+ controller.createInclusion(type, days, weekday);
const selection = controller.selected;
expect(selection.type).toEqual('day');
expect(selection.dated).toEqual(days[0]);
expect(controller.isNew).toBeTruthy();
- expect(controller.$.dialog.show).toHaveBeenCalledWith();
+ expect(controller.$.includeDialog.show).toHaveBeenCalledWith();
});
});
@@ -180,6 +240,35 @@ describe('component vnZoneEvents', () => {
});
});
+ describe('onExcludeResponse()', () => {
+ it('should call the exclusionCreate() method', () => {
+ jest.spyOn(controller, 'exclusionCreate').mockReturnThis();
+
+ controller.excludeSelected = {type: 'all'};
+ controller.onExcludeResponse('accept');
+
+ expect(controller.exclusionCreate).toHaveBeenCalledWith();
+ });
+
+ it('should call the exclusionGeoCreate() method', () => {
+ jest.spyOn(controller, 'exclusionGeoCreate').mockReturnThis();
+
+ controller.excludeSelected = {type: 'specificLocations'};
+ controller.onExcludeResponse('accept');
+
+ expect(controller.exclusionGeoCreate).toHaveBeenCalledWith();
+ });
+
+ it('should call the exclusionDelete() method', () => {
+ jest.spyOn(controller, 'exclusionDelete').mockReturnThis();
+
+ controller.excludeSelected = {id: 1, type: 'all'};
+ controller.onExcludeResponse('delete');
+
+ expect(controller.exclusionDelete).toHaveBeenCalledWith(controller.excludeSelected);
+ });
+ });
+
describe('onDeleteResponse()', () => {
it('shoud make an HTTP DELETE query and then call the refresh() method', () => {
jest.spyOn(controller, 'refresh').mockReturnThis();
@@ -197,9 +286,10 @@ describe('component vnZoneEvents', () => {
it('shoud make an HTTP POST query and then call the refresh() method', () => {
jest.spyOn(controller, 'refresh').mockReturnThis();
- const dates = [new Date()];
+ controller.excludeSelected = {};
+ controller.isNew = true;
$httpBackend.expect('POST', `Zones/1/exclusions`).respond({id: 1});
- controller.exclusionCreate(dates);
+ controller.exclusionCreate();
$httpBackend.flush();
expect(controller.refresh).toHaveBeenCalledWith();
@@ -210,25 +300,41 @@ describe('component vnZoneEvents', () => {
it('shoud make an HTTP DELETE query once and then call the refresh() method', () => {
jest.spyOn(controller, 'refresh').mockReturnThis();
- const exclusions = [{id: 1}];
+ const exclusions = {id: 1};
const firstExclusionId = 1;
- $httpBackend.when('DELETE', `Zones/1/exclusions/${firstExclusionId}`).respond(200);
+ $httpBackend.expectDELETE(`Zones/1/exclusions/${firstExclusionId}`).respond(200);
controller.exclusionDelete(exclusions);
$httpBackend.flush();
expect(controller.refresh).toHaveBeenCalledWith();
});
+ });
- it('shoud make an HTTP DELETE query for every event and then call the refresh() method', () => {
- jest.spyOn(controller, 'refresh').mockReturnThis();
- jest.spyOn(controller.$http, 'delete').mockReturnValue(200);
+ describe('onSearch()', () => {
+ it('should call the applyFilter() method and then set the data', () => {
+ jest.spyOn(controller, 'getChecked').mockReturnValue([1, 2, 3]);
- const exclusions = [{id: 1}, {id: 2}, {id: 3}, {id: 4}];
- controller.exclusionDelete(exclusions);
- $scope.$apply();
+ controller.$.treeview = {};
+ controller.$.model = crudModel;
+ controller.excludeSelected = {type: 'specificLocations'};
+ controller._excludeSearch = 'es';
- expect(controller.$http.delete).toHaveBeenCalledTimes(4);
- expect(controller.refresh).toHaveBeenCalledWith();
+ controller.onSearch();
+ const treeviewData = controller.$.treeview.data;
+
+ expect(treeviewData).toBeDefined();
+ expect(treeviewData.length).toEqual(3);
+ });
+ });
+
+ describe('onFetch()', () => {
+ it('should call the applyFilter() method and then return the model data', () => {
+ jest.spyOn(controller, 'getChecked').mockReturnValue([1, 2, 3]);
+
+ controller.$.model = crudModel;
+ const result = controller.onFetch();
+
+ expect(result.length).toEqual(3);
});
});
});
diff --git a/modules/zone/front/events/locale/es.yml b/modules/zone/front/events/locale/es.yml
index eb581a719..1fb114720 100644
--- a/modules/zone/front/events/locale/es.yml
+++ b/modules/zone/front/events/locale/es.yml
@@ -4,3 +4,7 @@ Exclude: Excluir
Events: Eventos
Add event: Añadir evento
Edit event: Editar evento
+All: Todo
+Specific locations: Localizaciones concretas
+Locations where it is not distributed: Localizaciones en las que no se reparte
+You must select a location: Debes seleccionar una localización
diff --git a/modules/zone/front/events/style.scss b/modules/zone/front/events/style.scss
new file mode 100644
index 000000000..49a6e87a6
--- /dev/null
+++ b/modules/zone/front/events/style.scss
@@ -0,0 +1,11 @@
+@import "variables";
+
+ .width{
+ width: 600px
+ }
+
+ .treeview{
+ max-height: 300px;
+ overflow: auto;
+ }
+
diff --git a/modules/zone/front/location/style.scss b/modules/zone/front/location/style.scss
index 2316a2622..24d685a51 100644
--- a/modules/zone/front/location/style.scss
+++ b/modules/zone/front/location/style.scss
@@ -1,19 +1,21 @@
@import "variables";
-vn-treeview-child {
- .content > .vn-check:not(.indeterminate):not(.checked) {
- color: $color-alert;
+vn-zone-location {
+ vn-treeview-child {
+ .content > .vn-check:not(.indeterminate):not(.checked) {
+ color: $color-alert;
- & > .btn {
- border-color: $color-alert;
+ & > .btn {
+ border-color: $color-alert;
+ }
+ }
+ .content > .vn-check.checked {
+ color: $color-notice;
+
+ & > .btn {
+ background-color: $color-notice;
+ border-color: $color-notice
+ }
}
}
- .content > .vn-check.checked {
- color: $color-notice;
-
- & > .btn {
- background-color: $color-notice;
- border-color: $color-notice
- }
- }
-}
\ No newline at end of file
+}
diff --git a/modules/zone/front/routes.json b/modules/zone/front/routes.json
index e08f97314..7f67260da 100644
--- a/modules/zone/front/routes.json
+++ b/modules/zone/front/routes.json
@@ -85,10 +85,13 @@
"description": "Warehouses"
},
{
- "url": "/events",
+ "url": "/events?q",
"state": "zone.card.events",
"component": "vn-zone-events",
- "description": "Calendar"
+ "description": "Calendar",
+ "params": {
+ "zone": "$ctrl.zone"
+ }
},
{
"url": "/location?q",
diff --git a/print/templates/email/letter-debtor-nd/sql/client.sql b/print/templates/email/letter-debtor-nd/sql/client.sql
index aad907a4b..479bfac5e 100644
--- a/print/templates/email/letter-debtor-nd/sql/client.sql
+++ b/print/templates/email/letter-debtor-nd/sql/client.sql
@@ -5,6 +5,7 @@ SELECT
be.name AS bankName
FROM client c
JOIN company AS cny
- JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk
+ JOIN supplierAccount AS sa ON
+ IF (ct.code = 'PT', sa.id = 907, sa.id = cny.supplierAccountFk)
JOIN bankEntity be ON be.id = sa.bankEntityFk
WHERE c.id = ? AND cny.id = ?
\ No newline at end of file
diff --git a/print/templates/email/letter-debtor-st/sql/client.sql b/print/templates/email/letter-debtor-st/sql/client.sql
index aad907a4b..479bfac5e 100644
--- a/print/templates/email/letter-debtor-st/sql/client.sql
+++ b/print/templates/email/letter-debtor-st/sql/client.sql
@@ -5,6 +5,7 @@ SELECT
be.name AS bankName
FROM client c
JOIN company AS cny
- JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk
+ JOIN supplierAccount AS sa ON
+ IF (ct.code = 'PT', sa.id = 907, sa.id = cny.supplierAccountFk)
JOIN bankEntity be ON be.id = sa.bankEntityFk
WHERE c.id = ? AND cny.id = ?
\ No newline at end of file
diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js
index 9843d6bb7..4dad5dfff 100755
--- a/print/templates/reports/extra-community/extra-community.js
+++ b/print/templates/reports/extra-community/extra-community.js
@@ -12,7 +12,7 @@ module.exports = {
shippedFrom: this.shippedStart,
continent: this.continent,
id: this.id,
- agencyFk: this.agencyFk,
+ agencyModeFk: this.agencyModeFk,
warehouseInFk: this.warehouseInFk,
warehouseOutFk: this.warehouseOutFk,
totalEntries: this.totalEntries,
@@ -68,7 +68,7 @@ module.exports = {
return {'t.ref': {like: `%${value}%`}};
case 'id':
return `t.id = ${value}`;
- case 'agencyFk':
+ case 'agencyModeFk':
return `am.id = ${value}`;
case 'warehouseOutFk':
return `wo.id = ${value}`;
@@ -101,7 +101,7 @@ module.exports = {
'continent',
'ref',
'id',
- 'agencyFk',
+ 'agencyModeFk',
'warehouseOutFk',
'warehouseInFk',
'totalEntries',
diff --git a/print/templates/reports/extra-community/sql/travels.sql b/print/templates/reports/extra-community/sql/travels.sql
index 167c8b1f8..f8a4e0142 100644
--- a/print/templates/reports/extra-community/sql/travels.sql
+++ b/print/templates/reports/extra-community/sql/travels.sql
@@ -19,4 +19,4 @@ FROM travel t
JOIN warehouse wo ON wo.id = t.warehouseOutFk
JOIN country c ON c.id = wo.countryFk
LEFT JOIN continent cnt ON cnt.id = c.continentFk
- JOIN agencyMode am ON am.id = t.agencyFk
\ No newline at end of file
+ JOIN agencyMode am ON am.id = t.agencyModeFk
\ No newline at end of file
diff --git a/print/templates/reports/invoice/sql/taxes.sql b/print/templates/reports/invoice/sql/taxes.sql
index 2203d8b8a..5c04d2c74 100644
--- a/print/templates/reports/invoice/sql/taxes.sql
+++ b/print/templates/reports/invoice/sql/taxes.sql
@@ -7,6 +7,5 @@ SELECT
JOIN pgc ON pgc.code = iot.pgcFk
LEFT JOIN pgcEqu pe ON pe.equFk = pgc.code
JOIN invoiceOut io ON io.id = iot.invoiceOutFk
- LEFT JOIN ticket t ON t.refFk = io.ref
- WHERE t.refFk = ?
+ WHERE io.ref = ?
ORDER BY iot.id
\ No newline at end of file
diff --git a/print/templates/reports/item-label/locale/es.yml b/print/templates/reports/item-label/locale/es.yml
new file mode 100644
index 000000000..278946f3e
--- /dev/null
+++ b/print/templates/reports/item-label/locale/es.yml
@@ -0,0 +1 @@
+reportName: Etiqueta
\ No newline at end of file