Merge branch 'dev' into 5635-contadotTicketExpedition

CHANGELOG.md

@@ -5,18 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2322.01] - 2023-06-08
+## [2324.01] - 2023-06-08
+
+### Added
+-
+
+
+### Changed
+-
+
+### Fixed
+-
+
+
+
+## [2322.01] - 2023-06-01
 
 ### Added
 - (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
-
-
+- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
+- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
 
 ### Changed
 - (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
 - (Tickets -> Expediciones) Interfaz mejorada y contador añadido
 ### Fixed
 - (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
+- (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados
 
 
 
@@ -39,10 +54,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Usuarios -> Histórico) Nueva sección
 - (Roles -> Histórico) Nueva sección
-- (General -> Traducciones) Correo de bienvenida a clientes al portugués y al francés
+- (Trabajadores -> Dar de alta) Permite elegir el método de pago
 
 ### Changed
 - (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
+- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
 
 ### Fixed
 - (Ticket -> Boxing) Arreglado selección de horas

back/methods/docuware/deliveryNoteEmail.js

@@ -58,7 +58,10 @@ module.exports = Self => {
         for (const param in args)
             params[param] = args[param];
 
-        if (!recipient) params.recipient = models.Client.findById(recipientId, {fields: ['email']});
+        if (!recipient) {
+            client = await models.Client.findById(recipientId, {fields: ['email']});
+            params.recipient = client.email;
+        }
 
         const email = new Email('delivery-note', params);
 

back/methods/edi/sql/item.sql

@@ -1,9 +1,9 @@
 LOAD DATA LOCAL INFILE ?
 	INTO TABLE `edi`.`item`
+	CHARACTER SET ascii
 	FIELDS TERMINATED BY ';'
 	LINES TERMINATED BY '\n' (@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11, @col12)
-	SET
-		id = @col2,
+	SET id = @col2,
 		product_name = @col4,
 		name = @col5,
 		plant_id = @col7,
@@ -11,3 +11,4 @@ LOAD DATA LOCAL INFILE ?
 		entry_date = STR_TO_DATE(@col10, '%Y%m%d'),
 		expiry_date = IFNULL(NULL,STR_TO_DATE(@col11, '%Y%m%d')),
 		change_date_time = STR_TO_DATE(@col12, '%Y%m%d%H%i')
+		

back/methods/edi/updateData.js

@@ -3,236 +3,237 @@ const path = require('path');
 const fs = require('fs-extra');
 
 module.exports = Self => {
-    Self.remoteMethodCtx('updateData', {
-        description: 'Updates schema data from external provider',
-        accessType: 'WRITE',
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/updateData`,
-            verb: 'POST'
-        }
-    });
+	Self.remoteMethodCtx('updateData', {
+		description: 'Updates schema data from external provider',
+		accessType: 'WRITE',
+		returns: {
+			type: 'object',
+			root: true
+		},
+		http: {
+			path: `/updateData`,
+			verb: 'POST'
+		}
+	});
 
-    Self.updateData = async() => {
-        const models = Self.app.models;
+	Self.updateData = async() => {
+		const models = Self.app.models;
 
-        // Get files checksum
-        const tx = await Self.beginTransaction({});
+		// Get files checksum
+		const tx = await Self.beginTransaction({});
 
-        try {
-            const options = {transaction: tx};
-            const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
+		try {
+			const options = {transaction: tx};
+			const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
 
-            const updatableFiles = [];
-            for (const file of files) {
-                const fileChecksum = await getChecksum(file);
+			const updatableFiles = [];
+			for (const file of files) {
+				const fileChecksum = await getChecksum(file);
 
-                if (file.checksum != fileChecksum) {
-                    updatableFiles.push({
-                        name: file.name,
-                        checksum: fileChecksum
-                    });
-                } else
-                    console.debug(`File already updated, skipping...`);
-            }
+				if (file.checksum != fileChecksum) {
+					updatableFiles.push({
+						name: file.name,
+						checksum: fileChecksum
+					});
+				} else
+					console.debug(`File already updated, skipping...`);
+			}
 
-            if (updatableFiles.length === 0)
-                return false;
+			if (updatableFiles.length === 0)
+				return false;
 
-            // Download files
-            const container = await models.TempContainer.container('edi');
-            const tempPath = path.join(container.client.root, container.name);
+			// Download files
+			const container = await models.TempContainer.container('edi');
+			const tempPath = path.join(container.client.root, container.name);
 
-            let remoteFile;
-            let tempDir;
-            let tempFile;
+			let remoteFile;
+			let tempDir;
+			let tempFile;
 
-            const fileNames = updatableFiles.map(file => file.name);
+			const fileNames = updatableFiles.map(file => file.name);
 
-            const tables = await Self.rawSql(`
-                SELECT fileName, toTable, file
-                    FROM edi.tableConfig
-                WHERE file IN (?)`, [fileNames], options);
+			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;
+			for (const table of tables) {
+				const fileName = table.file;
 
-                remoteFile = `codes/${fileName}.ZIP`;
-                tempDir = `${tempPath}/${fileName}`;
-                tempFile = `${tempPath}/${fileName}.zip`;
+				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;
-                    }
-                }
+				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);
+				await extractFile(fileName, tempFile, tempDir);
 
-                console.debug(`Updating table ${table.toTable}...`);
-                await dumpData(tempDir, table, options);
-            }
+				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);
-            }
+			// 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();
+			await tx.commit();
 
-            // Clean files
-            try {
-                console.debug(`Cleaning files...`);
-                await fs.remove(tempPath);
-            } catch (error) {
-                if (error.code !== 'ENOENT')
-                    throw e;
-            }
+			// Clean files
+			try {
+				console.debug(`Cleaning files...`);
+				await fs.remove(tempPath);
+			} catch (error) {
+				if (error.code !== 'ENOENT')
+					throw e;
+			}
 
-            return true;
-        } catch (error) {
-            await tx.rollback();
-            throw error;
-        }
-    };
+			return true;
+		} catch (error) {
+			await tx.rollback();
+			throw error;
+		}
+	};
 
-    let ftpClient;
-    async function getFtpClient() {
-        if (!ftpClient) {
-            const [ftpConfig] = await Self.rawSql('SELECT host, user, password FROM edi.ftpConfig');
-            console.debug(`Openning FTP connection to ${ftpConfig.host}...\n`);
+	let ftpClient;
+	async function getFtpClient() {
+		if (!ftpClient) {
+			const [ftpConfig] = await Self.rawSql('SELECT host, user, password FROM edi.ftpConfig');
+			console.debug(`Openning FTP connection to ${ftpConfig.host}...\n`);
 
-            const FtpClient = require('ftps');
+			const FtpClient = require('ftps');
 
-            ftpClient = new FtpClient({
-                host: ftpConfig.host,
-                username: ftpConfig.user,
-                password: ftpConfig.password,
-                procotol: 'ftp'
-            });
-        }
+			ftpClient = new FtpClient({
+				host: ftpConfig.host,
+				username: ftpConfig.user,
+				password: ftpConfig.password,
+				procotol: 'ftp',
+				additionalLftpCommands: 'set ssl:verify-certificate no'
+			});
+		}
 
-        return ftpClient;
-    }
+		return ftpClient;
+	}
 
-    async function getChecksum(file) {
-        const ftpClient = await getFtpClient();
-        console.debug(`Checking checksum for file ${file.name}...`);
+	async function getChecksum(file) {
+		const ftpClient = await getFtpClient();
+		console.debug(`Checking checksum for file ${file.name}...`);
 
-        ftpClient.cat(`codes/${file.name}.txt`);
+		ftpClient.cat(`codes/${file.name}.TXT`);
 
-        const response = await new Promise((resolve, reject) => {
-            ftpClient.exec((err, response) => {
-                if (err || response.error) {
-                    console.debug(`Error downloading checksum file... ${response.error}`);
-                    return reject(err);
-                }
+		const response = await new Promise((resolve, reject) => {
+			ftpClient.exec((err, response) => {
+				if (err || response.error) {
+					console.debug(`Error downloading checksum file... ${response.error}`);
+					return reject(err);
+				}
 
-                resolve(response);
-            });
-        });
+				resolve(response);
+			});
+		});
 
-        if (response && response.data) {
-            const fileContents = response.data;
-            const rows = fileContents.split('\n');
-            const row = rows[4];
-            const columns = row.split(/\s+/);
+		if (response && response.data) {
+			const fileContents = response.data;
+			const rows = fileContents.split('\n');
+			const row = rows[4];
+			const columns = row.split(/\s+/);
 
-            let fileChecksum;
-            if (file.keyValue)
-                fileChecksum = columns[1];
+			let fileChecksum;
+			if (file.keyValue)
+				fileChecksum = columns[1];
 
-            if (!file.keyValue)
-                fileChecksum = columns[0];
+			if (!file.keyValue)
+				fileChecksum = columns[0];
 
-            return fileChecksum;
-        }
-    }
+			return fileChecksum;
+		}
+	}
 
-    async function downloadFile(remoteFile, tempFile) {
-        const ftpClient = await getFtpClient();
+	async function downloadFile(remoteFile, tempFile) {
+		const ftpClient = await getFtpClient();
 
-        ftpClient.get(remoteFile, tempFile);
+		ftpClient.get(remoteFile, tempFile);
 
-        return new Promise((resolve, reject) => {
-            ftpClient.exec((err, response) => {
-                if (err || response.error) {
-                    console.debug(`Error downloading file... ${response.error}`);
-                    return reject(err);
-                }
+		return new Promise((resolve, reject) => {
+			ftpClient.exec((err, response) => {
+				if (err || response.error) {
+					console.debug(`Error downloading file... ${response.error}`);
+					return reject(err);
+				}
 
-                resolve(response);
-            });
-        });
-    }
+				resolve(response);
+			});
+		});
+	}
 
-    async function extractFile(fileName, tempFile, tempDir) {
-        const JSZip = require('jszip');
+	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;
-        }
+		try {
+			await fs.mkdir(tempDir);
+			console.debug(`Extracting file ${fileName}...`);
+		} catch (error) {
+			if (error.code !== 'EEXIST')
+				throw e;
+		}
 
-        const fileStream = await fs.readFile(tempFile);
-        if (fileStream) {
-            const zip = new JSZip();
-            const zipContents = await zip.loadAsync(fileStream);
+		const fileStream = await fs.readFile(tempFile);
+		if (fileStream) {
+			const zip = new JSZip();
+			const zipContents = await zip.loadAsync(fileStream);
 
-            if (!zipContents) return;
+			if (!zipContents) return;
 
-            const fileNames = Object.keys(zipContents.files);
+			const fileNames = Object.keys(zipContents.files);
 
-            for (const fileName of fileNames) {
-                const fileContent = await zip.file(fileName).async('nodebuffer');
-                const dest = path.join(tempDir, fileName);
-                await fs.writeFile(dest, fileContent);
-            }
-        }
-    }
+			for (const fileName of fileNames) {
+				const fileContent = await zip.file(fileName).async('nodebuffer');
+				const dest = path.join(tempDir, fileName);
+				await fs.writeFile(dest, fileContent);
+			}
+		}
+	}
 
-    async function dumpData(tempDir, table, options) {
-        const toTable = table.toTable;
-        const baseName = table.fileName;
+	async function dumpData(tempDir, table, options) {
+		const toTable = table.toTable;
+		const baseName = table.fileName;
 
-        console.log(`Emptying table ${toTable}...`);
-        const tableName = `edi.${toTable}`;
-        await Self.rawSql(`DELETE FROM ??`, [tableName]);
+		console.log(`Emptying table ${toTable}...`);
+		const tableName = `edi.${toTable}`;
+		await Self.rawSql(`DELETE FROM ??`, [tableName]);
 
-        const dirFiles = await fs.readdir(tempDir);
-        const files = dirFiles.filter(file => file.startsWith(baseName));
+		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}...`);
+		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);
+			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(`
-                        UPDATE edi.tableConfig
-                            SET updated = ?
-                        WHERE fileName = ?
-                `, [Date.vnNew(), baseName], options);
-        }
+			await Self.rawSql(sqlTemplate, [filePath], options);
+			await Self.rawSql(`
+						UPDATE edi.tableConfig
+							SET updated = ?
+						WHERE fileName = ?
+				`, [Date.vnNew(), baseName], options);
+		}
 
-        console.log(`Updated table ${toTable}\n`);
-    }
+		console.log(`Updated table ${toTable}\n`);
+	}
 };

back/methods/image/download.js

@@ -67,7 +67,7 @@ module.exports = Self => {
 
         if (!image) return false;
 
-        const hasReadRole = models.ImageCollection.hasReadRole(ctx, collection);
+        const hasReadRole = await models.ImageCollection.hasReadRole(ctx, collection);
         if (!hasReadRole)
             throw new UserError(`You don't have enough privileges`);
 

back/models/dms-type.json

@@ -44,4 +44,4 @@
         "principalId": "$everyone",
         "permission": "ALLOW"
     }]
