Merge branch 'dev' into 4732-previa-label

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/dump/structure.sql

@@ -80202,3 +80202,4 @@ 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"]',
@@ -679,7 +679,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/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/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/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/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/future/index.html

@@ -129,9 +129,9 @@
                             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>
@@ -150,9 +150,9 @@
                                 {{::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>

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