Merge branch 'dev' into 5063-item-module-doPhoto

CHANGELOG.md

@@ -5,19 +5,31 @@ 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).
 
-## [2302.01] - 2023-01-12
+## [2304.01] - 2023-02-09
 
 ### Added
-- [General](Inicio) Permite recuperar la contraseña
+- 
-- [Ticket](Opciones) Subir albarán a Docuware
-- [Ticket](Opciones) Enviar correo con PDF de Docuware
-- [Artículo](Datos Básicos) Añadido campo Unidades/Caja
 
 ### Changed
-- [Tickets](Líneas preparadas) Actualizada sección para que sea más visual
+- 
 
 ### Fixed
-- [General] Al utilizar el traductor de Google se descuadraban los iconos
+- 
+
+## [2302.01] - 2023-01-26
+
+### Added
+- (General -> Inicio) Permite recuperar la contraseña 
+- (Tickets -> Opciones) Subir albarán a Docuware 
+- (Tickets -> Opciones) Enviar correo con PDF de Docuware 
+- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja 
+
+### Changed
+- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona 
+- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual 
+
+### Fixed
+- (General) Al utilizar el traductor de Google se descuadraban los iconos
 
 ### Removed
-- [Tickets](Control clientes) Eliminada sección
+- (Tickets -> Control clientes) Eliminada sección

back/methods/collection/previousLabel.js

@@ -0,0 +1,49 @@
+const {Report} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('previousLabel', {
+        description: 'Returns the previa label pdf',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The item id',
+                http: {source: 'path'}
+            }],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/previousLabel',
+            verb: 'GET'
+        }
+    });
+
+    Self.previousLabel = async(ctx, id) => {
+        const args = Object.assign({}, ctx.args);
+        const params = {lang: ctx.req.getLocale()};
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const report = new Report('previa-label', params);
+        const stream = await report.toPdfStream();
+
+        return [stream, 'application/pdf', `filename="previa-${id}.pdf"`];
+    };
+};

back/methods/osticket/closeTicket.js

@@ -36,19 +36,26 @@ module.exports = Self => {
                             JOIN osticket.ost_ticket_status ots ON ots.id = ot.status_id
                             JOIN osticket.ost_thread ot2 ON ot2.object_id = ot.ticket_id AND ot2.object_type = 'T'
                             JOIN (
-                                SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated
+                                SELECT sub2.thread_id, sub2.type, sub2.updated, sub2.created
+                                    FROM (
+                                        SELECT ote.thread_id, ote.created, ote.updated, ote.type
                                             FROM osticket.ost_thread_entry ote
-                                    WHERE ote.staff_id AND ote.type = 'R'
+                                            WHERE ote.staff_id
-                                    GROUP BY ote.thread_id
+                                            ORDER BY ote.id DESC
+                                            LIMIT 10000000000000000000) sub2
+                                    GROUP BY sub2.thread_id
                             ) sub ON sub.thread_id = ot2.id
                         WHERE ot.isanswered
-                            AND ots.state = ?
+                            AND ots.id IN (?)
-                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ? DAY)`;
+                            AND sub.type = 'R'
+                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ? DAY);`;
 
         const ticketsId = [];