-}
+}

back/models/image-collection.js

@@ -9,10 +9,11 @@ module.exports = Self => {
      * @return {boolean} True for user with read privileges
      */
     Self.hasReadRole = async(ctx, name, options) => {
-        const collection = await Self.findOne({where: {name}}, {
+        const collection = await Self.findOne({
             include: {
                 relation: 'readRole'
-            }
+            },
+            where: {name}
         }, options);
 
         return await hasRole(ctx, collection, options);

db/changes/231201/00-wagon.sql

@@ -56,8 +56,6 @@ CREATE TABLE `vn`.`collectionWagonTicket` (
 
 ALTER TABLE `vn`.`wagon` ADD `typeFk` int(11) unsigned NOT NULL;
 ALTER TABLE `vn`.`wagon` ADD `label` int(11) unsigned NOT NULL;
-ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;
-
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('WagonType', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
@@ -70,3 +68,4 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
         ('WagonType', 'createWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'),
         ('WagonType', 'deleteWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'),
         ('WagonType', 'editWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi');
+

db/changes/231801/00-client_setRatingAcl.sql

@@ -27,7 +27,6 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
 		('Client', 'summary', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'updateAddress', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'updateFiscalData', '*', 'ALLOW', 'ROLE', 'employee'),
-		('Client', 'updateUser', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'uploadFile', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'campaignMetricsPdf', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'campaignMetricsEmail', '*', 'ALLOW', 'ROLE', 'employee'),

db/changes/232001/00-wagon.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;

db/changes/232201/00-workerConfigPayMethod.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`workerConfig` ADD payMethodFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK FOREIGN KEY (roleFk) REFERENCES account.`role`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK_1 FOREIGN KEY (payMethodFk) REFERENCES `vn`.`payMethod`(id) ON DELETE SET NULL ON UPDATE CASCADE;
+
+UPDATE `vn`.`workerConfig`
+    SET payMethodFk = 4
+    WHERE id=1;

db/changes/232401/00-buyConfig_travelConfig.sql

@@ -0,0 +1,28 @@
+CREATE TABLE `vn`.`buyConfig` (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `monthsAgo` int(11) NOT NULL DEFAULT 6 COMMENT 'Meses desde la última compra',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE `vn`.`travelConfig` (
+    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+    `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen',
+    `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino',
+    `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto',
+    `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto',
+    PRIMARY KEY (`id`),
+    KEY `travelConfig_FK` (`warehouseInFk`),
+    KEY `travelConfig_FK_1` (`warehouseOutFk`),
+    KEY `travelConfig_FK_2` (`agencyFk`),
+    KEY `travelConfig_FK_3` (`companyFk`),
+    CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Entry', 'addFromPackaging', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Entry', 'addFromBuy', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Supplier', 'getItemsPackaging', 'READ', 'ALLOW', 'ROLE', 'production');

db/changes/232401/00-useSpecificsAcls.sql

@@ -0,0 +1,121 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),
+        ('State', 'isSomeEditable', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('State', 'isAllEditable', 'READ', 'ALLOW', 'ROLE', 'production'),
+        ('State', 'isAllEditable', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('Agency', 'seeExpired', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('Agency', 'seeExpired', 'READ', 'ALLOW', 'ROLE', 'productionBoss'),
+        ('Claim', 'createAfterDeadline', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Client', 'editAddressLogifloraAllowed', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Client', 'editFiscalDataWithoutTaxDataCheck', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Client', 'editVerifiedDataWithoutTaxDataCheck', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Client', 'editCredit', 'WRITE', 'ALLOW', 'ROLE', 'financialBoss'),
+        ('Client', 'isNotEditableCredit', 'WRITE', 'ALLOW', 'ROLE', 'financialBoss'),
+        ('InvoiceOut', 'canCreatePdf', 'WRITE', 'ALLOW', 'ROLE', 'invoicing'),
+        ('Supplier', 'editPayMethodCheck', 'WRITE', 'ALLOW', 'ROLE', 'financial'),
+        ('Worker', 'isTeamBoss', 'WRITE', 'ALLOW', 'ROLE', 'teamBoss'),
+        ('Worker', 'forceIsSubordinate', 'READ', 'ALLOW', 'ROLE', 'hr'),
+        ('Claim', 'editState', 'WRITE', 'ALLOW', 'ROLE', 'claimManager');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Claim'
+        AND property = '*'
+        AND accessType = '*';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Claim', 'find', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'findById', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'findOne', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'getSummary', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'updateClaim', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'regularizeClaim', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'updateClaimDestination', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'downloadFile', 'READ', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'filter', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'logs', 'READ', 'ALLOW', 'ROLE', 'claimManager');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Ticket'
+        AND property = '*'
+        AND accessType = '*';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Ticket', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getVolume', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getTotalVolume', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'summary', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'priceDifference', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'componentUpdate', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'new', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'isEditable', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'setDeleted', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'restore', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getSales', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getSalesPersonMana', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'makeInvoice', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'updateEditableTicket', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'updateDiscount', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'transferSales', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'sendSms', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'isLocked', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'freightCost', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getComponentsSum', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'delivery'), -- Change Priority in Route tickets
+        ('Ticket', 'deliveryNoteCsv', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'State'
+        AND property = '*'
+        AND accessType = 'READ';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('State', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('State', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('State', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Worker'
+        AND property = '*'
+        AND accessType = 'READ';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Worker', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'getWorkedHours', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'active', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'activeWithRole', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'uploadFile', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+        ('Worker', 'contracts', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'holidays', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'activeContract', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'activeWithInheritedRole', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'Client'
+        AND property = 'updateUser'
+        AND accessType = '*';

db/dump/fixtures.sql

@@ -905,7 +905,7 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
 INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
     VALUES
-        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT',   0,  NULL,   'V',  0, 15,3),
+        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'EMB',   0,  NULL,   'V',  0, 15,3),
         (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
         (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, 5,5),
         (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
@@ -2332,26 +2332,26 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
 
 INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`, `code`)
     VALUES
-        (1,  'Facturas Recibidas',   'recibidas',       NULL,   NULL, 'invoiceIn'),
-        (2,  'Doc oficial',          'oficial',         NULL,   NULL, 'officialDoc'),
-        (3,  'Laboral',              'laboral',         37,     37, 'hhrrData'),
-        (4,  'Albaranes recibidos',  'entradas',        NULL,   NULL, 'deliveryNote'),
-        (5,  'Otros',                'otros',           1,      1,    'miscellaneous'),
-        (6,  'Pruebas',              'pruebas',         NULL,   NULL, 'tests'),
-        (7,  'IAE Clientes',         'IAE_Clientes',    1,      1, 'economicActivitiesTax'),
-        (8,  'Fiscal',               'fiscal',          NULL,   NULL, 'fiscal'),
-        (9,  'Vehiculos',            'vehiculos',       NULL,   NULL, 'vehicles'),
-        (10, 'Plantillas',           'plantillas',      NULL,   NULL, 'templates'),
-        (11, 'Contratos',            'contratos',       NULL,   NULL, 'contracts'),
-        (12, 'ley de pagos',         'ley pagos',       1,      1,    'paymentsLaw'),
-        (13, 'Basura',               'basura',          1,      1,    'trash'),
-        (14, 'Ticket',               'tickets',         1,      1,    'ticket'),
-        (15, 'Presupuestos',         'Presupuestos',    NULL,   NULL, 'budgets'),
-        (16, 'Logistica',            'logistica',       NULL,   NULL, 'logistics'),
-        (17, 'cmr',                  'cmr',             NULL,   NULL, 'cmr'),
-        (18, 'dua',                  'dua',             NULL,   NULL, 'dua'),
-        (19, 'inmovilizado',         'inmovilizado',    NULL,   NULL, 'fixedAssets'),
-        (20, 'Reclamación',          'reclamacion',     1,      1, 'claim');
+        (1,  'Facturas Recibidas',   'recibidas',       NULL,   NULL,   'invoiceIn'),
+        (2,  'Doc oficial',          'oficial',         NULL,   NULL,   'officialDoc'),
+        (3,  'Laboral',              'laboral',         37,     37,     'hhrrData'),
+        (4,  'Albaranes recibidos',  'entradas',        NULL,   NULL,   'deliveryNote'),
+        (5,  'Otros',                'otros',           1,      1,      'miscellaneous'),
+        (6,  'Pruebas',              'pruebas',         NULL,   NULL,   'tests'),
+        (7,  'IAE Clientes',         'IAE_Clientes',    1,      1,      'economicActivitiesTax'),
+        (8,  'Fiscal',               'fiscal',          NULL,   NULL,   'fiscal'),
+        (9,  'Vehiculos',            'vehiculos',       NULL,   NULL,   'vehicles'),
+        (10, 'Plantillas',           'plantillas',      NULL,   NULL,   'templates'),
+        (11, 'Contratos',            'contratos',       NULL,   NULL,   'contracts'),
+        (12, 'ley de pagos',         'ley pagos',       1,      1,      'paymentsLaw'),
+        (13, 'Basura',               'basura',          1,      1,      'trash'),
+        (14, 'Ticket',               'tickets',         1,      1,      'ticket'),
+        (15, 'Presupuestos',         'Presupuestos',    NULL,   NULL,   'budgets'),
+        (16, 'Logistica',            'logistica',       NULL,   NULL,   'logistics'),
+        (17, 'cmr',                  'cmr',             NULL,   NULL,   'cmr'),
+        (18, 'dua',                  'dua',             NULL,   NULL,   'dua'),
+        (19, 'inmovilizado',         'inmovilizado',    NULL,   NULL,   'fixedAssets'),
+        (20, 'Reclamación',          'reclamacion',     1,      1,      'claim');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2824,9 +2824,9 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);
 
-INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `businessTypeFk`)
+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk`, `businessTypeFk`)
     VALUES
-        (1, NULL, 1, 'worker');
+        (1, NULL, 1, 4, 'worker');
 
 INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
     VALUES
@@ -2886,6 +2886,10 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
         (2, 1, 50, 2),
         (3, 1, 0, 3);
 
+INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`)
+    VALUES
+        (1, 1, 1, 1, 442);
 
-
-
+INSERT INTO `vn`.`buyConfig` (`id`, `monthsAgo`)
+    VALUES
+        (1, 6);

db/dump/structure.sql

@@ -61943,141 +61943,204 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getBalance`(vItemFk int, vWarehouseFk int, vDate DATETIME)
 BEGIN
-    DECLARE vDateInventory DATETIME;
-    DECLARE vCurdate DATE DEFAULT util.VN_CURDATE();
-    DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
+/**
+ * @vItemFk item a buscar
+ * @vWarehouseFk almacen donde buscar
+ * @vDate Si la fecha es null, muestra el histórico desde el inventario. Si la fecha no es null, muestra histórico desde la fecha pasada.
+ */
+	DECLARE vDateInventory DATETIME;
+	DECLARE vInvCalculated INT;
 
-    SELECT inventoried INTO vDateInventory FROM config;
-    SET @a = 0;
-    SET @currentLineFk = 0;
-    SET @shipped = '';
+	IF vDate IS NULL THEN
+		SELECT inventoried INTO vDateInventory
+			FROM config;
+	ELSE
+		SELECT mockUtcTime INTO vDateInventory
+			FROM util.config;
+	END IF;
 
-    SELECT DATE(@shipped:= shipped) shipped,
-        alertLevel,
-        stateName,
-        origin,
-        reference,
-        clientFk,
-        name,
-        `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)),
-                        lineFk,@currentLineFk) lastPreparedLineFk,
-        isTicket,
-        lineFk,
-        isPicked,
-        clientType,
-        claimFk
-        FROM
-            ( SELECT  tr.landed AS shipped,
-                    b.quantity AS `in`,
-                    NULL AS `out`,
-                    al.id AS alertLevel,
-                    st.name AS stateName,
-                    s.name AS name,
-                    e.invoiceNumber AS reference,
-                    e.id AS origin,
-                    s.id AS clientFk,
-                    IF(al.id = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id lineFk,
-                    NULL `order`,
-                    NULL AS clientType,
-                    NULL AS claimFk
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    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
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.landed >= vDateInventory
-                    AND vWarehouse = tr.warehouseInFk
-                    AND b.itemFk = vItemId
-                    AND e.isExcludedFromAvailable = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
+	CREATE OR REPLACE TEMPORARY TABLE itemDiary(
+		shipped DATE,
+		`in` INT(11),
+		`out` INT(11),
+		alertLevel INT(11),
+		stateName VARCHAR(20),
+		`name` VARCHAR(50),
+		reference VARCHAR(50),
+		origin INT(11),
+		clientFk INT(11),
+		isPicked INT(11),
+		isTicket TINYINT(1),
+		lineFk INT(11),
+		`order` TINYINT(3) UNSIGNED,
+		clientType VARCHAR(20),
+		claimFk INT(10) UNSIGNED
+	);
 
-            SELECT tr.shipped,
-                    NULL,
-                    b.quantity,
-                    al.id,
-                    st.name,
-                    s.name,
-                    e.invoiceNumber,
-                    e.id,
-                    s.id,
-                    IF(al.id = 3, TRUE, FALSE),
-                    FALSE,
-                    b.id,
-                    NULL,
-                    NULL,
-                    NULL
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN warehouse w ON w.id = tr.warehouseOutFk
-                    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
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.shipped >= vDateInventory
-                    AND vWarehouse =tr.warehouseOutFk
-                    AND s.id <> 4
-                    AND b.itemFk = vItemId
-                    AND e.isExcludedFromAvailable = FALSE
-                    AND w.isFeedStock = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
+	INSERT INTO itemDiary
+	SELECT tr.landed shipped,
+					b.quantity `in`,
+					NULL `out`,
+					al.id alertLevel,
+					st.name stateName,
+					s.name `name`,
+					e.invoiceNumber reference,
+					e.id origin,
+					s.id clientFk,
+					IF(al.code = 'DELIVERED', TRUE, FALSE) isPicked,
+					FALSE isTicket,
+					b.id lineFk,
+					NULL `order`,
+					NULL clientType,
+					NULL claimFk
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN supplier s ON s.id = e.supplierFk
+					JOIN alertLevel al ON al.code =
+						CASE
+							WHEN tr.landed < util.VN_CURDATE() THEN 'DELIVERED'
+							WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
+							ELSE 'FREE'
+						END
+					JOIN state st ON st.code = al.code
+				WHERE tr.landed >= vDateInventory
+					AND vWarehouseFk = tr.warehouseInFk
+					AND b.itemFk = vItemFk
+					AND e.isExcludedFromAvailable = FALSE
+					AND e.isRaid = FALSE
+			UNION ALL
+			SELECT tr.shipped,
+					NULL,
+					b.quantity,
+					al.id,
+					st.name,
+					s.name,
+					e.invoiceNumber,
+					e.id,
+					s.id,
+					IF(al.code = 'DELIVERED', TRUE, FALSE),
+					FALSE,
+					b.id,
+					NULL,
+					NULL,
+					NULL
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN supplier s ON s.id = e.supplierFk
+					JOIN alertLevel al ON al.code =
+						CASE
+							WHEN tr.shipped < util.VN_CURDATE() THEN 'DELIVERED'
+							WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
+							ELSE 'FREE'
+						END
+					JOIN state st ON st.code = al.code
+					JOIN entryConfig ec
+				WHERE tr.shipped >= vDateInventory
+					AND vWarehouseFk =tr.warehouseOutFk
+					AND s.id <> ec.inventorySupplierFk
+					AND b.itemFk = vItemFk
+					AND e.isExcludedFromAvailable = FALSE
+					AND w.isFeedStock = FALSE
+					AND e.isRaid = FALSE
+			UNION ALL
+			SELECT DATE(t.shipped),
+				NULL,
+				s.quantity,
+				al3.id,
+				st.name,
+				t.nickname,
+				t.refFk,
+				t.id,
+				t.clientFk,
+				stk.id,
+				TRUE,
+				s.id,
+				st.`order`,
+				ct.code,
+				cb.claimFk
+			FROM sale s
+				JOIN ticket t ON t.id = s.ticketFk
+				LEFT JOIN ticketState ts ON ts.ticket = t.id
+				LEFT JOIN state st ON st.code = ts.code
+				JOIN client c ON c.id = t.clientFk
+				JOIN clientType ct ON ct.id = c.clientTypeFk
+                JOIN alertLevel al  ON al.code = 'DELIVERED'
+				JOIN alertLevel al2  ON al2.code = 'FREE'
+                JOIN alertLevel al3 ON al3.id =
+                    CASE
+                        WHEN t.shipped < util.VN_CURDATE() THEN al.code
+                        WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN al2.code
+                        ELSE IFNULL(ts.alertLevel, al2.code)
+                    END
+				LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+				LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
+				LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
+			WHERE t.shipped >= vDateInventory
+				AND s.itemFk = vItemFk
+				AND vWarehouseFk =t.warehouseFk
+			ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC;
 
-            SELECT DATE(t.shipped),
-                NULL,
-                s.quantity,
-                al.id,
-                st.name,
-                t.nickname,
-                t.refFk,
-                t.id,
-                t.clientFk,
-                stk.id,
-                TRUE,
-                s.id,
-                st.`order`,
-                ct.code,
-                cb.claimFk
-                FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk
-                    LEFT JOIN ticketState ts ON ts.ticket = t.id
-                    LEFT JOIN state st ON st.code = ts.code
-                    JOIN client c ON c.id = t.clientFk
-                    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
-                            ELSE IFNULL(ts.alertLevel, 0)
-                        END
-                    LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-                    LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
-                    LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
-                WHERE t.shipped >= vDateInventory
-                    AND s.itemFk = vItemId
-                    AND vWarehouse =t.warehouseFk
-                ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
-            ) AS itemDiary;
+	IF vDate IS NULL THEN
+		SET @a = 0;
+		SET @currentLineFk = 0;
+		SET @shipped = '';
 
+		SELECT DATE(@shipped:= shipped) shipped,
+			alertLevel,
+			stateName,
+			origin,
+			reference,
+			clientFk,
+			name,
+			`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 a.code >= 'ON_PREPARATION')),
+									lineFk, @currentLineFk) lastPreparedLineFk,
+			isTicket,
+			lineFk,
+			isPicked,
+			clientType,
+			claimFk
+			FROM itemDiary
+				JOIN alertLevel a ON a.id = itemDiary.alertLevel;
+	ELSE
+		SELECT sum(`in`) - sum(`out`) INTO vInvCalculated
+			FROM itemDiary
+			WHERE shipped < vDate;
+
+		SELECT p1.*
+			FROM(
+				SELECT vDate shipped,
+						0 alertLevel,
+						0 stateName,
+						0 origin,
+						'' reference,
+						0 clientFk,
+						'Inventario calculado',
+						vInvCalculated invalue,
+						NULL `out`,
+						0 balance,
+						0 lastPreparedLineFk,
+						0 isTicket,
+						0 lineFk,
+						0 isPicked,
+						0 clientType,
+						0 claimFk
+				UNION ALL
+				SELECT shipped, alertlevel, stateName, origin, reference, clientFk, name, `in`, `out`, 0,0, isTicket, lineFk, isPicked, clientType, claimFk
+					FROM itemDiary
+					WHERE shipped >= vDate
+				)as p1;
+	END IF;
+
+	DROP TEMPORARY TABLE itemDiary;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;

docker-compose.yml

@@ -43,7 +43,7 @@ services:
           - node.role == worker
       resources:
         limits:
-          memory: 4G
+          memory: 8G
 configs:
   datasources:
     external: true

e2e/helpers/puppeteer.js

@@ -22,7 +22,8 @@ export async function getBrowser() {
         env.E2E_SHOW = true;
     }
 
-    const headless = !env.E2E_SHOW;
+    const headless = env.E2E_SHOW ? false : 'new';
+
     const browser = await Puppeteer.launch({
         args,
         defaultViewport: null,

e2e/helpers/selectors.js

@@ -625,6 +625,7 @@ export default {
         selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check',
         secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]',
         thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]',
+        fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]',
         deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]',
         transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]',
         moveToTicketInput: 'form vn-input-number[ng-model="$ctrl.transfer.ticketId"] input',

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -251,7 +251,6 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
         await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitToClick(selectors.globalItems.acceptButton);
         await page.waitForState('claim.card.basicData');
     });
 

e2e/paths/06-claim/05_summary.spec.js

@@ -17,7 +17,7 @@ describe('Claim summary path', () => {
     });
 
     it('should navigate to the target claim summary section', async() => {
-        await page.loginAndModule('employee', 'claim');
+        await page.loginAndModule('salesPerson', 'claim');
         await page.accessToSearchResult(claimId);
         await page.waitForState('claim.card.summary');
     });

e2e/paths/06-claim/06_descriptor.spec.js

@@ -16,7 +16,7 @@ describe('Claim descriptor path', () => {
     });
 
     it('should now navigate to the target claim summary section', async() => {
-        await page.loginAndModule('employee', 'claim');
+        await page.loginAndModule('salesPerson', 'claim');
         await page.accessToSearchResult(claimId);
         await page.waitForState('claim.card.summary');
     });

e2e/paths/13-supplier/03_fiscal_data.spec.js

@@ -1,5 +1,20 @@
 import getBrowser from '../../helpers/puppeteer';
 
+const $ = {
+    saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
+};
+const $inputs = {
+    province: 'vn-supplier-fiscal-data [name="province"]',
+    country: 'vn-supplier-fiscal-data [name="country"]',
+    postcode: 'vn-supplier-fiscal-data [name="postcode"]',
+    city: 'vn-supplier-fiscal-data [name="city"]',
+    socialName: 'vn-supplier-fiscal-data [name="socialName"]',
+    taxNumber: 'vn-supplier-fiscal-data [name="taxNumber"]',
+    account: 'vn-supplier-fiscal-data [name="account"]',
+    sageWithholding: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageWithholdingFk"]',
+    sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
+};
+
 describe('Supplier fiscal data path', () => {
     let browser;
     let page;

front/salix/components/descriptor/style.scss

@@ -7,22 +7,24 @@ vn-descriptor-content {
 
     .photo {
         position: relative;
+        width: 100%;
+        text-align: center;
+        overflow: hidden;
 
         & > img[ng-src] {
             min-height: 16em;
             display: block;
-            max-width: 100%;
             height: 256px;
         }
 
         vn-float-button {
-            position: absolute; 
-            margin: 1em; 
-            bottom: 0; 
+            position: absolute;
+            margin: 1em;
+            bottom: 0;
             right: 0
         }
     }
- 
+
     & > vn-spinner {
         display: block;
         height: 40px;
@@ -39,7 +41,7 @@ vn-descriptor-content {
             align-items: stretch;
             color: $color-font-dark;
 
-            & > a, 
+            & > a,
             & > vn-icon-button {
                 display: flex;
                 min-width: 45px;
@@ -89,7 +91,7 @@ vn-descriptor-content {
                     display: flex;
                     align-items: center;
                     justify-content: center;
-            
+
                     & > vn-icon {
                         padding: $spacing-xs $spacing-sm;
                         font-size: 1.5rem;

front/salix/components/log/index.js

@@ -150,10 +150,10 @@ export default class Controller extends Section {
             if (value == null || value == '') return null;
             switch (prop) {
             case 'search':
-                const or = [{changedModelId: value}];
-                if (!/^[0-9]+$/.test(value))
-                    or.push({changedModelValue: {like: `%${value}%`}});
-                return {or};
+                if (/^[0-9]+$/.test(value))
+                    return {changedModelId: value};
+                else
+                    return {changedModelValue: {like: `%${value}%`}};
             case 'changes':
                 return {or: [
                     {oldInstance: {like: `%${value}%`}},

loopback/common/models/vn-model.js

@@ -1,6 +1,8 @@
 
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const UserError = require('vn-loopback/util/user-error');
+const utils = require('loopback/lib/utils');
+const {util} = require('webpack');
 
 module.exports = function(Self) {
     Self.ParameterizedSQL = ParameterizedSQL;
@@ -164,23 +166,21 @@ module.exports = function(Self) {
 
             function rewriteMethod(methodName) {
                 const realMethod = this[methodName];
-                return async(data, options, cb) => {
-                    if (options instanceof Function) {
-                        cb = options;
-                        options = null;
-                    }
+                return function(...args) {
+                    let cb;
+                    const lastArg = args[args.length - 1];
+                    if (lastArg instanceof Function) {
+                        cb = lastArg;
+                        args.pop();
+                    } else
+                        cb = utils.createPromiseCallback();
 
-                    try {
-                        const result = await realMethod.call(this, data, options);
-
-                        if (cb) cb(null, result);
-                        else return result;
-                    } catch (err) {
-                        let myErr = replaceErr(err, replaceErrFunc);
-                        if (cb) cb(myErr);
-                        else
-                            throw myErr;
-                    }
+                    args.push(function(err, res) {
+                        if (err) err = replaceErr(err, replaceErrFunc);
+                        cb(err, res);
+                    });
+                    realMethod.apply(this, args);
+                    return cb.promise;
                 };
             }
 

loopback/locale/en.json

@@ -171,5 +171,7 @@
 	"Added observation": "Added observation",
 	"Comment added to client": "Comment added to client",
 	"This ticket is already a refund": "This ticket is already a refund",
-	"A claim with that sale already exists": "A claim with that sale already exists"
+	"A claim with that sale already exists": "A claim with that sale already exists",
+	"Can't transfer claimed sales": "Can't transfer claimed sales",
+	"Invalid quantity": "Invalid quantity"
 }

loopback/locale/es.json

@@ -84,6 +84,7 @@
 	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
 	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
 	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+    "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
 	"Please select at least one sale": "Por favor selecciona al menos una linea",
 	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@@ -290,5 +291,7 @@
 	"isTaxDataChecked": "Datos comprobados",
 	"comercialId": "Id comercial",
 	"comercialName": "Comercial",
-	"Invalid NIF for VIES": "Invalid NIF for VIES"
-}
+	"Invalid NIF for VIES": "Invalid NIF for VIES",
+	"Ticket does not exist": "Este ticket no existe",
+    "Ticket is already signed": "Este ticket ya ha sido firmado"
+}

modules/account/back/locale/vn-user/en.yml

@@ -15,3 +15,7 @@ columns:
     image: image
     hasGrant: has grant
     userFk: user
+    recoverPass: recover password
+    role: role
+    sync: pending sync
+    lastPassChange: password changed

modules/account/back/locale/vn-user/es.yml

@@ -15,3 +15,7 @@ columns:
     image: imagen
     hasGrant: puede delegar
     userFk: usuario
+    recoverPass: recuperar contraseña
+    role: rol
+    sync: Pendiente de sincronizar
+    lastPassChange: contraseña modificada

modules/claim/back/methods/claim/createFromSales.js

@@ -59,12 +59,14 @@ module.exports = Self => {
 
             const landedPlusWeek = new Date(ticket.landed);
             landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
-            const hasClaimManagerRole = await models.VnUser.hasRole(userId, 'claimManager', myOptions);
             const isClaimable = landedPlusWeek >= Date.vnNew();
 
+            const canCreateClaimAfterDeadline =
+                await models.ACL.checkAccessAcl(ctx, 'Claim', 'createAfterDeadline', 'WRITE');
+
             if (ticket.isDeleted)
                 throw new UserError(`You can't create a claim for a removed ticket`);
-            if (!isClaimable && !hasClaimManagerRole)
+            if (!isClaimable && !canCreateClaimAfterDeadline)
                 throw new UserError(`You can't create a claim from a ticket delivered more than seven days ago`);
 
             const newClaim = await Self.create({

modules/claim/back/methods/claim/updateClaim.js

@@ -46,7 +46,6 @@ module.exports = Self => {
 
     Self.updateClaim = async(ctx, id, options) => {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
         const args = ctx.args;
         let tx;
         const myOptions = {};
@@ -81,9 +80,9 @@ module.exports = Self => {
             if (args.claimStateFk) {
                 const canEditOldState = await models.ClaimState.isEditable(ctx, claim.claimStateFk, myOptions);
                 const canEditNewState = await models.ClaimState.isEditable(ctx, args.claimStateFk, myOptions);
-                const isClaimManager = await models.VnUser.hasRole(userId, 'claimManager', myOptions);
+                const canEditState = await models.ACL.checkAccessAcl(ctx, 'Claim', 'editState', 'WRITE');
 
-                if (!canEditOldState || !canEditNewState || changedHasToPickUp && !isClaimManager)
+                if (!canEditOldState || !canEditNewState || changedHasToPickUp && !canEditState)
                     throw new UserError(`You don't have enough privileges to change that field`);
             }
 

modules/client/back/methods/client/getCard.js

@@ -59,6 +59,12 @@ module.exports = function(Self) {
                         fields: ['id', 'name']
                     }
                 },
+                {
+                    relation: 'businessType',
+                    scope: {
+                        fields: ['description']
+                    }
+                },
                 {
                     relation: 'account',
                     scope: {

modules/client/back/methods/client/updateAddress.js

@@ -87,15 +87,15 @@ module.exports = function(Self) {
     Self.updateAddress = async(ctx, clientId, addressId, options) => {
         const models = Self.app.models;
         const args = ctx.args;
-        const userId = ctx.req.accessToken.userId;
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const isSalesAssistant = await models.VnUser.hasRole(userId, 'salesAssistant', myOptions);
+        const canEditAddressLogifloraAllowed =
+            await models.ACL.checkAccessAcl(ctx, 'Client', 'editAddressLogifloraAllowed');
 
-        if (args.isLogifloraAllowed && !isSalesAssistant)
+        if (args.isLogifloraAllowed && !canEditAddressLogifloraAllowed)
             throw new UserError(`You don't have enough privileges`);
 
         const address = await models.Address.findOne({

modules/client/back/methods/client/updateFiscalData.js

@@ -131,9 +131,10 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
         try {
-            const isSalesAssistant = await models.VnUser.hasRole(userId, 'salesAssistant', myOptions);
+            const canEditNotTaxDataChecked =
+                await models.ACL.checkAccessAcl(ctx, 'Client', 'editFiscalDataWithoutTaxDataCheck', 'WRITE');
             const client = await models.Client.findById(clientId, null, myOptions);
-            if (!isSalesAssistant && client.isTaxDataChecked)
+            if (!canEditNotTaxDataChecked && client.isTaxDataChecked)
                 throw new UserError(`Not enough privileges to edit a client with verified data`);
             // Sage data validation
             const taxDataChecked = args.isTaxDataChecked;

modules/client/back/methods/client/updateUser.js

@@ -2,6 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     Self.remoteMethodCtx('updateUser', {
         description: 'Updates the user information',
+        accessType: 'WRITE',
         accepts: [
             {
                 arg: 'id',
@@ -32,7 +33,6 @@ module.exports = Self => {
 
     Self.updateUser = async function(ctx, id, options) {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
         let tx;
         const myOptions = {};
 
@@ -45,9 +45,8 @@ module.exports = Self => {
         }
 
         try {
-            const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions);
-
-            if (!isSalesPerson)
+            const canEdit = await models.ACL.checkAccessAcl(ctx, 'Client', 'updateUser', 'WRITE');
+            if (!canEdit)
                 throw new UserError(`Not enough privileges to edit a client`);
 
             const isClient = await models.Client.findById(id, null, myOptions);

modules/client/back/models/client.js

@@ -218,9 +218,9 @@ module.exports = Self => {
         const models = Self.app.models;
 
         const loopBackContext = LoopBackContext.getCurrentContext();
-        const userId = loopBackContext.active.accessToken.userId;
+        const accessToken = {req: loopBackContext.active.accessToken};
 
-        const isSalesAssistant = await models.VnUser.hasRole(userId, 'salesAssistant', ctx.options);
+        const editVerifiedDataWithoutTaxDataChecked = models.ACL.checkAccessAcl(accessToken, 'Client', 'editVerifiedDataWithoutTaxDataCheck', 'WRITE');
         const hasChanges = orgData && changes;
 
         const isTaxDataChecked = hasChanges && (changes.isTaxDataChecked || orgData.isTaxDataChecked);
@@ -232,8 +232,8 @@ module.exports = Self => {
         const sageTransactionType = hasChanges && (changes.sageTransactionTypeFk || orgData.sageTransactionTypeFk);
         const sageTransactionTypeChanged = hasChanges && orgData.sageTransactionTypeFk != sageTransactionType;
 
-        const cantEditVerifiedData = isTaxDataCheckedChanged && !isSalesAssistant;
-        const cantChangeSageData = (sageTaxTypeChanged || sageTransactionTypeChanged) && !isSalesAssistant;
+        const cantEditVerifiedData = isTaxDataCheckedChanged && !editVerifiedDataWithoutTaxDataChecked;
+        const cantChangeSageData = (sageTaxTypeChanged || sageTransactionTypeChanged) && !editVerifiedDataWithoutTaxDataChecked;
 
         if (cantEditVerifiedData || cantChangeSageData)
             throw new UserError(`You don't have enough privileges`);
@@ -401,9 +401,10 @@ module.exports = Self => {
     Self.changeCredit = async function changeCredit(ctx, finalState, changes) {
         const models = Self.app.models;
         const userId = ctx.options.accessToken.userId;
+        const accessToken = {req: {accessToken: ctx.options.accessToken} };
 
-        const isFinancialBoss = await models.VnUser.hasRole(userId, 'financialBoss', ctx.options);
-        if (!isFinancialBoss) {
+        const canEditCredit = await models.ACL.checkAccessAcl(accessToken, 'Client', 'editCredit', 'WRITE');
+        if (!canEditCredit) {
             const lastCredit = await models.ClientCredit.findOne({
                 where: {
                     clientFk: finalState.id
@@ -412,10 +413,9 @@ module.exports = Self => {
             }, ctx.options);
 
             const lastAmount = lastCredit && lastCredit.amount;
-            const lastWorkerId = lastCredit && lastCredit.workerFk;
-            const lastWorkerIsFinancialBoss = await models.VnUser.hasRole(lastWorkerId, 'financialBoss', ctx.options);
+            const lastCreditIsNotEditable = !await models.ACL.checkAccessAcl(accessToken, 'Client', 'isNotEditableCredit', 'WRITE');
 
-            if (lastAmount == 0 && lastWorkerIsFinancialBoss)
+            if (lastAmount == 0 && lastCreditIsNotEditable)
                 throw new UserError(`You can't change the credit set to zero from a financialBoss`);
 
             const creditLimits = await models.ClientCreditLimit.find({

modules/client/back/models/pay-method.json

@@ -3,7 +3,7 @@
     "base": "VnModel",
     "options": {
         "mysql": {
-        "table": "payMethod"
+            "table": "payMethod"
         }
     },
     "properties": {

modules/client/front/descriptor/index.html

@@ -43,6 +43,10 @@
                     {{$ctrl.client.salesPersonUser.name}}
                 </span>
             </vn-label-value>
+            <vn-label-value
+                label="Business type"
+                value="{{$ctrl.client.businessType.description}}">
+            </vn-label-value>
         </div>
         <div class="icons">
             <vn-icon

modules/client/front/descriptor/locale/es.yml

@@ -8,3 +8,4 @@ Client invoices list: Listado de facturas del cliente
 Pay method: Forma de pago
 Unpaid Dated: "Fecha: {{dated | date:'dd/MM/yyyy'}}"
 Unpaid Amount: "Importe: {{amount | currency: 'EUR':2}}"
+Business type: Tipo de negocio

modules/client/front/dms/edit/index.html

@@ -2,6 +2,11 @@
     vn-id="watcher"
     data="$ctrl.dms">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form
     name="form"
     ng-submit="$ctrl.onSubmit()"
@@ -29,7 +34,7 @@
                 <vn-autocomplete vn-one required="true"
                     label="Warehouse"
                     ng-model="$ctrl.dms.warehouseId"
-                    url="Warehouses"
+                    data="warehouses"
                     show-field="name"
                     value-field="id">
                 </vn-autocomplete>

modules/entry/back/methods/entry/addFromBuy.js

@@ -0,0 +1,107 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('addFromBuy', {
+        description: 'Modify a field of a buy or creates a new one with default values',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+            http: {source: 'path'}
+        }, {
+            arg: 'item',
+            type: 'number',
+            required: true,
+            description: 'The item id',
+        }, {
+            arg: 'printedStickers',
+            type: 'number',
+            required: true,
+            description: 'The field to modify',
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/addFromBuy`,
+            verb: 'POST'
+        }
+    });
+
+    Self.addFromBuy = async(ctx, options) => {
+        const args = ctx.args;
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            let buy = await models.Buy.findOne({where: {entryFk: args.id}}, myOptions);
+            if (buy)
+                await buy.updateAttribute('printedStickers', args.printedStickers);
+            else {
+                const userConfig = await models.UserConfig.findById(userId, {fields: ['warehouseFk']}, myOptions);
+                await Self.rawSql(
+                    'CALL vn.buyUltimate(?,?)',
+                    [userConfig.warehouseFk, null],
+                    myOptions
+                );
+                let buyUltimate = await Self.rawSql(
+                    `SELECT buyFk
+                        FROM tmp.buyUltimate
+                        WHERE itemFk = ?`,
+                    [args.item],
+                    myOptions
+                );
+                buyUltimate = await models.Buy.findById(buyUltimate[0].buyFk, null, myOptions);
+                buy = await models.Buy.create({
+                    entryFk: args.id,
+                    itemFk: args.item,
+                    quantity: 0,
+                    dispatched: buyUltimate.dispatched,
+                    buyingValue: buyUltimate.buyingValue,
+                    freightValue: buyUltimate.freightValue,
+                    isIgnored: buyUltimate.isIgnored,
+                    stickers: buyUltimate.stickers,
+                    packing: buyUltimate.packing,
+                    grouping: buyUltimate.grouping,
+                    groupingMode: buyUltimate.groupingMode,
+                    containerFk: buyUltimate.containerFk,
+                    comissionValue: buyUltimate.comissionValue,
+                    packageValue: buyUltimate.packageValue,
+                    location: buyUltimate.location,
+                    packageFk: buyUltimate.packageFk,
+                    price1: buyUltimate.price1,
+                    price2: buyUltimate.price2,
+                    price3: buyUltimate.price3,
+                    minPrice: buyUltimate.minPrice,
+                    printedStickers: args.printedStickers,
+                    workerFk: buyUltimate.workerFk,
+                    isChecked: buyUltimate.isChecked,
+                    isPickedOff: buyUltimate.isPickedOff,
+                    created: buyUltimate.created,
+                    ektFk: buyUltimate.ektFk,
+                    weight: buyUltimate.weight,
+                    deliveryFk: buyUltimate.deliveryFk,
+                    itemOriginalFk: buyUltimate.itemOriginalFk
+                }, myOptions);
+            }
+
+            if (tx) await tx.commit();
+            return buy;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/entry/addFromPackaging.js

@@ -0,0 +1,72 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('addFromPackaging', {
+        description: 'Create a receipt or return entry for a supplier with a specific travel',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'supplier',
+            type: 'number',
+            required: true,
+            description: 'The supplier id',
+        },
+        {
+            arg: 'isTravelReception',
+            type: 'boolean',
+            required: true,
+            description: 'Indicates if the travel associated with the entry is a return or receipt travel'
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/addFromPackaging`,
+            verb: 'POST'
+        }
+    });
+
+    Self.addFromPackaging = async(ctx, options) => {
+        const args = ctx.args;
+        const models = Self.app.models;
+        let tx;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const travelConfig = await models.TravelConfig.findOne({}, myOptions);
+
+            const today = new Date();
+            const yesterday = new Date(today);
+            yesterday.setDate(today.getDate() - 1);
+            const tomorrow = new Date(today);
+            tomorrow.setDate(today.getDate() + 1);
+
+            const travel = await models.Travel.create({
+                shipped: args.isTravelReception ? yesterday : today,
+                landed: args.isTravelReception ? today : tomorrow,
+                agencyModeFk: travelConfig.agencyFk,
+                warehouseInFk: travelConfig.warehouseOutFk,
+                warehouseOutFk: travelConfig.warehouseInFk
+            }, myOptions);
+
+            const entry = await models.Entry.create({
+                supplierFk: args.supplier,
+                travelFk: travel.id,
+                companyFk: travelConfig.companyFk
+            }, myOptions);
+
+            if (tx) await tx.commit();
+
+            return entry;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/entry/specs/addFromBuy.spec.js

@@ -0,0 +1,51 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('entry addFromBuy()', () => {
+    const ctx = {req: {accessToken: {userId: 18}}};
+
+    it('should change the printedStickers of an existent buy', async() => {
+        const id = 1;
+        const item = 1;
+        const buy = 1;
+
+        const tx = await models.Entry.beginTransaction({});
+        const options = {transaction: tx};
+        try {
+            const currentBuy = await models.Buy.findById(buy, {fields: ['printedStickers']}, options);
+            const printedStickers = currentBuy.printedStickers + 10;
+            ctx.args = {id, item, printedStickers};
+            const newBuy = await models.Entry.addFromBuy(ctx, options);
+
+            expect(newBuy.printedStickers).toEqual(printedStickers);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should create for an entry without a concrete item a new buy', async() => {
+        const id = 8;
+        const item = 1;
+        const printedStickers = 10;
+
+        const tx = await models.Entry.beginTransaction({});
+        const options = {transaction: tx};
+        try {
+            const emptyBuy = await models.Buy.findOne({where: {entryFk: id}}, options);
+            ctx.args = {id, item, printedStickers};
+            const newBuy = await models.Entry.addFromBuy(ctx, options);
+
+            expect(emptyBuy).toEqual(null);
+            expect(newBuy.entryFk).toEqual(id);
+            expect(newBuy.printedStickers).toEqual(printedStickers);
+            expect(newBuy.itemFk).toEqual(item);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/entry/back/methods/entry/specs/addFromPackaging.spec.js

@@ -0,0 +1,49 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('entry addFromPackaging()', () => {
+    const supplier = 442;
+    const today = new Date();
+    const yesterday = new Date(today);
+    yesterday.setDate(today.getDate() - 1);
+
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 49},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'},
+                },
+            },
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx,
+        });
+    });
+
+    it('should create an incoming travel', async() => {
+        const ctx = {args: {isTravelReception: true, supplier}};
+        const tx = await models.Entry.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const entry = await models.Entry.addFromPackaging(ctx, options);
+            const travelConfig = await models.TravelConfig.findOne({}, options);
+            const travel = await models.Travel.findOne({order: 'id DESC'}, options);
+
+            expect(new Date(travel.shipped).getDate()).toEqual(yesterday.getDate());
+            expect(new Date(travel.landed).getDate()).toEqual(today.getDate());
+            expect(travel.agencyModeFk).toEqual(travelConfig.agencyFk);
+            expect(travel.warehouseInFk).toEqual(travelConfig.warehouseOutFk);
+            expect(travel.warehouseOutFk).toEqual(travelConfig.warehouseInFk);
+            expect(entry.supplierFk).toEqual(supplier);
+            expect(entry.travelFk).toEqual(travel.id);
+            expect(entry.companyFk).toEqual(travelConfig.companyFk);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/entry/back/model-config.json

@@ -5,6 +5,9 @@
     "Buy": {
         "dataSource": "vn"
     },
+    "BuyConfig": {
+        "dataSource": "vn"
+    },
     "ItemMatchProperties": {
         "dataSource": "vn"
     },

modules/entry/back/models/buy-config.json

@@ -0,0 +1,18 @@
+{
+    "name": "BuyConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "buyConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "showLastBuy": {
+            "type": "number"
+        }
+    }
+}

modules/entry/back/models/buy.json

@@ -39,6 +39,9 @@
         "packageValue": {
             "type": "number"
         },
+        "price1": {
+            "type": "number"
+        },
         "price2": {
             "type": "number"
         },
@@ -47,7 +50,44 @@
         },
         "weight": {
             "type": "number"
+        },
+        "printedStickers": {
+            "type": "number"
+        },
+        "dispatched": {
+            "type": "number"
+        },
+        "isIgnored": {
+            "type": "boolean"
+        },
+        "containerFk": {
+            "type": "number"
+        },
+        "location": {
+            "type": "number"
+        },
+        "minPrice": {
+            "type": "number"
+        },
+        "isChecked": {
+            "type": "boolean"
+        },
+        "isPickedOff": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "date"
+        },
+        "ektFk": {
+            "type": "number"
+        },
+        "itemOriginalFk": {
+            "type": "number"
+        },
+        "editorFk": {
+            "type": "number"
         }
+
     },
     "relations": {
         "entry": {
@@ -64,6 +104,16 @@
 			"type": "belongsTo",
 			"model": "Packaging",
 			"foreignKey": "packageFk"
+		},
+        "worker": {
+			"type": "belongsTo",
+			"model": "Worker",
+			"foreignKey": "workerFk"
+		},
+        "delivery": {
+			"type": "belongsTo",
+			"model": "Delivery",
+			"foreignKey": "deliveryFk"
 		}
     }
 }

modules/entry/back/models/entry.js

@@ -8,6 +8,8 @@ module.exports = Self => {
     require('../methods/entry/importBuysPreview')(Self);
     require('../methods/entry/lastItemBuys')(Self);
     require('../methods/entry/entryOrderPdf')(Self);
+    require('../methods/entry/addFromPackaging')(Self);
+    require('../methods/entry/addFromBuy')(Self);
 
     Self.observe('before save', async function(ctx, options) {
         if (ctx.isNewInstance) return;

modules/entry/front/basic-data/index.html

@@ -5,6 +5,11 @@
     form="form"
     save="patch">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form name="form" ng-submit="watcher.submit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
@@ -152,14 +157,14 @@
             <vn-autocomplete
                 label="Warehouse Out"
                 ng-model="$ctrl.travelFilterParams.warehouseOutFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>
             <vn-autocomplete
                 label="Warehouse In"
                 ng-model="$ctrl.travelFilterParams.warehouseInFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>

modules/invoiceOut/back/methods/invoiceOut/createPdf.js

@@ -25,7 +25,6 @@ module.exports = Self => {
 
     Self.createPdf = async function(ctx, id, options) {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
 
         if (process.env.NODE_ENV == 'test')
             throw new UserError(`Action not allowed on the test environment`);
@@ -43,9 +42,9 @@ module.exports = Self => {
 
         try {
             const invoiceOut = await Self.findById(id, null, myOptions);
-            const hasInvoicing = await models.VnUser.hasRole(userId, 'invoicing', myOptions);
+            const canCreatePdf = await models.ACL.checkAccessAcl(ctx, 'InvoiceOut', 'canCreatePdf', 'WRITE');
 
-            if (invoiceOut.hasPdf && !hasInvoicing)
+            if (invoiceOut.hasPdf && !canCreatePdf)
                 throw new UserError(`You don't have enough privileges`);
 
             await invoiceOut.updateAttributes({

modules/item/back/locale/item-botanical/en.yml

@@ -1,4 +1,4 @@
-name: botanical
+name: botanical data
 columns:
     itemFk: item
     genusFk: genus

modules/item/back/locale/item-botanical/es.yml

@@ -1,4 +1,4 @@
-name: botánico
+name: datos botánicos
 columns:
     itemFk: artículo
     genusFk: género

modules/item/back/locale/item/en.yml

@@ -35,7 +35,7 @@ columns:
     packingOut: packing out
     hasMinPrice: has min price
     isFragile: fragile
-    isFloramondo: is floramondo
+    isFloramondo: floramondo
     packingShelve: packing shelve
     isLaid: laid
     inkFk: ink

modules/item/back/locale/item/es.yml

@@ -35,7 +35,7 @@ columns:
     packingOut: empaquetar
     hasMinPrice: tiene precio mínimo
     isFragile: frágil
-    isFloramondo: es floramondo
+    isFloramondo: floramondo
     packingShelve: estantería embalaje
     isLaid: puesto
     inkFk: tinta

modules/item/back/methods/item/getBalance.js

@@ -26,8 +26,8 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const where = filter.where;
-        const query = 'CALL vn.item_getBalance(?, ?)';
-        const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk], myOptions);
+        const query = 'CALL vn.item_getBalance(?, ?, ?)';
+        const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions);
 
         for (const entry of diary)
             if (entry.clientType === 'loses') entry.highlighted = true;

modules/item/back/methods/item/specs/getBalance.spec.js

@@ -21,7 +21,8 @@ describe('item getBalance()', () => {
             const filter = {
                 where: {
                     itemFk: 1,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
             const results = await models.Item.getBalance(filter, options);
@@ -45,14 +46,16 @@ describe('item getBalance()', () => {
             const firstFilter = {
                 where: {
                     itemFk: 1,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
 
             const secondFilter = {
                 where: {
                     itemFk: 2,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
 

modules/item/front/descriptor/index.html

@@ -1,3 +1,8 @@
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <vn-descriptor-content
     module="item"
     description="$ctrl.item.name"
@@ -108,7 +113,9 @@
         <vn-autocomplete
             label="Warehouse"
             ng-model="$ctrl.warehouseFk"
-            url="Warehouses">
+            data="warehouses"
+            show-field="name"
+            value="id">
         </vn-autocomplete>
     </tpl-body>
     <tpl-buttons>

modules/item/front/diary/index.html

@@ -25,6 +25,16 @@
                 ng-model="$ctrl.warehouseFk"
                 label="Select warehouse">
             </vn-autocomplete>
+            <vn-check
+                ng-class="{'table-check':$ctrl.showOld}"
+                label="Show what's before the inventory"
+                ng-model="$ctrl.showOld">
+            </vn-check>
+            <vn-date-picker
+                label="Since"
+                ng-model="$ctrl.date"
+                ng-show="$ctrl.showOld">
+            </vn-date-picker>
         </vn-horizontal>
         <vn-table model="model">
             <vn-thead>
@@ -44,7 +54,7 @@
                 <vn-tr
                     ng-class="::{
                         'isIn': sale.invalue,
-                        'balanceNegative': sale.balance < 0}" 
+                        'balanceNegative': sale.balance < 0}"
                     ng-repeat="sale in sales"
                     vn-repeat-last
                     on-last="$ctrl.scrollToLine(sale.lastPreparedLineFk)"
@@ -58,7 +68,7 @@
                         </a>
                     </vn-td>
                     <vn-td expand>
-                        <span class="chip" 
+                        <span class="chip"
                             ng-class="::{warning: $ctrl.today == sale.shipped}">
                             {{::sale.shipped | date:'dd/MM/yyyy' }}
                         </span>
@@ -99,13 +109,13 @@
     </vn-vertical>
     </vn-card>
 </vn-vertical>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
     vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
-<vn-client-descriptor-popover 
+<vn-client-descriptor-popover
     vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
-<vn-entry-descriptor-popover 
+<vn-entry-descriptor-popover
     vn-id="entryDescriptor">
 </vn-entry-descriptor-popover>
 

modules/item/front/diary/index.js

@@ -38,12 +38,8 @@ class Controller extends Section {
         if (value && value != this._warehouseFk) {
             this._warehouseFk = value;
             this.card.warehouseFk = value;
+            this.filter.where.warehouseFk = this.warehouseFk;
 
-            this.$state.go(this.$state.current.name, {
-                warehouseFk: value
-            });
-
-            this.filter.where.warehouseFk = value;
             this.$.model.refresh();
         }
     }
@@ -52,6 +48,28 @@ class Controller extends Section {
         return this._warehouseFk;
     }
 
+    set date(value) {
+        this._date = value;
+        this.filter.where.date = value;
+        this.filter.where.warehouseFk = this.warehouseFk;
+
+        this.$.model.refresh();
+    }
+
+    get date() {
+        return this._date;
+    }
+
+    set showOld(value) {
+        this._showOld = value;
+        if (!this._showOld) this.date = null;
+        else this.date = new Date();
+    }
+
+    get showOld() {
+        return this._showOld;
+    }
+
     scrollToLine(lineFk) {
         this.$.$applyAsync(() => {
             const hashFk = this.lineFk || lineFk;

modules/item/front/diary/locale/es.yml

@@ -1,4 +1,5 @@
 In: Entrada
 Out: Salida
 Visible quantity: Cantidad visible
-Ticket/Entry: Ticket/Entrada
+Ticket/Entry: Ticket/Entrada
+Show what's before the inventory: Mostrar lo anterior al inventario

modules/item/front/diary/style.scss

@@ -27,4 +27,7 @@ vn-item-diary {
         overflow: hidden;
         text-overflow: ellipsis;
     }
-}
+    .table-check{
+        justify-content: center;
+    }
+}

modules/item/front/request-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -35,7 +40,9 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses">
+                data="warehouses"
+                show-field="name"
+                value-field="id">
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal class="vn-px-lg">

modules/monitor/front/index/search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -83,7 +88,7 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses">
+                data="warehouses">
             </vn-autocomplete>
             <vn-autocomplete
                 vn-one

modules/route/front/agency-term-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Agencies" 
+        data="agencies">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -17,7 +22,7 @@
                 ng-model="filter.agencyModeFk">
             </vn-autocomplete>
             <vn-autocomplete vn-one
-                url="Agencies"
+                data="agencies"
                 label="Agency Agreement"
                 show-field="name"
                 value-field="id"

modules/route/front/search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -79,7 +84,7 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>

modules/shelving/back/locale/shelving/en.yml

@@ -0,0 +1,11 @@
+name: shelving
+columns:
+    id: id
+    code: code
+    parkingFk: parking
+    isPrinted: printed
+    priority: priority
+    parked: parked
+    userFk: user
+    isSpam: SPAM
+    isRecyclable: recyclable

modules/shelving/back/locale/shelving/es.yml

@@ -0,0 +1,11 @@
+name: estantería
+columns:
+    id: id
+    code: código
+    parkingFk: parking
+    isPrinted: impreso
+    priority: prioridad
+    parked: aparcado
+    userFk: usuario
+    isSpam: SPAM
+    isRecyclable: reciclable

modules/supplier/back/methods/supplier/getItemsPackaging.js

@@ -0,0 +1,50 @@
+module.exports = Self => {
+    Self.remoteMethod('getItemsPackaging', {
+        description: 'Returns the list of items from the supplier of type packing',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The supplier id',
+            http: {source: 'path'}
+        }, {
+            arg: 'entry',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/getItemsPackaging`,
+            verb: 'GET'
+        }
+    });
+    Self.getItemsPackaging = async(id, entry) => {
+        return Self.rawSql(`
+            WITH entryTmp AS (
+                SELECT i.id, SUM(b.quantity) quantity
+                    FROM vn.entry e
+                        JOIN vn.buy b ON b.entryFk = e.id
+                        JOIN vn.supplier s ON s.id = e.supplierFk
+                        JOIN vn.item i ON i.id = b.itemFk
+                    WHERE e.id = ?  AND e.supplierFk = ?
+                    GROUP BY i.id
+            ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal
+                FROM vn.buy b
+                    JOIN vn.item i ON i.id = b.itemFk
+                    JOIN vn.entry e ON e.id = b.entryFk
+                    JOIN vn.supplier s ON s.id = e.supplierFk
+                    JOIN vn.buyConfig bc ON bc.monthsAgo
+                    JOIN vn.travel t ON t.id = e.travelFk
+                    LEFT JOIN entryTmp et ON et.id = i.id
+                WHERE e.supplierFk = ?
+                    AND i.family IN ('EMB', 'CONT')
+                    AND b.created > (util.VN_CURDATE() - INTERVAL bc.monthsAgo MONTH)
+                GROUP BY b.itemFk
+                ORDER BY et.quantity DESC, quantityTotal DESC`, [entry, id, id]);
+    };
+};

modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js

@@ -0,0 +1,12 @@
+const app = require('vn-loopback/server/server');
+
+describe('Supplier getItemsPackaging()', () => {
+    it('should return a summary of the list of items from a specific supplier', async() => {
+        const [item] = await app.models.Supplier.getItemsPackaging(1, 1);
+
+        expect(item.id).toEqual(1);
+        expect(item.name).toEqual('Ranged weapon longbow 2m');
+        expect(item.quantity).toEqual(5000);
+        expect(item.quantityTotal).toEqual(5100);
+    });
+});

modules/supplier/back/models/supplier.js

@@ -11,6 +11,7 @@ module.exports = Self => {
     require('../methods/supplier/campaignMetricsPdf')(Self);
     require('../methods/supplier/campaignMetricsEmail')(Self);
     require('../methods/supplier/newSupplier')(Self);
+    require('../methods/supplier/getItemsPackaging')(Self);
 
     Self.validatesPresenceOf('name', {
         message: 'The social name cannot be empty'
@@ -99,18 +100,20 @@ module.exports = Self => {
 
     Self.observe('before save', async function(ctx) {
         if (ctx.isNewInstance) return;
-        const loopbackContext = LoopBackContext.getCurrentContext();
         const changes = ctx.data || ctx.instance;
         const orgData = ctx.currentInstance;
-        const userId = loopbackContext.active.accessToken.userId;
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const accessToken = {req: loopBackContext.active.accessToken};
+
+        const editPayMethodCheck =
+            await Self.app.models.ACL.checkAccessAcl(accessToken, 'Supplier', 'editPayMethodCheck', 'WRITE');
 
-        const isNotFinancial = !await Self.app.models.VnUser.hasRole(userId, 'financial');
         const isPayMethodChecked = changes.isPayMethodChecked || orgData.isPayMethodChecked;
         const hasChanges = orgData && changes;
         const isPayMethodCheckedChanged = hasChanges
          && orgData.isPayMethodChecked != isPayMethodChecked;
 
-        if (isNotFinancial && isPayMethodCheckedChanged)
+        if (!editPayMethodCheck && isPayMethodCheckedChanged)
             throw new UserError('You can not modify is pay method checked');
     });
 

modules/ticket/back/locale/expedition/en.yml

@@ -12,3 +12,5 @@ columns:
     hostFk: PC
     isBox: box
     itemPackingTypeFk: packing type
+    externalId: external id
+    stateTypeFk: status

modules/ticket/back/locale/expedition/es.yml

@@ -12,3 +12,5 @@ columns:
     hostFk: PC
     isBox: caja
     itemPackingTypeFk: tipo empaquetado
+    externalId: id externo
+    stateTypeFk: estado

modules/ticket/back/methods/sale/canEdit.js

@@ -38,6 +38,9 @@ module.exports = Self => {
             }
         }, myOptions);
 
+        if (!salesData.length)
+            throw new UserError(`The sales do not exists`);
+
         const ticketId = salesData[0].ticketFk;
 
         const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
@@ -62,7 +65,5 @@ module.exports = Self => {
             throw new UserError('It is not possible to modify cloned sales');
         if (!shouldEditFloramondo)
             throw new UserError('It is not possible to modify sales that their articles are from Floramondo');
-
-        return true;
     };
 };