+        const statusIdToClose = config.oldStatus.split(',');
+
         con.connect(err => {
             if (err) throw err;
-            con.query(sql, [config.oldStatus, config.day],
+            con.query(sql, [statusIdToClose, config.day],
                 (err, results) => {
                     if (err) throw err;
                     for (const result of results)

back/models/collection.js

@@ -3,4 +3,5 @@ module.exports = Self => {
     require('../methods/collection/newCollection')(Self);
     require('../methods/collection/getSectors')(Self);
     require('../methods/collection/setSaleQuantity')(Self);
+    require('../methods/collection/previousLabel')(Self);
 };

db/changes/225001/00-updateCollection.sql

@@ -0,0 +1,3 @@
+UPDATE `vn`.`collection`
+	SET sectorFk=1
+	WHERE id=1;

db/changes/225203/00-mdbApp.sql

@@ -0,0 +1,5 @@
+UPDATE `vn`.`osTicketConfig`
+SET oldStatus='1,6'
+WHERE id=0;
+
+

db/changes/230201/00-borradoLogicoIPT.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`itemPackingType` ADD isActive BOOLEAN NOT NULL;
+UPDATE `vn`.`itemPackingType` SET isActive = 0 WHERE code IN ('P', 'F');
+UPDATE `vn`.`itemPackingType` SET isActive = 1 WHERE code IN ('V', 'H');

db/changes/230201/00-priceFixed_getRate2.sql

@@ -0,0 +1,23 @@
+DROP FUNCTION IF EXISTS `vn`.`priceFixed_getRate2`;
+
+DELIMITER $$
+$$
+CREATE FUNCTION `vn`.`priceFixed_getRate2`(vFixedPriceFk INT, vRate3 DOUBLE)
+RETURNS DOUBLE
+BEGIN
+
+	DECLARE vWarehouse INT;
+	DECLARE vRate2 DOUBLE;
+
+	SELECT round(vRate3 * (1 + ((r.rate2 - r.rate3)/100)), 2) INTO vRate2
+		FROM vn.rate r
+			JOIN vn.priceFixed p ON p.id = vFixedPriceFk
+		WHERE r.dated <= p.started
+			AND r.warehouseFk = p.warehouseFk
+		ORDER BY r.dated DESC
+		LIMIT 1;
+
+	RETURN vRate2;
+
+END$$
+DELIMITER ;

db/changes/230201/00-triggersXDiario.sql

@@ -0,0 +1,73 @@
+DROP TRIGGER IF EXISTS vn.XDiario_beforeUpdate;
+USE vn;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeUpdate`
+	BEFORE UPDATE ON `XDiario`
+	FOR EACH ROW
+BEGIN
+    IF NOT NEW.SUBCTA <=> OLD.SUBCTA THEN
+        IF NEW.SUBCTA <=> '' THEN
+            SET NEW.SUBCTA = NULL;
+        END IF;
+        IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN
+            CALL util.throw('INVALID_STRING_LENGTH');
+        END IF;
+    END IF;
+    IF NOT NEW.CONTRA <=> OLD.CONTRA THEN
+        IF NEW.CONTRA <=> '' THEN
+            SET NEW.CONTRA = NULL;
+        END IF;
+        IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN
+            CALL util.throw('INVALID_STRING_LENGTH');
+        END IF;
+    END IF;
+    IF NOT NEW.FECHA <=> OLD.FECHA THEN
+        CALL XDiario_checkDate(NEW.FECHA);
+    END IF;
+    IF NOT NEW.FECHA_EX <=> OLD.FECHA_EX THEN
+        CALL XDiario_checkDate(NEW.FECHA_EX);
+    END IF;
+    IF NOT NEW.FECHA_OP <=> OLD.FECHA_OP THEN
+        CALL XDiario_checkDate(NEW.FECHA_OP);
+    END IF;
+    IF NOT NEW.FECHA_RT <=> OLD.FECHA_RT THEN
+        CALL XDiario_checkDate(NEW.FECHA_RT);
+    END IF;
+    IF NOT NEW.FECREGCON <=> OLD.FECREGCON THEN
+        CALL XDiario_checkDate(NEW.FECREGCON);
+    END IF;
+END$$
+DELIMITER ;
+
+
+DROP TRIGGER IF EXISTS vn.XDiario_beforeInsert;
+USE vn;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeInsert`
+	BEFORE INSERT ON `XDiario`
+	FOR EACH ROW
+BEGIN
+    IF NEW.SUBCTA <=> '' THEN
+        SET NEW.SUBCTA = NULL;
+    END IF;
+    IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN
+        CALL util.throw('INVALID_STRING_LENGTH');
+    END IF;
+    IF NEW.CONTRA <=> '' THEN
+        SET NEW.CONTRA = NULL;
+    END IF;
+    IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN
+        CALL util.throw('INVALID_STRING_LENGTH');
+    END IF;
+    CALL XDiario_checkDate(NEW.FECHA);
+    CALL XDiario_checkDate(NEW.FECHA_EX);
+    CALL XDiario_checkDate(NEW.FECHA_OP);
+    CALL XDiario_checkDate(NEW.FECHA_RT);
+    CALL XDiario_checkDate(NEW.FECREGCON);
+END$$
+DELIMITER ;
+

db/changes/230201/00-validPriorities_ItemConfig.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`itemConfig` ADD defaultTag INT DEFAULT 56 NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultTag) REFERENCES vn.tag(id);
+ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
+ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';
+
+INSERT INTO `salix`.`ACL`
+(model, property, accessType, permission, principalType, principalId)
+VALUES('ItemConfig', '*', 'READ', 'ALLOW', 'ROLE', 'buyer');

db/changes/230201/00-workerTimeControlConfig.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `vn`.`workerTimeControlConfig` ADD teleworkingStart INT NULL COMMENT 'Hora comienzo jornada de los teletrabajdores expresada en segundos';
+ALTER TABLE `vn`.`workerTimeControlConfig` ADD teleworkingStartBreakTime INT NULL COMMENT 'Hora comienzo descanso de los teletrabjadores expresada en segundos';
+
+UPDATE `vn`.`workerTimeControlConfig`
+    SET `teleworkingStart`=28800, `teleworkingStartBreakTime`=32400
+WHERE `id`=1;

db/dump/fixtures.sql

@@ -1215,7 +1215,7 @@ INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceT
     (7,     NULL,       'Ancho de la base', 1, 1, NULL,     'mm',NULL,  NULL),
     (23,    'stems',    'Tallos',           1, 1, NULL,     NULL, NULL, 'stems'),
     (27,    NULL,       'Longitud(cm)',     1, 1, NULL,     'cm', NULL, NULL),
-    (36,    NULL,       'Proveedor',        1, 0, NULL,     NULL, NULL, NULL),
+    (36,    'producer',       'Proveedor',        1, 0, NULL,     NULL, NULL, 'producer'),
     (56,    NULL,       'Genero',           1, 0, NULL,     NULL, NULL, NULL),
     (58,    NULL,       'Variedad',         1, 0, NULL,     NULL, NULL, NULL),
     (67,    'category', 'Categoria',        1, 0, NULL,     NULL, NULL, NULL),
@@ -2667,9 +2667,9 @@ INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk
     VALUES
         (1, 1);
 
-INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`)
+INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`, `teleworkingStart`, `teleworkingStartBreakTime`)
     VALUES
-        (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13);
+        (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13, 28800, 32400);
 
 INSERT INTO `vn`.`host` (`id`, `code`, `description`, `warehouseFk`, `bankFk`)
     VALUES
@@ -2719,6 +2719,10 @@ INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPack
     VALUES
         (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);
 
+INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`)
+    VALUES
+        (0, 0, 24, '', '[1,2,3]', 2, 56);
+
 INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
     VALUES
         (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
@@ -2741,7 +2745,7 @@ INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldIns
 
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
-        (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
+        (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
 
 INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
     VALUES

db/dump/structure.sql

@@ -80202,3 +80202,5 @@ USE `vncontrol`;
 
 -- Dump completed on 2022-11-21  7:57:28
 
+
+

e2e/helpers/selectors.js

@@ -417,8 +417,8 @@ export default {
         fourthFixedPrice: 'vn-fixed-price tr:nth-child(5)',
         fourthItemID: 'vn-fixed-price tr:nth-child(5) vn-autocomplete[ng-model="price.itemFk"]',
         fourthWarehouse: 'vn-fixed-price tr:nth-child(5) vn-autocomplete[ng-model="price.warehouseFk"]',
-        fourthPPU: 'vn-fixed-price tr:nth-child(5) > td:nth-child(4)',
+        fourthGroupingPrice: 'vn-fixed-price tr:nth-child(5) >  td:nth-child(4)',
-        fourthPPP: 'vn-fixed-price tr:nth-child(5) > td:nth-child(5)',
+        fourthPackingPrice: 'vn-fixed-price tr:nth-child(5) > td:nth-child(5)',
         fourthHasMinPrice: 'vn-fixed-price tr:nth-child(5) > td:nth-child(6) > vn-check[ng-model="price.hasMinPrice"]',
         fourthMinPrice: 'vn-fixed-price tr:nth-child(5) >  td:nth-child(6) > vn-input-number[ng-model="price.minPrice"]',
         fourthStarted: 'vn-fixed-price tr:nth-child(5) vn-date-picker[ng-model="price.started"]',
@@ -428,6 +428,7 @@ export default {
     },
     itemCreateView: {
         temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]',
+        priority: 'vn-autocomplete[ng-model="$ctrl.item.priority"]',
         type: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
         intrastat: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]',
         origin: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]',
@@ -521,7 +522,7 @@ export default {
     },
     itemLog: {
         anyLineCreated: 'vn-item-log > vn-log vn-tbody > vn-tr',
-        fifthLineCreatedProperty: 'vn-item-log > vn-log vn-tbody > vn-tr:nth-child(5) table tr:nth-child(3) td.after',
+        fifthLineCreatedProperty: 'vn-item-log > vn-log vn-tbody > vn-tr:nth-child(5) table tr:nth-child(2) td.after',
     },
     ticketSummary: {
         header: 'vn-ticket-summary > vn-card > h5',
@@ -679,7 +680,10 @@ export default {
         moveToTicketButton: '.vn-popover.shown vn-icon[icon="arrow_forward_ios"]',
         moveToNewTicketButton: '.vn-popover.shown vn-button[label="New ticket"]',
         stateMenuButton: 'vn-ticket-sale vn-tool-bar > vn-button-menu[label="State"]',
-        moreMenuState: 'body > div > div > div.content > div.filter.ng-scope > vn-textfield'
+        moreMenuState: 'body > div > div > div.content > div.filter.ng-scope > vn-textfield',
+        firstSaleHistoryButton: 'vn-ticket-sale vn-tr:nth-child(1) vn-icon-button[icon="history"]',
+        firstSaleHistory: 'form vn-table div > vn-tbody > vn-tr',
+        closeHistory: 'div.window vn-button[icon="clear"]'
     },
     ticketTracking: {
         createStateButton: 'vn-float-button'

e2e/paths/04-item/07_create.spec.js

@@ -36,11 +36,20 @@ describe('Item Create', () => {
         await page.waitForState('item.create');
     });
 
-    it('should create the Infinity Gauntlet item', async() => {
+    it('should throw an error when insert an invalid priority', async() => {
         await page.write(selectors.itemCreateView.temporalName, 'Infinity Gauntlet');
         await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
         await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
         await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
+        await page.clearInput(selectors.itemCreateView.priority);
+        await page.waitToClick(selectors.itemCreateView.createButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Valid priorities');
+    });
+
+    it('should create the Infinity Gauntlet item', async() => {
+        await page.autocompleteSearch(selectors.itemCreateView.priority, '2');
         await page.waitToClick(selectors.itemCreateView.createButton);
         const message = await page.waitForSnackbar();
 

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -24,8 +24,8 @@ describe('Item fixed prices path', () => {
     it('should fill the fixed price data', async() => {
         const now = new Date();
         await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
-        await page.write(selectors.itemFixedPrice.fourthPPU, '1');
+        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
-        await page.write(selectors.itemFixedPrice.fourthPPP, '1');
+        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');
         await page.write(selectors.itemFixedPrice.fourthMinPrice, '1');
         await page.pickDate(selectors.itemFixedPrice.fourthStarted, now);
         await page.pickDate(selectors.itemFixedPrice.fourthEnded, now);

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

@@ -196,6 +196,15 @@ describe('Ticket Edit sale path', () => {
         expect(result).toContain('22.50');
     });
 
+    it('should check in the history that logs has been added', async() => {
+        await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
+        await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
+        const result = await page.countElement(selectors.ticketSales.firstSaleHistory);
+
+        expect(result).toBeGreaterThan(0);
+        await page.waitToClick(selectors.ticketSales.closeHistory);
+    });
+
     it('should recalculate price of sales', async() => {
         await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);

e2e/paths/05-ticket/21_future.spec.js

@@ -55,7 +55,7 @@ describe('Ticket Future path', () => {
 
         await page.autocompleteSearch(selectors.ticketFuture.ipt, 'Horizontal');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 0);
+        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should search with the destination IPT', async() => {
@@ -68,7 +68,7 @@ describe('Ticket Future path', () => {
 
         await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'Horizontal');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 0);
+        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should search with the origin grouped state', async() => {
@@ -152,50 +152,6 @@ describe('Ticket Future path', () => {
         await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
-    it('should search in smart-table with especified Lines', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLines, '0');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 1);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLines, '1');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 5);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-    });
-
-    it('should search in smart-table with especified Liters', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLiters, '0');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 1);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLiters, '28');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 5);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-    });
-
     it('should check the three last tickets and move to the future', async() => {
         await page.waitToClick(selectors.ticketFuture.multiCheck);
         await page.waitToClick(selectors.ticketFuture.firstCheck);

front/salix/components/index.js

@@ -19,4 +19,5 @@ import './user-popover';
 import './upload-photo';
 import './bank-entity';
 import './log';
+import './instance-log';
 import './sendSms';

front/salix/components/instance-log/index.html

@@ -0,0 +1,12 @@
+
+<vn-dialog
+    vn-id="instanceLog">
+    <tpl-body>
+        <vn-log
+            url="{{$ctrl.url}}"
+            origin-id="$ctrl.originId"
+            changed-model="$ctrl.changedModel"
+            changed-model-id="$ctrl.changedModelId">
+        </vn-log>
+    </tpl-body>
+</vn-dialog>

front/salix/components/instance-log/index.js

@@ -0,0 +1,21 @@
+import ngModule from '../../module';
+import Section from '../section';
+import './style.scss';
+
+export default class Controller extends Section {
+    open() {
+        this.$.instanceLog.show();
+    }
+}
+
+ngModule.vnComponent('vnInstanceLog', {
+    controller: Controller,
+    template: require('./index.html'),
+    bindings: {
+        model: '<',
+        originId: '<',
+        changedModelId: '<',
+        changedModel: '@',
+        url: '@'
+    }
+});

front/salix/components/instance-log/style.scss

@@ -0,0 +1,13 @@
+.vn-dialog {
+    & > .window:not(:has(.empty-rows)) {
+        width:60%;
+        vn-log {
+            vn-card {
+                visibility: hidden;
+                & > * {
+                    visibility: visible;
+                }
+            }
+        }
+    }
+}

modules/claim/front/card/index.js

@@ -19,9 +19,9 @@ class Controller extends ModuleCard {
                 }, {
                     relation: 'ticket',
                     scope: {
-                        fields: ['agencyModeFk'],
+                        fields: ['zoneFk'],
                         include: {
-                            relation: 'agencyMode'
+                            relation: 'zone'
                         }
                     }
                 }, {

modules/claim/front/descriptor/index.html

@@ -51,8 +51,12 @@
                 </span>
             </vn-label-value>
             <vn-label-value
-                label="Agency"
+                label="Zone">
-                value="{{$ctrl.claim.ticket.agencyMode.name}}">
+                <span
+                    ng-click="zoneDescriptor.show($event, $ctrl.claim.ticket.zoneFk)"
+                    class="link">
+                    {{$ctrl.claim.ticket.zoneFk}}
+                </span>
             </vn-label-value>
             <vn-label-value
                 label="Ticket">
@@ -103,3 +107,6 @@
 <vn-popup vn-id="summary">
     <vn-claim-summary claim="$ctrl.claim"></vn-claim-summary>
 </vn-popup>
+<vn-zone-descriptor-popover
+    vn-id="zoneDescriptor">
+</vn-zone-descriptor-popover>

modules/invoiceIn/front/descriptor/index.html

@@ -36,13 +36,13 @@
             ng-if="$ctrl.isAgricultural()"
             ng-click="$ctrl.showPdfInvoice()"
             translate>
-            Show agricultural invoice as PDF
+            Show agricultural receipt as PDF
         </vn-item>
         <vn-item
             ng-if="$ctrl.isAgricultural()"
             ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplierContact[0].email})"
             translate>
-            Send agricultural invoice as PDF
+            Send agricultural receipt as PDF
         </vn-item>
     </slot-menu>
     <slot-body>

modules/invoiceIn/front/locale/es.yml

@@ -19,6 +19,6 @@ To book: Contabilizar
 Total amount: Total importe
 Total net: Total neto
 Total stems: Total tallos
-Show agricultural invoice as PDF: Ver factura agrícola como PDF
+Show agricultural receipt as PDF: Ver recibo agrícola como PDF
-Send agricultural invoice as PDF: Enviar factura agrícola como PDF
+Send agricultural receipt as PDF: Enviar recibo agrícola como PDF
 New InvoiceIn: Nueva Factura

modules/item/back/methods/fixed-price/getRate2.js

@@ -0,0 +1,39 @@
+module.exports = Self => {
+    Self.remoteMethod('getRate2', {
+        description: 'Return the rate2',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'fixedPriceId',
+                type: 'integer',
+                description: 'The fixedPrice Id',
+                required: true
+            },
+            {
+                arg: 'rate3',
+                type: 'number',
+                description: `The price rate 3`,
+                required: true
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/getRate2`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getRate2 = async(fixedPriceId, rate3, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const [result] = await Self.rawSql(`SELECT vn.priceFixed_getRate2(?, ?) as rate2`,
+            [fixedPriceId, rate3], myOptions);
+        return result;
+    };
+};

modules/item/back/methods/fixed-price/specs/getRate2.spec.js

@@ -0,0 +1,39 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('getRate2()', () => {
+    it(`should return new rate2 if exists rate`, async() => {
+        const tx = await models.FixedPrice.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const fixedPriceId = 1;
+            const rate3 = 2;
+            const result = await models.FixedPrice.getRate2(fixedPriceId, rate3, options);
+
+            expect(result.rate2).toEqual(1.9);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it(`should return null if not exists rate`, async() => {
+        const tx = await models.FixedPrice.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const fixedPriceId = 13;
+            const rate3 = 2;
+            const result = await models.FixedPrice.getRate2(fixedPriceId, rate3, options);
+
+            expect(result.rate2).toEqual(null);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/item/back/methods/item/new.js

@@ -39,8 +39,9 @@ module.exports = Self => {
             'typeFk',
             'intrastatFk',
             'originFk',
-            'relevancy',
+            'priority',
-            'isPhotoRequested',
+            'tag',
+            'isPhotoRequested'
         ];
 
         for (const key in params) {
@@ -49,10 +50,14 @@ module.exports = Self => {
         }
 
         try {
+            const itemConfig = await models.ItemConfig.findOne({fields: ['validPriorities']}, myOptions);
+            if (!itemConfig.validPriorities.includes(params.priority))
+                throw new UserError(`Valid priorities: ${[...itemConfig.validPriorities]}`);
+
             const provisionalName = params.provisionalName;
             delete params.provisionalName;
 
-            const itemType = await models.ItemType.findById(params.typeFk, myOptions);
+            const itemType = await models.ItemType.findById(params.typeFk, {fields: ['isLaid']}, myOptions);
 
             params.isLaid = itemType.isLaid;
 
@@ -66,12 +71,13 @@ module.exports = Self => {
 
             await Self.rawSql(query, null, myOptions);
 
-            let nameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}});
+            const nameTag = await models.Tag.findById(params.tag, {fields: ['id']}, myOptions);
 
             let newTags = [];
 
-            newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: '2'});
+            newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: item.priority});
             typeTags.forEach(typeTag => {
+                if (nameTag.id != typeTag.tagFk)
                     newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
             });
 

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

@@ -11,7 +11,8 @@ describe('item new()', () => {
                 originFk: 1,
                 provisionalName: 'planta',
                 typeFk: 2,
-                relevancy: 0
+                priority: 2,
+                tag: 1
             };
 
             let item = await models.Item.new(itemParams, options);
@@ -20,7 +21,7 @@ describe('item new()', () => {
 
             item.isLaid = itemType.isLaid;
 
-            const temporalNameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}}, options);
+            const temporalNameTag = await models.Tag.findById(itemParams.tag, {fields: ['id']}, options);
 
             const temporalName = await models.ItemTag.findOne({
                 where: {
@@ -31,7 +32,7 @@ describe('item new()', () => {
 
             item = await models.Item.findById(item.id, null, options);
 
-            itemType = await models.ItemType.findById(item.typeFk, options);
+            itemType = await models.ItemType.findById(item.typeFk, {fields: ['isLaid']}, options);
 
             item.isLaid = itemType.isLaid;
 

modules/item/back/models/fixed-price.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/fixed-price/filter')(Self);
     require('../methods/fixed-price/upsertFixedPrice')(Self);
+    require('../methods/fixed-price/getRate2')(Self);
 };

modules/item/back/models/item-config.json

@@ -16,6 +16,22 @@
         "wasteRecipients": {
             "type": "string",
             "description": "Buyers waste report recipients"
+        },
+        "validPriorities": {
+            "type": "array"
+        },
+        "defaultPriority": {
+            "type": "int"
+        },
+        "defaultTag": {
+            "type": "int"
+        }
+    },
+    "relations": {
+        "tag": {
+            "type": "belongsTo",
+            "model": "Tag",
+            "foreignKey": "defaultTag"
         }
     }
 }

modules/item/back/models/item-packing-type.json

@@ -13,6 +13,9 @@
         },
         "description": {
             "type": "string"
+        },
+        "isActive":{
+            "type": "boolean"
         }
     },
     "acls": [

modules/item/front/create/index.html

@@ -16,10 +16,24 @@
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
             <vn-textfield
-                label="Temporal name" 
+                label="Name"
                 ng-model="$ctrl.item.provisionalName"
                 vn-focus>
             </vn-textfield>
+            <vn-autocomplete
+                ng-model="$ctrl.item.tag"
+                url="Tags"
+                show-field="name"
+                value-field="id"
+                label="Tag">
+            </vn-autocomplete>
+            <vn-autocomplete
+                data="$ctrl.validPriorities"
+                label="Priority"
+                ng-model="$ctrl.item.priority"
+                show-field="priority"
+                value-field="priority">
+            </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete

modules/item/front/create/index.js

@@ -4,10 +4,26 @@ import Section from 'salix/components/section';
 class Controller extends Section {
     constructor($element, $) {
         super($element, $);
+        this.fetchDefaultPriorityTag();
+    }
+
+    fetchDefaultPriorityTag() {
+        this.validPriorities = [];
+        const filter = {fields: ['defaultPriority', 'defaultTag', 'validPriorities'], limit: 1};
+        this.$http.get(`ItemConfigs`, {filter})
+            .then(res => {
+                if (res.data) {
+                    const dataRow = res.data[0];
+                    dataRow.validPriorities.forEach(priority => {
+                        this.validPriorities.push({priority});
+                    });
                     this.item = {
-            relevancy: 0
+                        priority: dataRow.defaultPriority,
+                        tag: dataRow.defaultTag
                     };
                 }
+            });
+    }
 
     onSubmit() {
         this.$.watcher.submit().then(

modules/item/front/fixed-price/index.html

@@ -41,14 +41,12 @@
                                 <span translate>Warehouse</span>
                             </th>
                             <th
-                                field="rate2"
+                                field="rate2">
-                                vn-tooltip="Price By Unit">
+                                <span translate>Grouping price</span>
-                                <span translate>P.P.U.</span>
                             </th>
                             <th
-                                field="rate3"
+                                field="rate3">
-                                vn-tooltip="Price By Package">
+                                <span translate>Packing price</span>
-                                <span translate>P.P.P.</span>
                             </th>
                             <th field="minPrice">
                                 <span translate>Min price</span>
@@ -72,7 +70,7 @@
                                     show-field="name"
                                     value-field="id"
                                     search-function="$ctrl.itemSearchFunc($search)"
-                                    on-change="$ctrl.upsertPrice(price)"
+                                    on-change="$ctrl.upsertPrice(price, true)"
                                     order="id DESC"
                                     tabindex="1">
                                     <tpl-item>
@@ -112,18 +110,32 @@
                                 </vn-autocomplete>
                             </td>
                             <td shrink-field>
+                                <vn-td-editable number>
+                                    <text>{{price.rate2 | currency: 'EUR':2}}</text>
+                                    <field>
                                         <vn-input-number
+                                            class="dense"
+                                            vn-focus
                                             ng-model="price.rate2"
                                             on-change="$ctrl.upsertPrice(price)"
                                             step="0.01">
                                         </vn-input-number>
+                                    </field>
+                                </vn-td-editable>
                             </td>
                             <td shrink-field>
+                                <vn-td-editable number>
+                                    <text>{{price.rate3 | currency: 'EUR':2}}</text>
+                                    <field>
                                         <vn-input-number
+                                            class="dense"
+                                            vn-focus
                                             ng-model="price.rate3"
-                                    on-change="$ctrl.upsertPrice(price)"
+                                            on-change="$ctrl.upsertPrice(price); $ctrl.recalculateRate2(price)"
-                                    step="0.01">
+                                            step="0.01"s>
                                         </vn-input-number>
+                                    </field>
+                                </vn-td-editable>
                             </td>
                             <td shrink-field-expand class="minPrice">
                                 <vn-check

modules/item/front/fixed-price/index.js

@@ -62,7 +62,10 @@ export default class Controller extends Section {
         });
     }
 
-    upsertPrice(price) {
+    upsertPrice(price, resetMinPrice) {
+        if (resetMinPrice)
+            delete price['minPrice'];
+
         price.hasMinPrice = price.minPrice ? true : false;
 
         let requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
@@ -110,6 +113,24 @@ export default class Controller extends Section {
             return {[param]: value};
         }
     }
+
+    recalculateRate2(price) {
+        if (!price.id || !price.rate3) return;
+
+        const query = 'FixedPrices/getRate2';
+        const params = {
+            fixedPriceId: price.id,
+            rate3: price.rate3
+        };
+        this.$http.get(query, {params})
+            .then(res => {
+                const rate2 = res.data.rate2;
+                if (rate2) {
+                    price.rate2 = rate2;
+                    this.upsertPrice(price);
+                }
+            });
+    }
 }
 
 ngModule.vnComponent('vnFixedPrice', {

modules/item/front/fixed-price/index.spec.js

@@ -85,5 +85,25 @@ describe('fixed price', () => {
                 expect(controller.$.model.remove).toHaveBeenCalled();
             });
         });
+
+        describe('recalculateRate2()', () => {
+            it(`should rate2 recalculate`, () => {
+                jest.spyOn(controller.vnApp, 'showSuccess');
+                const price = {
+                    id: 1,
+                    itemFk: 1,
+                    rate2: 2,
+                    rate3: 2
+                };
+                const response = {rate2: 1};
+                controller.recalculateRate2(price);
+
+                const query = `FixedPrices/getRate2?fixedPriceId=${price.id}&rate3=${price.rate3}`;
+                $httpBackend.expectGET(query).respond(response);
+                $httpBackend.flush();
+
+                expect(price.rate2).toEqual(response.rate2);
+            });
+        });
     });
 });

modules/item/front/fixed-price/locale/es.yml

@@ -3,5 +3,3 @@ Search prices by item ID or code: Buscar por ID de artículo o código
 Search fixed prices: Buscar precios fijados
 Add fixed price: Añadir precio fijado
 This row will be removed: Esta linea se eliminará
-Price By Unit: Precio Por Unidad
-Price By Package: Precio Por Paquete

modules/ticket/back/methods/ticket/getTicketsFuture.js

@@ -108,16 +108,26 @@ module.exports = Self => {
             switch (param) {
             case 'id':
                 return {'f.id': value};
-            case 'lines':
+            case 'linesMax':
                 return {'f.lines': {lte: value}};
-            case 'liters':
+            case 'litersMax':
                 return {'f.liters': {lte: value}};
             case 'futureId':
                 return {'f.futureId': value};
             case 'ipt':
-                return {'f.ipt': value};
+                return {or:
+                        [
+                            {'f.ipt': {like: `%${value}%`}},
+                            {'f.ipt': null}
+                        ]
+                };
             case 'futureIpt':
-                return {'f.futureIpt': value};
+                return {or:
+                        [
+                            {'f.futureIpt': {like: `%${value}%`}},
+                            {'f.futureIpt': null}
+                        ]
+                };
             case 'state':
                 return {'f.stateCode': {like: `%${value}%`}};
             case 'futureState':
@@ -203,7 +213,6 @@ module.exports = Self => {
                 tmp.ticket_problems`);
 
         const sql = ParameterizedSQL.join(stmts, ';');
-
         const result = await conn.executeStmt(sql, myOptions);
 
         return result[ticketsIndex];

modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js

@@ -19,7 +19,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -43,7 +43,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -93,7 +93,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -118,7 +118,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(1);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -143,7 +143,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -168,7 +168,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -187,13 +187,13 @@ describe('ticket getTicketsFuture()', () => {
                 originDated: today,
                 futureDated: today,
                 warehouseFk: 1,
-                ipt: 0
+                ipt: 'H'
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(0);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -218,7 +218,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -237,13 +237,13 @@ describe('ticket getTicketsFuture()', () => {
                 originDated: today,
                 futureDated: today,
                 warehouseFk: 1,
-                futureIpt: 0
+                futureIpt: 'H'
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(0);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -268,7 +268,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(1);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -293,7 +293,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/model-config.json

@@ -26,6 +26,9 @@
     "PackingSiteConfig": {
         "dataSource": "vn"
     },
+    "ExpeditionMistake": {
+        "dataSource": "vn"
+    },
     "PrintServerQueue": {
         "dataSource": "vn"
     },

modules/ticket/back/models/expeditionMistake.json

@@ -0,0 +1,33 @@
+{
+    "name": "ExpeditionMistake",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "expeditionMistake"
+        }
+    },
+    "properties": {
+      "created": {
+        "type": "date"
+      }
+    },
+    "relations": {
+      "expedition": {
+        "type": "belongsTo",
+        "model": "Expedition",
+        "foreignKey": "expeditionFk"
+      },
+      "worker": {
+        "type": "belongsTo",
+        "model": "Worker",
+        "foreignKey": "workerFk"
+      },
+      "type": {
+        "type": "belongsTo",
+        "model": "MistakeType",
+        "foreignKey": "typeFk"
+      }
+    }
+
+  }
+  

modules/ticket/front/advance-search-panel/index.js

@@ -25,7 +25,10 @@ class Controller extends SearchPanel {
 
     getItemPackingTypes() {
         let itemPackingTypes = [];
-        this.$http.get('ItemPackingTypes').then(res => {
+        const filter = {
+            where: {isActive: true}
+        };
+        this.$http.get('ItemPackingTypes', {filter}).then(res => {
             for (let ipt of res.data) {
                 itemPackingTypes.push({
                     code: ipt.code,

modules/ticket/front/advance/index.js

@@ -39,6 +39,7 @@ export default class Controller extends Section {
                     field: 'ipt',
                     autocomplete: {
                         url: 'ItemPackingTypes',
+                        where: `{isActive: true}`,
                         showField: 'description',
                         valueField: 'code'
                     }
@@ -47,6 +48,7 @@ export default class Controller extends Section {
                     field: 'futureIpt',
                     autocomplete: {
                         url: 'ItemPackingTypes',
+                        where: `{isActive: true}`,
                         showField: 'description',
                         valueField: 'code'
                     }

modules/ticket/front/future-search-panel/index.js

@@ -25,7 +25,10 @@ class Controller extends SearchPanel {
 
     getItemPackingTypes() {
         let itemPackingTypes = [];
-        this.$http.get('ItemPackingTypes').then(res => {
+        const filter = {
+            where: {isActive: true}
+        };
+        this.$http.get('ItemPackingTypes', {filter}).then(res => {
             for (let ipt of res.data) {
                 itemPackingTypes.push({
                     description: this.$t(ipt.description),

modules/ticket/front/future/index.html

@@ -129,12 +129,12 @@
                             class="link">
                             {{::ticket.id}}
                         </span></td>
-                        <td shrink-date>
+                        <td>
                             <span class="chip {{$ctrl.compareDate(ticket.shipped)}}">
-                                {{::ticket.shipped | date: 'dd/MM/yyyy'}}
+                                {{::ticket.shipped | date: 'dd/MM/yyyy HH:mm'}}
                             </span>
                         </td>
-                        <td>{{::ticket.ipt}}</td>
+                        <td>{{::ticket.ipt | dashIfEmpty}}</td>
                         <td>
                             <span
                             class="chip {{$ctrl.stateColor(ticket.state)}}">
@@ -150,12 +150,12 @@
                                 {{::ticket.futureId}}
                             </span>
                         </td>
-                        <td shrink-date>
+                        <td>
                             <span class="chip {{$ctrl.compareDate(ticket.futureShipped)}}">
-                                {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
+                                {{::ticket.futureShipped | date: 'dd/MM/yyyy HH:mm'}}
                             </span>
                         </td>
-                        <td>{{::ticket.futureIpt}}</td>
+                        <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
                         <td>
                             <span
                             class="chip {{$ctrl.stateColor(ticket.futureState)}}">

modules/ticket/front/future/index.js

@@ -34,6 +34,7 @@ export default class Controller extends Section {
                 field: 'ipt',
                 autocomplete: {
                     url: 'ItemPackingTypes',
+                    where: `{isActive: true}`,
                     showField: 'description',
                     valueField: 'code'
                 }
@@ -42,6 +43,7 @@ export default class Controller extends Section {
                 field: 'futureIpt',
                 autocomplete: {
                     url: 'ItemPackingTypes',
+                    where: `{isActive: true}`,
                     showField: 'description',
                     valueField: 'code'
                 }

modules/ticket/front/sale/index.html

@@ -68,6 +68,7 @@
                     <vn-th number>Disc</vn-th>
                     <vn-th number>Amount</vn-th>
                     <vn-th shrink>Packaging</vn-th>
+                    <vn-th shrink></vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
@@ -204,6 +205,22 @@
                     <vn-td shrink>
                         {{::sale.item.itemPackingTypeFk | dashIfEmpty}}
                     </vn-td>
+                    <vn-td shrink>
+                        <vn-icon-button
+                            vn-none
+                            vn-tooltip="History"
+                            icon="history"
+                            ng-click="log.open()">
+                        </vn-icon-button>
+                        <vn-instance-log
+                            vn-id="log"
+                            url="TicketLogs"
+                            origin-id="$ctrl.$params.id"
+                            changed-model="Sale"
+                            changed-model-id="sale.id">
+                        </vn-instance-log>
+                    </vn-td>
+
                 </vn-tr>
             </vn-tbody>
         </vn-table>

modules/ticket/front/sale/locale/es.yml

@@ -39,3 +39,4 @@ Packaging: Encajado
 Refund: Abono
 Promotion mana: Maná promoción
 Claim mana: Maná reclamación
+History: Historial

modules/worker/back/methods/worker-time-control/sendMail.js

@@ -32,22 +32,15 @@ module.exports = Self => {
         const models = Self.app.models;
         const conn = Self.dataSource.connector;
         const args = ctx.args;
-        const $t = ctx.req.__; // $translate
         let tx;
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
         const stmts = [];
         let stmt;
 
-        try {
         if (!args.week || !args.year) {
             const from = new Date();
             const to = new Date();
@@ -156,6 +149,9 @@ module.exports = Self => {
             `, [args.workerId]);
         const index = stmts.push(stmt) - 1;
 
+        stmts.push('DROP TEMPORARY TABLE tmp.timeControlCalculate');
+        stmts.push('DROP TEMPORARY TABLE tmp.timeBusinessCalculate');
+
         const sql = ParameterizedSQL.join(stmts, ';');
         const days = await conn.executeStmt(sql, myOptions);
 
@@ -165,14 +161,19 @@ module.exports = Self => {
         const workerTimeControlConfig = await models.WorkerTimeControlConfig.findOne(null, myOptions);
 
         for (let day of days[index]) {
+            if (!myOptions.transaction) {
+                tx = await Self.beginTransaction({});
+                myOptions.transaction = tx;
+            }
+            try {
                 workerFk = day.workerFk;
                 if (day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null
-                    && (day.permissionRate ? day.permissionRate : true)) {
+                    && (day.permissionRate == null ? true : day.permissionRate)) {
                     if (day.timeTable == null) {
                         const timed = new Date(day.dated);
                         await models.WorkerTimeControl.create({
                             userFk: day.workerFk,
-                            timed: timed.setHours(8),
+                            timed: timed.setHours(workerTimeControlConfig.teleworkingStart / 3600),
                             manual: true,
                             direction: 'in',
                             isSendMail: true
@@ -181,7 +182,7 @@ module.exports = Self => {
                         if (day.timeWorkDecimal >= workerTimeControlConfig.timeToBreakTime / 3600) {
                             await models.WorkerTimeControl.create({
                                 userFk: day.workerFk,
-                                timed: timed.setHours(9),
+                                timed: timed.setHours(workerTimeControlConfig.teleworkingStartBreakTime / 3600),
                                 manual: true,
                                 direction: 'middle',
                                 isSendMail: true
@@ -189,7 +190,10 @@ module.exports = Self => {
 
                             await models.WorkerTimeControl.create({
                                 userFk: day.workerFk,
-                                timed: timed.setHours(9, 20),
+                                timed: timed.setHours(
+                                    workerTimeControlConfig.teleworkingStartBreakTime / 3600,
+                                    workerTimeControlConfig.breakTime / 60
+                                ),
                                 manual: true,
                                 direction: 'middle',
                                 isSendMail: true
@@ -199,7 +203,11 @@ module.exports = Self => {
                         const [hoursWork, minutesWork, secondsWork] = getTime(day.timeWorkSexagesimal);
                         await models.WorkerTimeControl.create({
                             userFk: day.workerFk,
-                            timed: timed.setHours(8 + hoursWork, minutesWork, secondsWork),
+                            timed: timed.setHours(
+                                workerTimeControlConfig.teleworkingStart / 3600 + hoursWork,
+                                minutesWork,
+                                secondsWork
+                            ),
                             manual: true,
                             direction: 'out',
                             isSendMail: true
@@ -307,7 +315,7 @@ module.exports = Self => {
                         }, myOptions);
 
                         if (firstWorkerTimeControl)
-                            firstWorkerTimeControl.updateAttribute('direction', 'in', myOptions);
+                            await firstWorkerTimeControl.updateAttribute('direction', 'in', myOptions);
 
                         const lastWorkerTimeControl = await models.WorkerTimeControl.findOne({
                             where: {
@@ -318,7 +326,7 @@ module.exports = Self => {
                         }, myOptions);
 
                         if (lastWorkerTimeControl)
-                            lastWorkerTimeControl.updateAttribute('direction', 'out', myOptions);
+                            await lastWorkerTimeControl.updateAttribute('direction', 'out', myOptions);
                     }
                 }
 
@@ -339,15 +347,18 @@ module.exports = Self => {
                     previousWorkerFk = day.workerFk;
                     previousReceiver = day.receiver;
                 }
+
+                if (tx) {
+                    await tx.commit();
+                    delete myOptions.transaction;
                 }
-
-            if (tx) await tx.commit();
-
-            return true;
             } catch (e) {
                 if (tx) await tx.rollback();
                 throw e;
             }
+        }
+
+        return true;
     };
 
     function getStartDateOfWeekNumber(week, year) {

modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js

@@ -10,7 +10,6 @@ describe('workerTimeControl sendMail()', () => {
     const ctx = {req: activeCtx, args: {}};
 
     it('should fill time control of a worker without records in Journey and with rest', async() => {
-        pending('https://redmine.verdnatura.es/issues/4903');
         const tx = await models.WorkerTimeControl.beginTransaction({});
 
         try {
@@ -35,7 +34,6 @@ describe('workerTimeControl sendMail()', () => {
     });
 
     it('should fill time control of a worker without records in Journey and without rest', async() => {
-        pending('https://redmine.verdnatura.es/issues/4903');
         const workdayOf20Hours = 3;
         const tx = await models.WorkerTimeControl.beginTransaction({});
 
@@ -63,7 +61,6 @@ describe('workerTimeControl sendMail()', () => {
     });
 
     it('should fill time control of a worker with records in Journey and with rest', async() => {
-        pending('https://redmine.verdnatura.es/issues/4903');
         const tx = await models.WorkerTimeControl.beginTransaction({});
 
         try {
@@ -95,7 +92,6 @@ describe('workerTimeControl sendMail()', () => {
     });
 
     it('should fill time control of a worker with records in Journey and without rest', async() => {
-        pending('https://redmine.verdnatura.es/issues/4903');
         const tx = await models.WorkerTimeControl.beginTransaction({});
 
         try {

modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js

@@ -2,7 +2,7 @@ const {Email} = require('vn-print');
 
 module.exports = Self => {
     Self.remoteMethodCtx('weeklyHourRecordEmail', {
-        description: 'Sends the buyer waste email',
+        description: 'Sends the weekly hour record',
         accessType: 'WRITE',
         accepts: [
             {

modules/worker/back/models/worker-time-control-config.json

@@ -11,8 +11,17 @@
             "id": true,
             "type": "number"
         },
+        "breakTime": {
+            "type": "number"
+        },
         "timeToBreakTime": {
             "type": "number"
+        },
+        "teleworkingStart": {
+            "type": "number"
+        },
+        "teleworkingStartBreakTime": {
+            "type": "number"
         }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "9.0.0",
+    "version": "230401",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/email/invoiceIn/locale/en.yml

@@ -1,5 +1,5 @@
-subject: Your agricultural invoice
+subject: Your agricultural receipt
-title: Your agricultural invoice
+title: Your agricultural receipt
 dear: Dear supplier
 description: Attached you can find agricultural receipt generated from your last deliveries. Please return a signed and stamped copy to our administration department.
 conclusion: Thanks for your attention!

print/templates/email/invoiceIn/locale/es.yml

@@ -1,5 +1,5 @@
-subject: Tu factura agrícola
+subject: Tu recibo agrícola
-title: Tu factura agrícola
+title: Tu recibo agrícola
 dear: Estimado proveedor
 description: Adjunto puede encontrar recibo agrícola generado de sus últimas entregas. Por favor, devuelva una copia firmada y sellada a nuestro de departamento de administración.
 conclusion: ¡Gracias por tu atención!

print/templates/email/invoiceIn/locale/fr.yml

@@ -1,5 +1,5 @@
-subject: Votre facture agricole
+subject: Votre reçu agricole
-title: Votre facture agricole
+title: Votre reçu agricole
 dear: Cher Fournisseur
 description: Vous trouverez en pièce jointe le reçu agricole généré à partir de vos dernières livraisons. Veuillez retourner une copie signée et tamponnée à notre service administratif.
 conclusion: Merci pour votre attention!

print/templates/email/invoiceIn/locale/pt.yml

@@ -1,5 +1,5 @@
-subject: A sua fatura agrícola
+subject: A sua recibo agrícola
-title: A sua fatura agrícola
+title: A sua recibo agrícola
 dear: Caro Fornecedor
 description: Em anexo encontra-se o recibo agrícola gerado a partir das suas últimas entregas. Por favor, devolva uma cópia assinada e carimbada ao nosso departamento de administração.
 conclusion: Obrigado pela atenção.

print/templates/reports/item-label/sql/item.sql

@@ -3,9 +3,12 @@ SELECT
     i.name,
     i.stems, 
     i.size,
-    b.packing
+    b.packing,
+    p.name as 'producer'
 FROM vn.item i
     JOIN cache.last_buy clb ON clb.item_id = i.id
     JOIN vn.buy b ON b.id = clb.buy_id
     JOIN vn.entry e ON e.id = b.entryFk
+    JOIN vn.producer p ON p.id = i.producerFk
+
 WHERE i.id = ? AND clb.warehouse_id = ?

print/templates/reports/previa-label/assets/css/import.js

@@ -0,0 +1,12 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
+    `${__dirname}/style.css`])
+    .mergeStyles();

print/templates/reports/previa-label/assets/css/style.css

@@ -0,0 +1,85 @@
+* {
+    box-sizing: border-box;
+    padding-right: 1%;
+}
+.label {
+    font-size: 1.2em;
+    font-family: Arial, Helvetica, sans-serif;
+}
+.barcode {
+    float: left;
+    width: 40%;
+}
+.barcode h1 {
+    text-align: center;
+    font-size: 1.8em;
+    margin: 0 0 10px 0
+}
+.barcode .image {
+    text-align: center
+}
+.barcode .image img {
+    width: 170px
+}
+.data {
+    float: left;
+    width: 60%;
+}
+.data .header {
+    background-color: #000;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    margin-bottom: 25px;
+    text-align: right;
+    font-size: 1.2em;
+    padding: 0.2em;
+    color: #FFF
+}
+.data .sector,
+.data .producer {
+    text-transform: uppercase;
+    text-align: right;
+    font-size: 1.5em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.data .sector-sm {
+    text-transform: uppercase;
+    text-align: right;
+    font-size: 1.2em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.data .producer {
+    text-justify: inter-character;
+}
+.data .details {
+    border-top: 4px solid #000;
+    padding-top: 2px;
+}
+.data .details .package {
+    padding-right: 5px;
+    float: left;
+    width: 50%;
+}
+.package .packing,
+.package .dated,
+.package .labelNumber {
+    text-align: right
+}
+.package .packing {
+    font-size: 1.8em;
+    font-weight: 400
+}
+.data .details .size {
+    background-color: #000;
+    text-align: center;
+    font-size: 3em;
+    padding: 0.2em 0;
+    float: left;
+    width: 50%;
+    color: #FFF
+}

print/templates/reports/previa-label/locale/en.yml

@@ -0,0 +1,2 @@
+previous: PREVIOUS
+report: Report

print/templates/reports/previa-label/locale/es.yml

@@ -0,0 +1,2 @@
+previous: PREVIA
+report: Ticket

print/templates/reports/previa-label/options.json

@@ -0,0 +1,11 @@
+{
+    "width": "10.4cm",
+    "height": "4.8cm",
+    "margin": {
+        "top": "0cm",
+        "right": "0cm",
+        "bottom": "0cm",
+        "left": "0cm"
+    },
+    "printBackground": true
+}

print/templates/reports/previa-label/previa-label.html

@@ -0,0 +1,26 @@
+<DOCTYPE html>
+    <body>
+    <div class="label">
+        <div class="barcode">
+            <h1>{{previa.saleGroupFk}}</h1>
+            <div class="image">
+                <img v-bind:src="barcode" />
+            </div>
+        </div>
+        <div class="data">
+            <div class="header">{{ $t('previous') }}</div>
+            <div v-if="sector.description.length > 16" class="sector-sm">
+                {{sector.description}}
+            </div>
+            <div v-else class="sector">{{sector.description}}</div>
+            <div class="producer">{{ $t('report') }}#{{previa.ticketFk}}</div>
+            <div class="details">
+                <div class="package">
+                    <div class="packing">{{previa.itemPackingTypeFk}}</div>
+                    <div class="dated">{{previa.shippingHour}}:{{previa.shippingMinute}}</div>
+                </div>
+                <div class="size">{{previa.items}}</div>
+            </div>
+        </div>
+    </div>
+</body>

print/templates/reports/previa-label/previa-label.js

@@ -0,0 +1,42 @@
+const Component = require(`vn-print/core/component`);
+const reportBody = new Component('report-body');
+const qrcode = require('qrcode');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = {
+    name: 'previa-label',
+    async serverPrefetch() {
+        this.previa = await this.fetchPrevia(this.id);
+        this.sector = await this.fetchSector(this.id);
+        this.barcode = await this.getBarcodeBase64(this.id);
+
+        if (this.previa)
+            this.previa = this.previa[0];
+
+        if (!this.sector)
+            throw new UserError('Something went wrong - no sector found');
+    },
+    methods: {
+        fetchPrevia(id) {
+            return this.findOneFromDef('previa', [id]);
+        },
+        getBarcodeBase64(id) {
+            const data = String(id);
+
+            return qrcode.toDataURL(data, {margin: 0});
+        },
+        fetchSector(id) {
+            return this.findOneFromDef('sector', [id]);
+        }
+    },
+    components: {
+        'report-body': reportBody.build()
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true,
+            description: 'The saleGroupFk id'
+        },
+    }
+};

print/templates/reports/previa-label/sql/previa.sql

@@ -0,0 +1 @@
+CALL vn.previousSticker_get(?)

print/templates/reports/previa-label/sql/sector.sql

@@ -0,0 +1,4 @@
+SELECT s.description
+FROM vn.saleGroup sg
+    JOIN vn.sector s ON sg.sectorFk = s.id
+WHERE sg.id = ?