Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee

back/methods/chat/notifyIssues.js

@@ -0,0 +1,39 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('notifyIssues', {
+        description: 'Notifies new urgent issues',
+        accessType: 'READ',
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/notifyIssues`,
+            verb: 'GET'
+        }
+    });
+
+    Self.notifyIssues = async ctx => {
+        const models = Self.app.models;
+        const $t = ctx.req.__; // $translate
+        const [urgentIssue] = await Self.rawSql(`
+            SELECT * FROM managedesktop.vn_workOrderInmediata LIMIT 1
+        `);
+
+        if (!urgentIssue) return;
+
+        const message = $t(`There's a new urgent ticket`, {
+            title: urgentIssue.title,
+            issueId: urgentIssue.workOrderId
+        });
+
+        const department = await models.Department.findOne({
+            where: {code: 'IT'}
+        });
+        const channelName = department && department.chatName;
+
+        if (channelName)
+            return Self.send(ctx, `#${channelName}`, `@all ➔ ${message}`);
+
+        return;
+    };
+};

back/methods/chat/spec/notifyIssue.spec.js

@@ -0,0 +1,38 @@
+const app = require('vn-loopback/server/server');
+
+describe('Chat notifyIssue()', () => {
+    const ctx = {req: {accessToken: {userId: 1}}};
+    ctx.req.__ = value => {
+        return value;
+    };
+    const chatModel = app.models.Chat;
+    const departmentId = 31;
+
+    it(`should not call to the send() method and neither return a response`, async() => {
+        spyOn(chatModel, 'send').and.callThrough();
+        spyOn(chatModel, 'rawSql').and.returnValue([]);
+
+        const response = await chatModel.notifyIssues(ctx);
+
+        expect(chatModel.send).not.toHaveBeenCalled();
+        expect(response).toBeUndefined();
+    });
+
+    it(`should return a response calling the send() method`, async() => {
+        spyOn(chatModel, 'send').and.callThrough();
+        spyOn(chatModel, 'rawSql').and.returnValue([{title: 'Issue title'}]);
+
+        const department = await app.models.Department.findById(departmentId);
+        let orgChatName = department.chatName;
+        await department.updateAttribute('chatName', 'IT');
+
+        const response = await chatModel.notifyIssues(ctx);
+
+        expect(response.statusCode).toEqual(200);
+        expect(response.message).toEqual('Fake notification sent');
+        expect(chatModel.send).toHaveBeenCalledWith(ctx, '#IT', `@all ➔ There's a new urgent ticket`);
+
+        // restores
+        await department.updateAttribute('chatName', orgChatName);
+    });
+});

back/methods/chat/spec/send.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('chat send()', () => {
+describe('Chat send()', () => {
     it('should return a "Fake notification sent" as response', async() => {
         let ctx = {req: {accessToken: {userId: 1}}};
         let response = await app.models.Chat.send(ctx, '@salesPerson', 'I changed something');

back/methods/chat/spec/sendCheckingPresence.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('chat sendCheckingPresence()', () => {
+describe('Chat sendCheckingPresence()', () => {
     const today = new Date();
     today.setHours(6, 0);
     const ctx = {req: {accessToken: {userId: 1}}};

back/methods/dms/updateFile.js

@@ -11,25 +11,37 @@ module.exports = Self => {
             type: 'Number',
             description: 'The document id',
             http: {source: 'path'}
-        }, {
+        },
+        {
             arg: 'warehouseId',
             type: 'Number',
             description: 'The warehouse id'
-        }, {
+        },
+        {
             arg: 'companyId',
             type: 'Number',
             description: 'The company id'
-        }, {
+        },
+        {
             arg: 'dmsTypeId',
             type: 'Number',
             description: 'The dms type id'
-        }, {
+        },
+        {
             arg: 'reference',
             type: 'String'
-        }, {
+        },
+        {
             arg: 'description',
             type: 'String'
-        }, {
+        },
+        {
+            arg: 'hasFile',
+            type: 'Boolean',
+            description: 'True if has an attached file',
+            required: true
+        },
+        {
             arg: 'hasFileAttached',
             type: 'Boolean',
             description: 'True if has an attached file'
@@ -70,7 +82,8 @@ module.exports = Self => {
                 companyFk: args.companyId,
                 warehouseFk: args.warehouseId,
                 reference: args.reference,
-                description: args.description
+                description: args.description,
+                hasFile: args.hasFile
             }, myOptions);
 
             if (args.hasFileAttached)

back/methods/image/download.js

@@ -57,6 +57,9 @@ module.exports = Self => {
         const entity = await models[imageCollection.model].findById(id, {
             fields: ['id', imageCollection.property]
         });
+
+        if (!entity) return false;
+
         const image = await models.Image.findOne({where: {
             collectionFk: collection,
             name: entity[imageCollection.property]}

back/model-config.json

@@ -35,6 +35,15 @@
     "DmsContainer": {
         "dataSource": "dmsStorage"
     },
+    "Dms": {
+        "dataSource": "vn"
+    },
+    "DmsType": {
+        "dataSource": "vn"
+    },
+    "EmailUser": {
+        "dataSource": "vn"
+    },
     "Image": {
         "dataSource": "vn"
     },
@@ -53,38 +62,32 @@
     "Province": {
         "dataSource": "vn"
     },
-    "TempContainer": {
+    "Payment": {
-        "dataSource": "tempStorage"
-    },
-    "UserConfig": {
-        "dataSource": "vn"
-    },
-    "Warehouse": {
-        "dataSource": "vn"
-    },
-    "SageWithholding": {
-        "dataSource": "vn"
-    },
-    "UserConfigView": {
-        "dataSource": "vn"
-    },
-    "EmailUser": {
-        "dataSource": "vn"
-    },
-    "Dms": {
-        "dataSource": "vn"
-    },
-    "DmsType": {
-        "dataSource": "vn"
-    },
-    "Town": {
         "dataSource": "vn"
     },
     "Postcode": {
         "dataSource": "vn"
     },
+    "SageWithholding": {
+        "dataSource": "vn"
+    },
+    "TempContainer": {
+        "dataSource": "tempStorage"
+    },
+    "Town": {
+        "dataSource": "vn"
+    },
+    "UserConfig": {
+        "dataSource": "vn"
+    },
+    "UserConfigView": {
+        "dataSource": "vn"
+    },
     "UserLog": {
         "dataSource": "vn"
+    },
+    "Warehouse": {
+        "dataSource": "vn"
     }
 }
 

back/models/accounting-type.json

@@ -8,17 +8,20 @@
     },
     "properties": {
         "id": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
         "description": {
-            "type": "String",
+            "type": "string",
             "required": true
         },
         "receiptDescription": {
-            "type": "String",
+            "type": "string",
             "required": true
+        },
+        "code": {
+            "type": "string"
         }
     },
     "acls": [{

back/models/chat.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/chat/send')(Self);
     require('../methods/chat/sendCheckingPresence')(Self);
+    require('../methods/chat/notifyIssues')(Self);
 };

back/models/company.json

@@ -18,6 +18,9 @@
         },
         "expired": {
             "type": "date"
+        },
+        "isOfficial": {
+            "type": "boolean"
         }
     },
 

back/models/dms.json

@@ -30,7 +30,7 @@
             "type": "string"
         },
         "hardCopyNumber": {
-            "type": "Number"
+            "type": "number"
         },
         "hasFile": {
             "type": "boolean"

back/models/image.json

@@ -26,7 +26,7 @@
         "nRefs": {
             "type": "Number",
             "required": true,
-            "default": 0
+            "default": 1
         }
     },
     "relations": {

back/models/payment.json

@@ -0,0 +1,64 @@
+{
+	"name": "Payment",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "payment"
+		}
+	},
+	"properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "received": {
+            "type": "date"
+        },
+        "amount": {
+            "type": "number"
+        },
+        "divisa": {
+            "type": "number"
+        },
+        "concept": {
+            "type": "string"
+        },
+        "created": {
+            "type": "date"
+        },
+        "isConciliated": {
+            "type": "boolean"
+        },
+        "dueDated": {
+            "type": "date"
+        }
+    },
+    "relations": {
+        "supplier": {
+            "type": "belongsTo",
+            "model": "Supplier",
+            "foreignKey": "supplierFk"
+        },
+        "currency": {
+            "type": "belongsTo",
+            "model": "Currency",
+            "foreignKey": "currencyFk"
+        },
+        "bank": {
+            "type": "belongsTo",
+            "model": "Bank",
+            "foreignKey": "bankFk"
+        },
+        "payMethod": {
+            "type": "belongsTo",
+            "model": "PayMethodFk",
+            "foreignKey": "payMethodFk"
+        },
+        "company": {
+            "type": "belongsTo",
+            "model": "Company",
+            "foreignKey": "companyFk"
+        }
+    }
+}

db/changes/10260-holidays/00-ACL.sql

@@ -1,2 +1 @@
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) VALUES ('Image', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) VALUES ('Image', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('PayDem', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/10271-wisemen/00-ACL.sql

@@ -1,3 +1,5 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('FixedPrice', '*', '*', 'ALLOW', 'ROLE', 'buyer');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('PayDem', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Client', 'createReceipt', '*', 'ALLOW', 'ROLE', 'administrative');
 INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
     VALUES ('PrintServerQueue', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('FixedPrice', '*', '*', 'ALLOW', 'ROLE', 'buyer');

db/changes/10271-wisemen/01-doCompensation.sql

@@ -0,0 +1,82 @@
+DROP PROCEDURE IF EXISTS vn.ledger_doCompensation;
+
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10))
+BEGIN
+/**
+ * Compensa un pago o un recibo insertando en contabilidad
+ *
+ * @param vDated fecha en la cual se anota
+ * @param vCompensationAccount cuenta contable contra la que se compensa
+ * @param vBankFk banco de la compensacion
+ * @param vConcept descripcion
+ * @param vAmount cantidad que se compensa
+ * @param vCompany empresa
+ * @param vOriginalAccount cuenta contable desde la cual se compensa 
+ * 
+ */   
+	DECLARE vNewBookEntry INT;
+    DECLARE vIsClientCompensation INT;
+	DECLARE vClientFk INT;
+    DECLARE vSupplierFk INT;
+  	DECLARE vIsOriginalAClient BOOL;
+    DECLARE vPayMethodCompensation INT;
+    
+	CALL ledger_next(vNewBookEntry);
+
+	SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci;
+
+	SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation 
+		FROM client 
+		WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci;
+	
+	SET @vAmount1:= 0.0;
+	SET @vAmount2:= 0.0;
+
+    INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) 
+		VALUES ( 	vNewBookEntry, 
+					vDated, 
+					vOriginalAccount, 
+					vCompensationAccount, 
+					vConcept, 
+					@vAmount1:= IF(
+						(vIsOriginalAClient OR NOT vIsOriginalAClient)
+						AND vAmount > 0, 
+						0, 
+						ABS(vAmount)
+					),
+					@vAmount2:= IF(@vAmount1,
+						0,
+						ABS(vAmount)
+					),
+					vCompanyFk
+				),
+                (	vNewBookEntry, 
+               		vDated, 
+               		vCompensationAccount, 
+               		vOriginalAccount, 
+               		vConcept, 
+               		@vAmount2,
+					@vAmount1,
+               		vCompanyFk);
+   
+    IF vIsClientCompensation THEN
+    	IF vIsOriginalAClient THEN
+    		SET vAmount = -vAmount;
+    	END IF;
+		INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) 
+			VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE);
+    ELSE
+    	IF NOT vIsOriginalAClient THEN
+    		SET vAmount = -vAmount;
+    	END IF;
+	    SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
+		SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation';
+	
+		INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated)
+			VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE);
+    END IF;
+END$$
+DELIMITER ;

db/changes/10271-wisemen/02-triggerReceipt.sql

@@ -0,0 +1,17 @@
+DROP TRIGGER IF EXISTS vn.receipt_beforInsert;
+
+DELIMITER $$
+$$
+CREATE TRIGGER receipt_beforInsert
+BEFORE INSERT
+ON receipt FOR EACH ROW
+BEGIN 
+	SELECT isAutoConciliated INTO @isAutoConciliated 
+		FROM accounting a 
+			JOIN accountingType at2 ON at2.id = a.accountingTypeFk 
+		WHERE a.id =NEW.bankFk;
+
+	SET NEW.isConciliate = @isAutoConciliated;
+END
+$$
+DELIMITER ;

db/changes/10280-valentineDay/00-department.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `vn`.`department`
+	ADD code VARCHAR(45) NULL AFTER id;
+
+UPDATE `vn`.`department` t SET t.code = 'IT', t.chatName = 'informatica-cau' WHERE t.id = 31;

db/changes/10280-valentineDay/00-itemImageQueue.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`itemImageQueue`
+	ADD attempts INT default 0 NULL AFTER error;

db/config.ini

@@ -3,4 +3,4 @@ host = localhost
 port = 3306
 user = root
 password = root
-default-character-set=utf8
+default-character-set=utf8

db/dump/fixtures.sql

@@ -150,21 +150,20 @@ INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `park
 
 INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`,`code`)
     VALUES 
-        (1,     'CC y Polizas de crédito',   NULL,              NULL),
+        (1,     'CC y Polizas de crédito',  NULL,              NULL),
-        (2,     'Caja registradora',         NULL,              NULL),
+        (2,     'Cash',                     NULL,              'cash'),
-        (3,     'Tarjeta de credito',        NULL,              NULL),
+        (3,     'Credit card',              NULL,              'creditCard'),
-        (4,     'Lineas de financiacion',    NULL,              NULL),
+        (4,     'Finalcial lines',          NULL,              NULL),
-        (5,     'Otros productos',           NULL,              NULL),
+        (5,     'Other products',           NULL,              NULL),
-        (6,     'Prestamos',                 NULL,              NULL),
+        (6,     'Loans',                    NULL,              NULL),
-        (7,     'Leasing',                   NULL,              NULL),
+        (7,     'Leasing',                  NULL,              NULL),
-        (8,     'Compensaciones',            NULL,              NULL),
+        (8,     'Compensations',           'Compensations',    'Compensations');
-        (9,     'Cash',                      'Cash',            NULL),
+        
-        (10,    'Card',                      'Pay on receipt',  NULL);
-
 INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`)
     VALUES 
-        (1, 'Pay on receipt',   '0000000000', 10,   0, 1, 1),
+        (1, 'Pay on receipt',   '0000000000', 3, 0, 1, 1),
-        (2, 'Cash',             '1111111111', 9,    0, 1, 1);
+        (2, 'Cash',             '1111111111', 2, 0, 1, 1),
+        (3, 'Compensation',     '0000000000', 8, 0, 1, 1);
 
 INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
     VALUES
@@ -212,13 +211,13 @@ UPDATE `vn`.`agencyMode` SET `web` = 1;
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
-INSERT INTO `vn`.`payMethod`(`id`, `name`, `graceDays`, `outstandingDebt`, `ibanRequired`)
+INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `ibanRequired`)
     VALUES 
-        (1, 'PayMethod one',            0,  001, 0),
+        (1, NULL,           'PayMethod one',            0,  001, 0),
-        (2, 'PayMethod two',            10, 001, 0),
+        (2, NULL,           'PayMethod two',            10, 001, 0),
-        (3, 'PayMethod three',          0,  001, 0),
+        (3, 'compensation', 'PayMethod three',          0,  001, 0),
-        (4, 'PayMethod with IBAN',      0,  001, 1),
+        (4, NULL,           'PayMethod with IBAN',      0,  001, 1),
-        (5, 'PayMethod five',           10, 001, 0);
+        (5, NULL,           'PayMethod five',           10, 001, 0);
 
 INSERT INTO `vn`.`payDem`(`id`, `payDem`)
     VALUES 
@@ -271,17 +270,17 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
 INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`fax`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`,`mailAddress`,`cplusTerIdNifFk`,`hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`)
     VALUES
         (101,     'Bruce Wayne',        '84612325V',  'Batman',         'Alfred',           '1007 Mountain Drive, Gotham',                  'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
-        (102,     'Petter Parker',      '87945234L',  'Spider man',     'Aunt May',         '20 Ingram Street',                             'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
+        (102,     'Petter Parker',      '87945234L',  'Spider man',     'Aunt May',         '20 Ingram Street, Queens, USA',                'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
-        (103,     'Clark Kent',         '06815934E',  'Super man',      'lois lane',        '344 Clinton Street',                           'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 1, 1, 0,    19, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
+        (103,     'Clark Kent',         '06815934E',  'Super man',      'lois lane',        '344 Clinton Street, Apartament 3-D',           'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 1, 1, 0,    19, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
-        (104,     'Tony Stark',         '06089160W',  'Iron man',       'Pepper Potts',     '10880 Malibu Point',                           'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
+        (104,     'Tony Stark',         '06089160W',  'Iron man',       'Pepper Potts',     '10880 Malibu Point, 90265',                    'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1),
         (105,     'Max Eisenhardt',     '251628698',  'Magneto',        'Rogue',            'Unknown Whereabouts',                          'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  8, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1),
-        (106,     'DavidCharlesHaller', '53136686Q',  'Legion',         'Charles Xavier',   'Evil hideout',                                 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1, 0, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1),
+        (106,     'DavidCharlesHaller', '53136686Q',  'Legion',         'Charles Xavier',   'City of New York, New York, USA',              'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1, 0, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1),
-        (107,     'Hank Pym',           '09854837G',  'Ant man',        'Hawk',             'Anthill',                                      'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1),
+        (107,     'Hank Pym',           '09854837G',  'Ant man',        'Hawk',             'Anthill, San Francisco, California',           'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1),
         (108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1),
         (109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1),
         (110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1),
-        (111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space',                                    'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1),
+        (111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1),
-        (112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city',                                'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1);
+        (112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1);
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'SILLA', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, CURDATE(), 1

e2e/helpers/selectors.js

@@ -186,8 +186,11 @@ export default {
     clientBalance: {
         company: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]',
         newPaymentButton: `vn-float-button`,
-        newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
+        newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.bankFk"]',
-        newPaymentAmount: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"]',
+        newPaymentAmount: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.amountPaid"]',
+        newDescription: 'vn-textfield[ng-model="$ctrl.receipt.description"]',
+        deliveredAmount: '.vn-dialog vn-input-number[ng-model="$ctrl.deliveredAmount"]',
+        refundAmount: '.vn-dialog vn-input-number[ng-model="$ctrl.amountToReturn"]',
         saveButton: '.vn-dialog.shown [response="accept"]',
         firstLineBalance: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)',
         firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable',
@@ -389,18 +392,22 @@ export default {
         descriptorTicketId: 'vn-ticket-descriptor > vn-descriptor-content > div > div.body > div.top > div'
     },
     ticketsIndex: {
+        anySearchResult: 'vn-ticket-index vn-tbody > a',
         openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]',
         advancedSearchInvoiceOut: 'vn-ticket-search-panel vn-textfield[ng-model="filter.refFk"]',
         advancedSearchDaysOnward: 'vn-ticket-search-panel vn-input-number[ng-model="filter.scopeDays"]',
+        advancedSearchClient: 'vn-ticket-search-panel vn-textfield[ng-model="filter.clientFk"]',
         advancedSearchButton: 'vn-ticket-search-panel button[type=submit]',
         newTicketButton: 'vn-ticket-index a[ui-sref="ticket.create"]',
         searchResult: 'vn-ticket-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
+        firstTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > vn-check',
         secondTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(2) > vn-td:nth-child(1) > vn-check',
         thirdTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(3) > vn-td:nth-child(1) > vn-check',
         sixthTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(6) > vn-td:nth-child(1) > vn-check',
         payoutButton: 'vn-ticket-index vn-button[icon="icon-recovery"]',
         payoutCompany: '.vn-dialog vn-autocomplete[ng-model="$ctrl.receipt.companyFk"]',
-        payoutBank: '.vn-dialog vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
+        payoutBank: '.vn-dialog vn-autocomplete[ng-model="$ctrl.bankFk"]',
+        payoutDescription: 'vn-textfield[ng-model="$ctrl.receipt.description"]',
         submitPayout: '.vn-dialog button[response="accept"]',
         searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr',
         searchResultDate: 'vn-ticket-summary [label=Landed] span',

e2e/paths/02-client/14_balance.spec.js

@@ -38,7 +38,7 @@ describe('Client balance path', () => {
         expect(message.text).toContain('Data saved!');
     });
 
-    it('should click the new payment button', async() => {
+    it('should reload the section', async() => {
         await page.closePopup();
         await page.reloadSection('client.card.balance.index');
     });
@@ -46,7 +46,8 @@ describe('Client balance path', () => {
     it('should create a new payment that clears the debt', async() => {
         await page.closePopup();
         await page.waitToClick(selectors.clientBalance.newPaymentButton);
-        await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Pay on receipt');
+        await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Cash');
+        await page.write(selectors.clientBalance.newDescription, 'Description');
         await page.waitToClick(selectors.clientBalance.saveButton);
         const message = await page.waitForSnackbar();
 
@@ -78,16 +79,24 @@ describe('Client balance path', () => {
         expect(firstBalanceLine).toContain('0.00');
     });
 
-    it('should create a new payment that sets the balance to positive value', async() => {
+    it('should create a new payment and check the cash comparison works correctly', async() => {
+        const amountPaid = '100';
+        const cashHanded = '500';
+        const expectedRefund = '400';
+
         await page.waitToClick(selectors.clientBalance.newPaymentButton);
-        await page.overwrite(selectors.clientBalance.newPaymentAmount, '100');
+        await page.write(selectors.clientBalance.newPaymentAmount, amountPaid);
+        await page.write(selectors.clientBalance.newDescription, 'Payment');
+        await page.write(selectors.clientBalance.deliveredAmount, cashHanded);
+        const refund = await page.waitToGetProperty(selectors.clientBalance.refundAmount, 'value');
         await page.waitToClick(selectors.clientBalance.saveButton);
         const message = await page.waitForSnackbar();
 
+        expect(refund).toEqual(expectedRefund);
         expect(message.text).toContain('Data saved!');
     });
 
-    it('should check balance is now -100', async() => {
+    it('should check the balance value is now -100', async() => {
         let result = await page
             .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');
 
@@ -96,7 +105,9 @@ describe('Client balance path', () => {
 
     it('should create a new payment that sets the balance back to the original negative value', async() => {
         await page.waitToClick(selectors.clientBalance.newPaymentButton);
+        await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Pay on receipt');
         await page.overwrite(selectors.clientBalance.newPaymentAmount, '-150');
+        await page.write(selectors.clientBalance.newDescription, 'Description');
         await page.waitToClick(selectors.clientBalance.saveButton);
         const message = await page.waitForSnackbar();
 

e2e/paths/05-ticket/18_index_payout.spec.js

@@ -22,23 +22,31 @@ describe('Ticket index payout path', () => {
     it('should check the second ticket from a client and 1 of another', async() => {
         await page.waitToClick(selectors.globalItems.searchButton);
         await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
-        await page.waitToClick(selectors.ticketsIndex.sixthTicketCheckbox);
+        await page.waitToClick(selectors.ticketsIndex.thirdTicketCheckbox);
         await page.waitToClick(selectors.ticketsIndex.payoutButton);
         const message = await page.waitForSnackbar();
 
         expect(message.text).toContain('You cannot make a payment on account from multiple clients');
     });
 
-    it('should uncheck the sixth ticket result and check the third which is from the same client then open the payout form', async() => {
+    it('should search for tickets of the same client then open the payout form', async() => {
-        await page.waitToClick(selectors.ticketsIndex.sixthTicketCheckbox);
+        await page.waitToClick(selectors.ticketsIndex.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketsIndex.thirdTicketCheckbox);
+        await page.write(selectors.ticketsIndex.advancedSearchClient, '101');
+        await page.keyboard.press('Enter');
+        await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 6);
+        await page.waitToClick(selectors.ticketsIndex.firstTicketCheckbox);
+        await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
+
         await page.waitToClick(selectors.ticketsIndex.payoutButton);
 
         await page.waitForSelector(selectors.ticketsIndex.payoutCompany);
     });
 
     it('should fill the company and bank to perform a payout', async() => {
+        await page.autocompleteSearch(selectors.ticketsIndex.payoutCompany, 'VNL');
         await page.autocompleteSearch(selectors.ticketsIndex.payoutBank, 'cash');
+        await page.write(selectors.clientBalance.newPaymentAmount, '100');
+        await page.write(selectors.ticketsIndex.payoutDescription, 'Payment');
         await page.waitToClick(selectors.ticketsIndex.submitPayout);
         const message = await page.waitForSnackbar();
 

front/core/components/autocomplete/index.js

@@ -20,7 +20,7 @@ export default class Autocomplete extends Field {
     constructor($element, $, $compile, $transclude) {
         super($element, $, $compile);
         this.$transclude = $transclude;
-
+        this.$compile = $compile;
         this._selection = null;
         this.input = this.element.querySelector('input');
     }
@@ -149,6 +149,9 @@ export default class Autocomplete extends Field {
                 where: where
             };
 
+            if (this.include)
+                filter.include = this.include;
+
             let json = encodeURIComponent(JSON.stringify(filter));
             this.$http.get(`${this.url}?filter=${json}`).then(
                 json => this.onSelectionRequest(json.data),
@@ -182,8 +185,14 @@ export default class Autocomplete extends Field {
             } else {
                 display = this._selection[this.showField];
                 if (hasTemplate) {
-                    let template = this.$transclude(() => {}, null, 'tplItem').text();
+                    let template = this.$transclude(() => {}, null, 'tplItem');
-                    display = this.$interpolate(template)(this._selection);
+                    const element = template[0];
+                    const description = element.querySelector('.text-secondary');
+                    if (description) description.remove();
+
+                    const displayElement = angular.element(element);
+                    const displayText = displayElement.text();
+                    display = this.$interpolate(displayText)(this._selection);
                 }
             }
         }

front/core/components/table/style.scss

@@ -85,6 +85,25 @@ vn-table {
                     max-width: 400px;
                     min-width: 0;
                 }
+                &[vn-fetched-tags] {
+                    width: 235px;
+                    min-width: 155px;
+                    & > vn-one {
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        font-size: 0.75rem;
+                    }
+            
+                    & > vn-one:nth-child(2) h3 {
+                        color: $color-font-secondary;
+                        text-transform: uppercase;
+                        line-height: initial;
+                        font-size: 0.75rem
+                    }
+                }
+                &[vn-fetched-tags][wide] {
+                    width: 430px;
+                }
                 vn-icon.bright, i.bright {
                     color: #f7931e;
                 }

front/salix/components/summary/index.js

@@ -2,7 +2,13 @@ import ngModule from '../../module';
 import Section from '../section';
 import './style.scss';
 
-export default class Summary extends Section {}
+export default class Summary extends Section {
+    listEmails(email) {
+        if (!email) return;
+        const emailList = email.split(',');
+        return emailList.join(', ');
+    }
+}
 
 ngModule.vnComponent('vnSummary', {
     controller: Summary

front/salix/components/summary/index.spec.js

@@ -0,0 +1,30 @@
+import './index.js';
+
+describe('Salix', () => {
+    describe('Component vnSummary', () => {
+        let controller;
+
+        beforeEach(ngModule('salix'));
+
+        beforeEach(inject($componentController => {
+            const $element = angular.element('<vn-summary></vn-summary>');
+            controller = $componentController('vnSummary', {$element});
+        }));
+
+        describe('listEmails()', () => {
+            it('should do nothing when receives no arguments', () => {
+                const emailList = controller.listEmails();
+
+                expect(emailList).toBeUndefined();
+            });
+
+            it('should format the receives emails to be separated with comma', () => {
+                const expectedResult = 'captainmarvel@marvel.com, ironman@marvel.com';
+
+                const emailList = controller.listEmails('captainmarvel@marvel.com,ironman@marvel.com');
+
+                expect(emailList).toEqual(expectedResult);
+            });
+        });
+    });
+});

loopback/locale/en.json

@@ -85,8 +85,11 @@
 	"You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
 	"The social name cannot be empty": "The social name cannot be empty",
 	"The nif cannot be empty": "The nif cannot be empty",
+	"Amount cannot be zero": "Amount cannot be zero",
+	"Company has to be official": "Company has to be official",
 	"A travel with this data already exists": "A travel with this data already exists",
 	"The observation type can't be repeated": "The observation type can't be repeated",
-	"New ticket request has been created with price": "New ticket request has been created '{{description}}' for day <strong>{{shipped}}</strong>, with a quantity of <strong>{{quantity}}</strong> and a price of <strong>{{price}} €</strong>",
+	"New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
-	"New ticket request has been created": "New ticket request has been created '{{description}}' for day <strong>{{shipped}}</strong>, with a quantity of <strong>{{quantity}}</strong>"
+	"New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
+	"There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})"
 }

loopback/locale/es.json

@@ -161,11 +161,15 @@
 	"The nif cannot be empty": "El NIF no puede quedar en blanco",
 	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
 	"ASSIGN_ZONE_FIRST": "Asigna una zona primero",
+	"Amount cannot be zero": "El importe no puede ser cero",
+	"Company has to be official": "Empresa inválida",
 	"You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
 	"You can't upload images on the test environment": "No puedes subir imágenes en el entorno de pruebas",
 	"The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
 	"Sorts whole route": "Reordena ruta entera",
-	"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong> y un precio de <strong>{{price}} €</strong>",
+	"Invalid account": "Cuenta inválida",
-	"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong>",
+	"New ticket request has been created with price": "Se ha creado una nueva petición de compra *'{{description}}'* para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
-	"That item doesn't exists": "Ese artículo no existe"
+	"New ticket request has been created": "Se ha creado una nueva petición de compra *'{{description}}'* para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
+	"That item doesn't exists": "Ese artículo no existe",
+	"There's a new urgent ticket": "Hay un nuevo ticket urgente: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})"
 }

loopback/util/date.js

@@ -0,0 +1,25 @@
+/**
+ * Transforms a UTC date to string without datetime.
+ *
+ * @param {date} date Date to format
+ * @return {String} Formatted date string
+ */
+function toString(date) {
+    date = new Date(date);
+
+    let day = date.getDate();
+    let month = date.getMonth() + 1;
+    let year = date.getFullYear();
+
+    if (day < 10)
+        day = `0${day}`;
+
+    if (month < 10)
+        month = `0${month}`;
+
+    return `${day}-${month}-${year}`;
+}
+
+module.exports = {
+    toString: toString
+};

modules/account/front/routes.json

@@ -31,6 +31,9 @@
             {"state": "account.alias.card.users", "icon": "groups"}
         ]
     },
+    "keybindings": [
+        {"key": "u", "state": "account.index"}
+    ],
     "routes": [
         {
             "url": "/account",

modules/claim/front/detail/index.js

@@ -86,16 +86,15 @@ class Controller extends Section {
         });
     }
 
-    showDeleteConfirm(index) {
+    showDeleteConfirm($index) {
-        this.sale = this.salesClaimed[index];
+        this.claimedIndex = $index;
         this.$.confirm.show();
     }
 
     deleteClaimedSale() {
-        let query = `ClaimBeginnings/${this.sale.id}`;
+        this.$.model.remove(this.claimedIndex);
-        this.$http.delete(query).then(() => {
+        this.$.model.save().then(() => {
             this.vnApp.showSuccess(this.$t('Data saved!'));
-            this.$.model.remove(this.sale);
             this.calculateTotals();
         });
     }

modules/claim/front/detail/index.spec.js

@@ -73,13 +73,16 @@ describe('claim', () => {
 
         describe('deleteClaimedSale()', () => {
             it('should make a delete and call refresh and showSuccess', () => {
-                controller.sale = {id: 1};
+                const claimedIndex = 1;
+                controller.claimedIndex = claimedIndex;
                 jest.spyOn(controller.$.model, 'remove');
+                jest.spyOn(controller.$.model, 'save');
                 jest.spyOn(controller.vnApp, 'showSuccess');
-                $httpBackend.expectDELETE(`ClaimBeginnings/1`).respond('ok');
-                controller.deleteClaimedSale();
-                $httpBackend.flush();
 
+                controller.deleteClaimedSale();
+
+                expect(controller.$.model.remove).toHaveBeenCalledWith(claimedIndex);
+                expect(controller.$.model.save).toHaveBeenCalledWith();
                 expect(controller.vnApp.showSuccess).toHaveBeenCalled();
             });
         });

modules/client/back/methods/client/createReceipt.js

@@ -0,0 +1,144 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = function(Self) {
+    Self.remoteMethodCtx('createReceipt', {
+        description: 'Creates receipt and its compensation if necessary',
+        accepts: [{
+            arg: 'clientFk',
+            type: 'number',
+            description: 'The client id',
+            http: {source: 'path'}
+        },
+        {
+            arg: 'payed',
+            type: 'Date',
+            required: true
+        },
+        {
+            arg: 'companyFk',
+            type: 'number',
+            required: true
+        },
+        {
+            arg: 'bankFk',
+            type: 'number',
+            required: true
+        },
+        {
+            arg: 'amountPaid',
+            type: 'number',
+            required: true
+        },
+        {
+            arg: 'description',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'compensationAccount',
+            type: 'any'
+        }],
+        returns: {
+            root: true,
+            type: 'Object'
+        },
+        http: {
+            verb: 'post',
+            path: '/:clientFk/createReceipt'
+        }
+    });
+
+    Self.createReceipt = async ctx => {
+        const models = Self.app.models;
+        const args = ctx.args;
+        const tx = await models.Address.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            delete args.ctx; // Remove unwanted properties
+            const newReceipt = await models.Receipt.create(args, options);
+            const clientOriginal = await models.Client.findById(args.clientFk);
+            const bank = await models.Bank.findById(args.bankFk);
+            const accountingType = await models.AccountingType.findById(bank.accountingTypeFk);
+
+            if (args.compensationAccount) {
+                const supplierCompensation = await models.Supplier.findOne({
+                    where: {
+                        account: args.compensationAccount
+                    }
+                });
+                let clientCompensation = {};
+                if (!supplierCompensation) {
+                    clientCompensation = await models.Client.findOne({
+                        where: {
+                            accountingAccount: args.compensationAccount
+                        }
+                    });
+                }
+                if (!supplierCompensation && !clientCompensation)
+                    throw new UserError('Invalid account');
+
+                await Self.rawSql(
+                    `CALL vn.ledger_doCompensation(?, ?, ?, ?, ?, ?, ?)`,
+                    [
+                        Date(),
+                        args.compensationAccount,
+                        args.bankFk,
+                        accountingType.receiptDescription + args.compensationAccount,
+                        args.amountPaid,
+                        args.companyFk,
+                        clientOriginal.accountingAccount
+                    ],
+                    options);
+            } else {
+                const description = `${clientOriginal.id} : ${clientOriginal.nickname} - ${accountingType.receiptDescription}`;
+                const [xdiarioNew] = await Self.rawSql(
+                    `SELECT xdiario_new(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ledger;`,
+                    [
+                        null,
+                        Date(),
+                        bank.account,
+                        clientOriginal.accountingAccount,
+                        description,
+                        args.amountPaid,
+                        0,
+                        0,
+                        '',
+                        '',
+                        null,
+                        null,
+                        false,
+                        args.companyFk
+                    ],
+                    options);
+
+                await Self.rawSql(
+                    `SELECT xdiario_new(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`,
+                    [
+                        xdiarioNew.ledger,
+                        Date(),
+                        clientOriginal.accountingAccount,
+                        bank.account,
+                        description,
+                        0,
+                        args.amountPaid,
+                        0,
+                        '',
+                        '',
+                        null,
+                        null,
+                        false,
+                        args.companyFk
+                    ],
+                    options);
+            }
+
+            await tx.commit();
+            return newReceipt;
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/client/back/methods/client/specs/createReceipt.spec.js

@@ -0,0 +1,148 @@
+const app = require('vn-loopback/server/server');
+
+describe('Client createReceipt', () => {
+    const clientFk = 108;
+    const payed = Date();
+    const companyFk = 442;
+    const amountPaid = 12.50;
+    const description = 'Receipt description';
+
+    it('should create a new receipt', async() => {
+        const bankFk = 1;
+        let ctx = {
+            args: {
+                clientFk: clientFk,
+                payed: payed,
+                companyFk: companyFk,
+                bankFk: bankFk,
+                amountPaid: amountPaid,
+                description: description
+            }
+        };
+
+        const receipt = await app.models.Client.createReceipt(ctx);
+        delete ctx.args.payed;
+
+        const till = await app.models.Till.findOne({
+            where: {
+                bankFk: bankFk,
+                in: amountPaid,
+                number: clientFk
+            }
+        });
+
+        expect(receipt).toEqual(jasmine.objectContaining(ctx.args));
+
+        // restores
+        await receipt.destroy();
+        await till.destroy();
+    });
+
+    it('should throw Invalid account if compensationAccount does not belongs to a client nor a supplier', async() => {
+        let error;
+        const bankFk = 3;
+        const ctx = {
+            args: {
+                clientFk: clientFk,
+                payed: payed,
+                companyFk: companyFk,
+                bankFk: bankFk,
+                amountPaid: amountPaid,
+                description: description,
+                compensationAccount: 'non existing account'
+            }
+        };
+
+        try {
+            await app.models.Client.createReceipt(ctx);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error).toBeDefined();
+        expect(error.message).toEqual('Invalid account');
+    });
+
+    it('should create a new receipt with a compensation for a client', async() => {
+        const bankFk = 3;
+        const ctx = {
+            args: {
+                clientFk: clientFk,
+                payed: payed,
+                companyFk: companyFk,
+                bankFk: bankFk,
+                amountPaid: amountPaid,
+                description: description,
+                compensationAccount: '4300000001'
+            }
+        };
+        const receipt = await app.models.Client.createReceipt(ctx);
+        const receiptCompensated = await app.models.Receipt.findOne({
+            where: {
+                clientFk: 1,
+                bankFk: ctx.args.bankFk
+            }
+        });
+
+        const till = await app.models.Till.findOne({
+            where: {
+                bankFk: bankFk,
+                in: amountPaid,
+                number: clientFk
+            }
+        });
+
+        delete ctx.args.payed;
+
+        expect(receipt).toEqual(jasmine.objectContaining(ctx.args));
+        expect(receipt.amountPaid).toEqual(-receiptCompensated.amountPaid);
+
+        // restores
+        await receipt.destroy();
+        await receiptCompensated.destroy();
+        await till.destroy();
+    });
+
+    it('should create a new receipt with a compensation for a supplier', async() => {
+        const ctx = {
+            args: {
+                clientFk: clientFk,
+                payed: payed,
+                companyFk: companyFk,
+                bankFk: 3,
+                amountPaid: amountPaid,
+                description: description,
+                compensationAccount: '4100000001'
+            }
+        };
+        const receipt = await app.models.Client.createReceipt(ctx);
+
+        const paymentCompensated = await app.models.Payment.findOne({
+            where: {
+                clientFk: ctx.args.sale,
+                payed: ctx.args.payed,
+                amountPaid: ctx.args.amountPaid,
+                bankFk: ctx.args.bankFk
+            }
+        });
+
+        const till = await app.models.Till.findOne({
+            where: {
+                bankFk: ctx.args.bankFk,
+                in: amountPaid,
+                number: clientFk
+            }
+        });
+
+        delete ctx.args.payed;
+
+        expect(receipt).toEqual(jasmine.objectContaining(ctx.args));
+
+        expect(paymentCompensated.amountPaid).toEqual(paymentCompensated.amountPaid);
+
+        // restores
+        await receipt.destroy();
+        await paymentCompensated.destroy();
+        await till.destroy();
+    });
+});

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

@@ -8,6 +8,7 @@ describe('Address updateAddress', () => {
     const customAgentOneId = 1;
 
     it('should throw the non uee member error if no incoterms is defined', async() => {
+        let err;
         const ctx = {
             args: {
                 provinceFk: provinceId,
@@ -26,6 +27,7 @@ describe('Address updateAddress', () => {
     });
 
     it('should throw a non uee member error if no customsAgent is defined', async() => {
+        let err;
         const ctx = {
             args: {
                 provinceFk: provinceId,

modules/client/back/model-config.json

@@ -104,6 +104,9 @@
     "ClientDms": {
         "dataSource": "vn"
     },
+    "Till": {
+        "dataSource": "vn"
+    },
     "CustomsAgent": {
         "dataSource": "vn"
     },

modules/client/back/models/XDiario.json

@@ -0,0 +1,84 @@
+{
+    "name": "XDiario",
+    "base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "XDiario"
+		}
+	},
+    "properties": {
+		"ASIEN": {
+			"type": "number",
+			"id": true,
+			"description": "Identifier"
+        },
+        "FECHA": {
+			"type": "date"
+		},
+		"SUBCTA": {
+			"type": "string"
+		},
+		"CONTRA": {
+			"type": "string"
+		},
+		"CONCEPTO": {
+			"type": "string"
+		},
+		"EURODEBE": {
+			"type": "number"
+		},
+		"EUROHABER": {
+			"type": "number"
+		},
+		"BASEEURO": {
+			"type": "number"
+		},
+        "SERIE": {
+			"type": "string"
+		},
+        "CAMBIO": {
+			"type": "number"
+        },
+        "DEBEME": {
+			"type": "number"
+        },
+        "HABERME": {
+			"type": "number"
+        },
+        "FACTURA": {
+			"type": "string"
+        },
+        "IVA": {
+			"type": "number"
+        },
+        "RECEQUIV": {
+			"type": "number"
+        },
+        "METAL": {
+			"type": "number"
+        },
+        "METALIMP": {
+			"type": "number"
+        },
+        "CLIENTE": {
+			"type": "string"
+        },
+        "METALEJE": {
+			"type": "string"
+        },
+        "AUXILIAR": {
+			"type": "string"
+        },
+        "MONEDAUSO": {
+			"type": "string"
+        }
+    },
+	"relations": {
+        "company": {
+          "type": "belongsTo",
+          "model": "Company",
+          "foreignKey": "empresa_id"
+        }
+    }
+}
+  

modules/client/back/models/client.js

@@ -30,6 +30,7 @@ module.exports = Self => {
     require('../methods/client/createAddress')(Self);
     require('../methods/client/updateAddress')(Self);
     require('../methods/client/consumption')(Self);
+    require('../methods/client/createReceipt')(Self);
 
     // Validations
 

modules/client/back/models/receipt.js

@@ -1,13 +1,44 @@
 module.exports = function(Self) {
     require('../methods/receipt/filter')(Self);
 
+    Self.validateBinded('amountPaid', isNotZero, {
+        message: 'Amount cannot be zero',
+        allowNull: false,
+        allowBlank: false
+    });
+
+    function isNotZero(value) {
+        return !isNaN(value) && value != 0;
+    }
+
+    Self.validateAsync('companyFk', isOfficialCompany, {
+        message: 'Company has to be official'
+    });
+
+    async function isOfficialCompany(err, done) {
+        const hasCompany = await Self.app.models.Company.exists(this.companyFk);
+        if (!hasCompany) err();
+        done();
+    }
+
     Self.observe('before save', async function(ctx) {
         if (ctx.isNewInstance) {
             let token = ctx.options.accessToken;
             let userId = token && token.userId;
-            let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}});
 
-            ctx.instance.workerFk = worker.id;
+            ctx.instance.workerFk = userId;
+
+            await Self.app.models.Till.create({
+                workerFk: userId,
+                bankFk: ctx.instance.bankFk,
+                in: ctx.instance.amountPaid,
+                concept: ctx.instance.description,
+                dated: ctx.instance.payed,
+                serie: 'A',
+                isAccountable: true,
+                number: ctx.instance.clientFk,
+                companyFk: ctx.instance.companyFk
+            });
         }
     });
 };

modules/client/back/models/receipt.json

@@ -9,17 +9,19 @@
     "properties": {
         "id": {
             "id": true,
-            "type": "Number",
+            "type": "number",
             "description": "Identifier"
         },
         "amountPaid": {
-            "type": "Number"
+            "type": "number",
+            "required": true
         },
         "amountUnpaid": {
-            "type": "Number"
+            "type": "number"
         },
         "payed": {
-            "type": "date"
+            "type": "date",
+            "required": true
         },
         "created": {
             "type": "date"
@@ -31,7 +33,16 @@
             "type": "string",
 			"mysql": {
 				"columnName": "invoiceFk"
-			}
+			},
+            "required": true
+        },
+        "bankFk": {
+            "type": "number",
+            "required": true
+        },
+        "companyFk": {
+            "type": "number",
+            "required": true
         }
     },
     "relations": {

modules/client/back/models/till.json

@@ -0,0 +1,64 @@
+{
+    "name": "Till",
+    "base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "till"
+		}
+	},
+    "properties": {
+		"id": {
+			"type": "number",
+			"id": true,
+			"description": "Identifier"
+        },
+        "dated": {
+			"type": "date",
+			"required": true
+		},
+		"isAccountable": {
+			"type": "boolean"
+		},
+		"serie": {
+			"type": "string",
+			"required": true
+		},
+		"number": {
+			"type": "number"
+		},
+		"concept": {
+			"type": "string",
+			"required": true
+		},
+		"in": {
+			"type": "number"
+		},
+		"out": {
+			"type": "number"
+		},
+        "created": {
+			"type": "date"
+		},
+        "isConciliate": {
+			"type": "boolean"
+        }
+    },
+	"relations": {
+        "bank": {
+            "type": "belongsTo",
+            "model": "Bank",
+            "foreignKey": "bankFk"
+        },
+        "worker": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "workerFk"
+        },
+        "company": {
+          "type": "belongsTo",
+          "model": "Company",
+          "foreignKey": "companyFk"
+        }
+    }
+}
+  

modules/client/front/balance/create/index.html

@@ -6,19 +6,23 @@
         auto-load="true"
         url="Companies"
         data="companies"
-        order="code">
+        order="code"
+        required="true">
     </vn-crud-model>
     <vn-horizontal>
         <vn-date-picker
             label="Date" 
-            ng-model="$ctrl.receipt.payed">
+            ng-model="$ctrl.receipt.payed"
+            required="true">
         </vn-date-picker>
         <vn-autocomplete
             data="companies"
             label="Company"
             show-field="code"
             value-field="id"
-            ng-model="$ctrl.receipt.companyFk">
+            ng-model="$ctrl.receipt.companyFk"
+            required="true"
+            rule>
         </vn-autocomplete>
     </vn-horizontal>
     <vn-horizontal>
@@ -29,27 +33,51 @@
             value-field="id"
             fields="['accountingTypeFk']"
             include="{relation: 'accountingType'}"
-            ng-model="$ctrl.receipt.bankFk"
+            ng-model="$ctrl.bankFk"
             search-function="{or: [{id: $search}, {bank: {like: '%'+ $search +'%'}}]}"
             selection="$ctrl.bankSelection"
-            order="id">
+            order="id"
+            required="true">
             <tpl-item>{{id}}: {{bank}}</tpl-item>
         </vn-autocomplete>
         <vn-input-number
             vn-focus
             label="Amount"
-            ng-model="$ctrl.receipt.amountPaid"
+            ng-model="$ctrl.amountPaid"
             step="0.01"
-            rule>
+            required="true">
         </vn-input-number>
     </vn-horizontal>
     <vn-horizontal>
         <vn-textfield
             label="Reference"
             ng-model="$ctrl.receipt.description"
-            rule>
+            rule
+            required="true">
         </vn-textfield>
     </vn-horizontal>
+    <vn-vertical ng-show="$ctrl.bankSelection.accountingType.code == 'cash'">
+        <h6 translate>Cash</h6>
+        <vn-horizontal>
+            <vn-input-number
+                ng-model="$ctrl.deliveredAmount"
+                label="Delivered amount">
+            </vn-input-number>
+            <vn-input-number
+                disabled="true"
+                ng-model="$ctrl.amountToReturn"
+                label="Amount to return">
+            </vn-input-number>
+        </vn-horizontal>
+    </vn-vertical>
+    <vn-vertical ng-show="$ctrl.bankSelection.accountingType.code == 'compensation'">
+        <h6 translate>Compensation</h6>
+        <vn-textfield
+            ng-model="$ctrl.receipt.compensationAccount"
+            label="Compensation Account"
+            on-change="$ctrl.accountShortToStandard(value)">
+        </vn-textfield>
+    </vn-vertical>
 </tpl-body>
 <tpl-buttons>
     <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>

modules/client/front/balance/create/index.js

@@ -6,10 +6,7 @@ class Controller extends Dialog {
         super($element, $, $transclude);
 
         this.receipt = {
-            payed: new Date(),
+            payed: new Date()
-            clientFk: this.$params.id,
-            companyFk: this.vnConfig.companyFk,
-            bankFk: this.vnConfig.bankFk
         };
     }
 
@@ -17,12 +14,9 @@ class Controller extends Dialog {
         this.receipt.payed = value;
     }
 
-    set bankFk(value) {
-        this.receipt.bankFk = value;
-    }
-
     set amountPaid(value) {
         this.receipt.amountPaid = value;
+        this.amountToReturn = this.deliveredAmount - value;
     }
 
     get amountPaid() {
@@ -63,6 +57,30 @@ class Controller extends Dialog {
         }
     }
 
+    set deliveredAmount(value) {
+        this._deliveredAmount = value;
+        this.amountToReturn = value - this.receipt.amountPaid;
+    }
+
+    get deliveredAmount() {
+        return this._deliveredAmount;
+    }
+
+    get bankFk() {
+        if (!this.receipt.bankFk)
+            this.receipt.bankFk = this.vnConfig.bankFk;
+
+        return this.receipt.bankFk;
+    }
+
+    set bankFk(value) {
+        this.receipt.bankFk = value;
+    }
+
+    accountShortToStandard(value) {
+        this.receipt.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+    }
+
     getAmountPaid() {
         const filter = {
             where: {
@@ -80,7 +98,7 @@ class Controller extends Dialog {
         if (response !== 'accept')
             return super.responseHandler(response);
 
-        return this.$http.post(`Receipts`, this.receipt)
+        return this.$http.post(`Clients/${this.clientFk}/createReceipt`, this.receipt)
             .then(() => super.responseHandler(response))
             .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }

modules/client/front/balance/create/index.spec.js

@@ -65,12 +65,30 @@ describe('Client', () => {
 
                 controller.$params = {id: 101};
 
-                $httpBackend.expect('POST', `Receipts`).respond({id: 1});
+                $httpBackend.expect('POST', `Clients/101/createReceipt`).respond({id: 1});
                 controller.responseHandler('accept');
                 $httpBackend.flush();
 
                 expect(controller.vnApp.showSuccess).toHaveBeenCalled();
             });
         });
+
+        describe('deliveredAmount() setter', () => {
+            it('should set the deliveredAmount property', () => {
+                controller.amountPaid = 999;
+                controller.deliveredAmount = 1000;
+
+                expect(controller.amountToReturn).toEqual(1);
+            });
+        });
+
+        describe('accountShortToStandard()', () => {
+            it('should get de account in stardard format', () => {
+                const shortAccount = '4.3';
+                controller.accountShortToStandard(shortAccount);
+
+                expect(controller.receipt.compensationAccount).toEqual('4000000003');
+            });
+        });
     });
 });

modules/client/front/balance/index/index.html

@@ -139,7 +139,8 @@
 <vn-client-balance-create
     vn-id="balance-create"
     on-accept="$ctrl.getData()"
-    company-fk="$ctrl.companyId">
+    company-fk="$ctrl.companyId"
+    client-fk="$ctrl.$params.id">
 </vn-client-balance-create>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">

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

@@ -0,0 +1,2 @@
+Compensation: Compensación
+Cash: Efectivo

modules/client/front/consumption/index.html

@@ -64,12 +64,15 @@
                         </span>
                     </vn-td>
                     <vn-td expand>{{::sale.shipped | date: 'dd/MM/yyyy'}}</vn-td>
-                    <vn-td expand>
+                    <vn-td vn-fetched-tags wide>
+                        <vn-one title="{{::sale.concept}}">{{::sale.concept}}</vn-one>
+                        <vn-one ng-if="::sale.subName">
+                            <h3 title="{{::sale.subName}}">{{::sale.subName}}</h3>
+                        </vn-one>
                         <vn-fetched-tags
                             max-length="6"
                             item="::sale"
-                            name="::sale.concept"
+                            tabindex="-1">
-                            sub-name="::sale.subName">
                         </vn-fetched-tags>
                     </vn-td>
                     <vn-td number>{{::sale.quantity | dashIfEmpty}}</vn-td>

modules/client/front/fiscal-data/index.html

@@ -82,7 +82,6 @@
                 value-field="id"
                 label="Previous client"
                 info="In case of a company succession, specify the grantor company"
-                vn-acl="salesAssistant"
                 rule>
             </vn-autocomplete>
         </vn-horizontal>

modules/client/front/locale/es.yml

@@ -57,4 +57,7 @@ Contacts: Contactos
 Samples: Plantillas
 Send sample: Enviar plantilla
 Log: Historial
-Consumption: Consumo
+Consumption: Consumo
+Compensation Account: Cuenta para compensar
+Amount to return: Cantidad a devolver
+Delivered amount: Cantidad entregada

modules/client/front/summary/index.html

@@ -40,7 +40,7 @@
                 value="{{$ctrl.summary.mobile}}">
             </vn-label-value>
             <vn-label-value label="Email" no-ellipsize
-                value="{{$ctrl.summary.email}}">
+                value="{{$ctrl.listEmails($ctrl.summary.email)}}">
             </vn-label-value>
             <vn-label-value label="Sales person">
                 <span 

modules/entry/front/latest-buys/index.html

@@ -97,12 +97,15 @@
                     {{::buy.description | dashIfEmpty}}
                 </vn-td>
                 <vn-td number>{{::buy.size}}</vn-td>
-                <vn-td expand>
+                <vn-td vn-fetched-tags>
+                    <vn-one title="{{::buy.name}}">{{::buy.name}}</vn-one>
+                    <vn-one ng-if="::buy.subName">
+                        <h3 title="{{::buy.subName}}">{{::buy.subName}}</h3>
+                    </vn-one>
                     <vn-fetched-tags
                         max-length="6"
                         item="::buy"
-                        name="::buy.name"
+                        tabindex="-1">
-                        sub-name="::buy.subName">
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td shrink title="{{::buy.type}}">

modules/entry/front/routes.json

@@ -16,6 +16,9 @@
             {"state": "entry.card.log", "icon": "history"}
         ]
     },
+    "keybindings": [
+        {"key": "e", "state": "entry.index"}
+    ],
     "routes": [
         {
             "url": "/entry",

modules/entry/front/summary/index.html

@@ -142,12 +142,12 @@
                                 {{::line.item.minPrice | currency: 'EUR':2}}
                             </span>
                         </td>
-                        <td expand colspan="6">
+                        <td vn-fetched-tags colspan="6">
+                            <vn-one title="{{::line.item.name}}">{{::line.item.name}}</vn-one>
                             <vn-fetched-tags
-                                expand
+                                max-length="6"
                                 item="::line.item"
-                                name="::line.item.name"
+                                tabindex="-1">
-                                sub-name="::line.item.subName">
                             </vn-fetched-tags>
                         </td>
                     </tr>

modules/invoiceOut/back/methods/invoiceOut/filter.js

@@ -19,42 +19,56 @@ module.exports = Self => {
                 type: 'String',
                 description: 'Searchs the invoiceOut by id',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'clientFk',
                 type: 'Integer',
                 description: 'The client id',
                 http: {source: 'query'}
-            }, {
+            },
+            {
+                arg: 'fi',
+                type: 'String',
+                description: 'The client fiscal id',
+                http: {source: 'query'}
+            },
+            {
                 arg: 'hasPdf',
                 type: 'Boolean',
                 description: 'Whether the the invoiceOut has PDF or not',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'amount',
                 type: 'Number',
                 description: 'The amount filter',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'min',
                 type: 'Number',
                 description: 'The minimun amount flter',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'max',
                 type: 'Number',
                 description: 'The maximun amount flter',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'issued',
                 type: 'Date',
                 description: 'The issued date filter',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'created',
                 type: 'Date',
                 description: 'The created date filter',
                 http: {source: 'query'}
-            }, {
+            },
+            {
                 arg: 'dued',
                 type: 'Date',
                 description: 'The due date filter',
@@ -88,6 +102,8 @@ module.exports = Self => {
                 return {'i.created': value};
             case 'clientFk':
                 return {'i.clientFk': value};
+            case 'fi':
+                return {'c.fi': value};
             case 'amount':
             case 'companyFk':
             case 'issued':

modules/invoiceOut/front/locale/es.yml

@@ -1,2 +1,3 @@
 InvoiceOut: Facturas
-Search invoices by reference: Buscar facturas por referencia
+Search invoices by reference: Buscar facturas por referencia
+Client fiscal id: CIF del cliente

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

@@ -15,6 +15,11 @@
                 label="Client id"
                 ng-model="filter.clientFk">
             </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Client fiscal id"
+                ng-model="filter.fi">
+            </vn-textfield>
             <vn-check
                 vn-one
                 triple-state="true"

modules/item/back/methods/item-image-queue/downloadImages.js

@@ -18,39 +18,54 @@ module.exports = Self => {
 
     Self.downloadImages = async() => {
         const models = Self.app.models;
+        const container = await models.TempContainer.container('salix-image');
+        const tempPath = path.join(container.client.root, container.name);
+        const maxAttempts = 3;
 
-        try {
+        const images = await Self.find({
-            const tempPath = path.join('/tmp/salix-image');
+            where: {attempts: {eq: maxAttempts}}
+        });
 
-            // Create temporary path
+        for (let image of images) {
-            await fs.mkdir(tempPath, {recursive: true});
+            const currentStamp = new Date().getTime();
+            const updatedStamp = image.updated.getTime();
+            const graceTime = Math.abs(currentStamp - updatedStamp);
+            const maxTTL = 3600 * 48 * 1000; // 48 hours in ms;
 
-            const timer = setInterval(async() => {
+            if (graceTime >= maxTTL)
-                const image = await Self.findOne({
+                await Self.destroyById(image.itemFk);
-                    where: {error: null, url: {neq: null}}
+        }
-                });
 
-                // Exit loop
+        download();
-                if (!image) return clearInterval(timer);
 
-                const srcFile = image.url.split('/').pop();
+        async function download() {
-                const fileName = srcFile.split('.')[0];
+            const image = await Self.findOne({
-                const file = `${fileName}.png`;
+                where: {url: {neq: null}, attempts: {lt: maxAttempts}},
-                const filePath = path.join(tempPath, file);
+                order: 'attempts, updated'
+            });
+
+            if (!image) return;
+
+            const srcFile = image.url.split('/').pop();
+            const dotIndex = srcFile.lastIndexOf('.');
+
+            let fileName = srcFile.substring(0, dotIndex);
+            if (dotIndex == -1)
+                fileName = srcFile;
+
+            const file = `${fileName}.png`;
+            const filePath = path.join(tempPath, file);
+
+            https.get(image.url, async response => {
+                if (response.statusCode != 200) {
+                    const error = new Error(`Could not download the image. Status code ${response.statusCode}`);
+
+                    return await errorHandler(image.itemFk, error, filePath);
+                }
 
                 const writeStream = fs.createWriteStream(filePath);
                 writeStream.on('open', () => {
-                    https.get(image.url, async response => {
+                    response.pipe(writeStream);
-                        if (response.statusCode != 200) {
-                            const error = new Error(`Could not download the image. Status code ${response.statusCode}`);
-
-                            return await errorHandler(image.itemFk, error, filePath);
-                        }
-
-                        response.pipe(writeStream);
-                    }).on('error', async error => {
-                        await errorHandler(image.itemFk, error, filePath);
-                    });
                 });
 
                 writeStream.on('error', async error => {
@@ -58,31 +73,44 @@ module.exports = Self => {
                 });
 
                 writeStream.on('finish', async function() {
+                    writeStream.end();
+                });
+
+                writeStream.on('close', async function() {
                     try {
                         await models.Image.registerImage('catalog', filePath, fileName, image.itemFk);
                         await image.destroy();
+
+                        download();
                     } catch (error) {
                         await errorHandler(image.itemFk, error, filePath);
                     }
                 });
-            }, 1000);
+            }).on('error', async error => {
-        } catch (error) {
+                await errorHandler(image.itemFk, error, filePath);
-            throw new Error('Try-catch error: ', error);
+            });
         }
 
         async function errorHandler(rowId, error, filePath) {
             try {
                 const row = await Self.findById(rowId);
 
-                if (!row)
+                if (!row) return;
-                    throw new Error(`Could not update due error ${error}`);
 
-                await row.updateAttribute('error', error);
+                if (row.attempts < maxAttempts) {
+                    await row.updateAttributes({
+                        error: error,
+                        attempts: row.attempts + 1,
+                        updated: new Date()
+                    });
+                }
 
                 if (filePath && fs.existsSync(filePath))
                     await fs.unlink(filePath);
+
+                download();
             } catch (err) {
-                throw new Error(`ErrorHandler error: ${err}`);
+                throw new Error(`Image download failed: ${err}`);
             }
         }
     };

modules/item/back/models/item-image-queue.json

@@ -9,17 +9,25 @@
     },
     "properties": {
         "itemFk": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
         "url": {
-            "type": "String",
+            "type": "string",
             "required": true
         },
         "error": {
-            "type": "String",
+            "type": "string"
-            "required": true
+        },
+        "attempts": {
+            "type": "number"
+        },
+        "created": {
+            "type": "date"
+        },
+        "updated": {
+            "type": "date"
         }
     },
     "relations": {

modules/item/back/models/item.json

@@ -68,7 +68,8 @@
         "stemMultiplier": {
             "type": "number",
             "description": "Multiplier"
-        },"image": {
+        },
+        "image": {
             "type": "string",
             "description": "Image"
         },

modules/item/front/fetched-tags/index.html

@@ -1,8 +1,4 @@
 <vn-horizontal>
-    <vn-one title="{{$ctrl.name}}">{{$ctrl.name}}</vn-one>
-    <vn-one ng-if="$ctrl.subName">
-        <h3 title="{{$ctrl.subName}}">{{$ctrl.subName}}</h3>
-    </vn-one>
     <vn-auto>  
         <section 
             class="inline-tag ellipsize"

modules/item/front/fetched-tags/index.js

@@ -8,7 +8,5 @@ ngModule.vnComponent('vnFetchedTags', {
     bindings: {
         maxLength: '<',
         item: '<',
-        name: '<?',
-        subName: '<?'
     }
 });

modules/item/front/fetched-tags/style.scss

@@ -1,42 +1,30 @@
 @import "variables";
 
 vn-fetched-tags {
-    &.noTitle vn-one {
-        display: none !important;
-    }
     & > vn-horizontal {
         align-items: center;
 
-        & > vn-one {
+        & > vn-auto {
-            overflow: hidden;
+            flex-wrap: wrap;
-            text-overflow: ellipsis;
-            min-width: 80px;
-        }
 
-        & > vn-one:nth-child(2) h3 {
+            & > .inline-tag {
-            color: $color-font-secondary;
+                margin: 1px;
-            text-transform: uppercase;
+            }
-            line-height: initial;
-            text-align: center;
-            font-size: 1rem
         }
 
         & > vn-auto {
             display: flex;
-            padding-left: 6px;
-            min-width: 192px;
 
             & > .inline-tag {
-                display: inline-block;
                 color: $color-font-secondary;
-                margin-left: 6px;
                 text-align: center;
                 font-size: .75rem;
-                height: 20px;
+                height: 12px;
                 padding: 1px;
-                border-radius: 1px;
                 width: 64px;
                 min-width: 64px;
+                max-width: 64px;
+                flex: 1;
                 border: 1px solid $color-spacer;
     
                 &.empty {
@@ -44,22 +32,5 @@ vn-fetched-tags {
                 }
             }
         }
-        @media screen and (max-width: 1600px) {
-            flex-direction: column;
-
-            & > vn-one {
-                padding-bottom: 3px
-            }
-            & > vn-auto {
-                white-space: initial;
-                padding-left: 0;
-                flex-wrap: wrap;
-                justify-content: center;
-
-                & > .inline-tag {
-                    margin: 1px;
-                }
-            }
-        }
     }
 }

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

@@ -22,13 +22,13 @@
         model="model">
     </vn-searchbar>
 </vn-portal>
-<div class="vn-w-xl">
+<div class="vn-w-lg">
     <vn-card>
         <vn-table model="model">
             <vn-thead>
                 <vn-tr>
-                    <vn-th field="itemFk">Item ID</vn-th>
+                    <vn-th field="itemFk" shrink>Item ID</vn-th>
-                    <vn-th field="itemFk">Item</vn-th>
+                    <vn-th field="itemFk">Description</vn-th>
                     <vn-th field="warehouseFk">Warehouse</vn-th>
                     <vn-th field="rate2">P.P.U.</vn-th>
                     <vn-th field="rate3">P.P.P.</vn-th>
@@ -40,7 +40,7 @@
             </vn-thead>
             <vn-tbody>
                 <vn-tr ng-repeat="price in prices">
-                    <vn-td>
+                    <vn-td shrink>
                         <span
                             ng-if="price.itemFk"
                             ng-click="itemDescriptor.show($event, price.itemFk)"
@@ -64,16 +64,16 @@
                             </tpl-item>
                         </vn-autocomplete>
                     </vn-td>
-                    <vn-td expand>
+                    <vn-td vn-fetched-tags>
-                        <text>
+                        <vn-one title="{{price.name}}">{{price.name}}</vn-one>
-                            <vn-fetched-tags
+                        <vn-one ng-if="price.subName">
-                                max-length="6"
+                            <h3 title="{{price.subName}}">{{price.subName}}</h3>
-                                item="price"
+                        </vn-one>
-                                name="price.name"
+                        <vn-fetched-tags
-                                sub-name="price.subName"
+                            max-length="6"
-                                tabindex="-1">
+                            item="price"
-                            </vn-fetched-tags>
+                            tabindex="-1">
-                        </text>
+                        </vn-fetched-tags>
                     </vn-td>
                     <vn-td>
                         <vn-autocomplete

modules/item/front/index/index.html

@@ -15,7 +15,7 @@
                 <vn-th field="id" shrink>Id</vn-th>
                 <vn-th field="grouping" shrink>Grouping</vn-th>
                 <vn-th field="packing" shrink>Packing</vn-th>
-                <vn-th field="description" style="text-align: center">Description</vn-th>
+                <vn-th field="description">Description</vn-th>
                 <vn-th field="stems" shrink>Stems</vn-th>
                 <vn-th field="size" shrink>Size</vn-th>
                 <vn-th field="niche" shrink>Niche</vn-th>
@@ -50,12 +50,15 @@
                 </vn-td>
                 <vn-td shrink>{{::item.grouping | dashIfEmpty}}</vn-td>
                 <vn-td shrink>{{::item.packing | dashIfEmpty}}</vn-td>
-                <vn-td expand>
+                <vn-td vn-fetched-tags>
+                    <vn-one title="{{::item.name}}">{{::item.name}}</vn-one>
+                    <vn-one ng-if="::item.subName">
+                        <h3 title="{{::item.subName}}">{{::item.subName}}</h3>
+                    </vn-one>
                     <vn-fetched-tags
                         max-length="6"
-                        item="::item"
+                        item="item"
-                        name="::item.name"
+                        tabindex="-1">
-                        sub-name="::item.subName">
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td shrink>{{::item.stems}}</vn-td>

modules/item/front/index/style.scss

@@ -21,9 +21,6 @@ vn-item-product {
     vn-label-value:first-of-type section{
         margin-top: 9px;
     }
-    vn-fetched-tags vn-horizontal{
-        margin-top: 14px;
-    }
 }
 
 vn-table {

modules/order/front/line/index.html

@@ -21,7 +21,7 @@
                     <vn-th number>Id</vn-th>
                     <vn-th>Description</vn-th>
                     <vn-th>Warehouse</vn-th>
-                    <vn-th expand>Shipped</vn-th>
+                    <vn-th>Shipped</vn-th>
                     <vn-th number>Quantity</vn-th>
                     <vn-th number>Price</vn-th>
                     <vn-th number>Amount</vn-th>
@@ -42,16 +42,19 @@
                             {{::row.itemFk | zeroFill:6}}
                         </span>
                     </vn-td>
-                    <vn-td expand>
+                    <vn-td vn-fetched-tags>
+                        <vn-one title="{{::row.item.name}}">{{::row.item.name}}</vn-one>
+                        <vn-one ng-if="::row.item.subName">
+                            <h3 title="{{::row.item.subName}}">{{::row.item.subName}}</h3>
+                        </vn-one>
                         <vn-fetched-tags
                             max-length="6"
                             item="::row.item"
-                            name="::row.item.name"
+                            tabindex="-1">
-                            sub-name="::row.item.subName">
                         </vn-fetched-tags>
                     </vn-td>
-                    <vn-td shrink>{{::row.warehouse.name}}</vn-td>
+                    <vn-td>{{::row.warehouse.name}}</vn-td>
-                    <vn-td expand>{{::row.shipped | date: 'dd/MM/yyyy'}}</vn-td>
+                    <vn-td>{{::row.shipped | date: 'dd/MM/yyyy'}}</vn-td>
                     <vn-td number>{{::row.quantity}}</vn-td>
                     <vn-td number>
                         {{::row.price | currency: 'EUR':2}}

modules/order/front/summary/index.html

@@ -98,12 +98,15 @@
                                 {{::row.itemFk | zeroFill:6}}
                             </span>
                         </vn-td>
-                        <vn-td expand>
+                        <vn-td expand vn-fetched-tags>
+                            <vn-one title="{{::row.item.name}}">{{::row.item.name}}</vn-one>
+                            <vn-one ng-if="::row.item.subName">
+                                <h3 title="{{::row.item.subName}}">{{::row.item.subName}}</h3>
+                            </vn-one>
                             <vn-fetched-tags
                                 max-length="6"
                                 item="::row.item"
-                                name="::row.item.name"
+                                tabindex="-1">
-                                sub-name="::row.item.subName">
                             </vn-fetched-tags>
                         </vn-td>
                         <vn-td number>{{::row.quantity}}</vn-td>

modules/order/front/volume/index.html

@@ -24,31 +24,34 @@
         <vn-table model="model">
             <vn-thead>
                 <vn-tr>
-                    <vn-th field="itemFk" default-order="ASC" number>Item</vn-th>
+                    <vn-th shrink field="itemFk" default-order="ASC" number>Item</vn-th>
                     <vn-th>Description</vn-th>
-                    <vn-th field="quantity" number>Quantity</vn-th>
+                    <vn-th shrink field="quantity" number>Quantity</vn-th>
-                    <vn-th number>m³ per quantity</vn-th>
+                    <vn-th shrink number>m³ per quantity</vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
                 <vn-tr ng-repeat="row in rows">
-                    <vn-td number>
+                    <vn-td shrink number>
                         <span
                             ng-click="descriptor.show($event, row.itemFk)"
                             class="link">
                             {{::row.itemFk}}
                         </span>
                     </vn-td>
-                    <vn-td expand>
+                    <vn-td wide vn-fetched-tags>
+                        <vn-one title="{{::row.item.name}}">{{::row.item.name}}</vn-one>
+                        <vn-one ng-if="::row.item.subName">
+                            <h3 title="{{::row.item.subName}}">{{::row.item.subName}}</h3>
+                        </vn-one>
                         <vn-fetched-tags
                             max-length="6"
                             item="::row.item"
-                            name="::row.item.name"
+                            tabindex="-1">
-                            sub-name="::row.item.subName">
                         </vn-fetched-tags>
                     </vn-td>
-                    <vn-td number>{{::row.quantity}}</vn-td>
+                    <vn-td shrink number>{{::row.quantity}}</vn-td>
-                    <vn-td number>{{::row.volume | number:3}}</vn-td>
+                    <vn-td shrink number>{{::row.volume | number:3}}</vn-td>
                 </vn-tr>
             </vn-tbody>
         </vn-table>

modules/route/back/methods/route/specs/updateVolume.spec.js

@@ -1,8 +1,7 @@
 const app = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');
 
-// #2735 route updateVolume() returns inconsistent values
+describe('route updateVolume()', () => {
-xdescribe('route updateVolume()', () => {
     const routeId = 1;
     const userId = 50;
     const activeCtx = {
@@ -19,7 +18,6 @@ xdescribe('route updateVolume()', () => {
         expect(route.m3).toEqual(1.8);
 
         const ticket = await app.models.Ticket.findById(14);
-
         await ticket.updateAttributes({routeFk: routeId});
         await app.models.Route.updateVolume(ctx, routeId);
 
@@ -30,7 +28,8 @@ xdescribe('route updateVolume()', () => {
         const logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']});
 
         const m3Log = logs.filter(log => {
-            return log.newInstance.m3 === updatedRoute.m3;
+            if (log.newInstance)
+                return log.newInstance.m3 === updatedRoute.m3;
         });
         const logIdToDestroy = m3Log[0].id;
 

modules/route/front/main/index.html

@@ -9,6 +9,7 @@
         vn-focus
         panel="vn-route-search-panel"
         info="Search routes by id"
+        fetch-params="$ctrl.fetchParams($params)"
         filter="$ctrl.filterParams"
         model="model">
     </vn-searchbar>

modules/route/front/main/index.js

@@ -3,16 +3,36 @@ import ModuleMain from 'salix/components/module-main';
 
 export default class Route extends ModuleMain {
     $postLink() {
-        let to = new Date();
+        const to = new Date();
         to.setDate(to.getDate() + 1);
         to.setHours(0, 0, 0, 0);
 
-        let from = new Date();
+        const from = new Date();
+        from.setDate(from.getDate());
         from.setHours(0, 0, 0, 0);
 
-        this.filterParams = {from, to, warehouseFk: this.vnConfig.warehouseFk};
+        this.filterParams = {from, to};
         this.$.model.applyFilter(null, this.filterParams);
     }
+
+    fetchParams($params) {
+        const hasEntries = Object.entries($params).length;
+        if (!hasEntries)
+            $params.scopeDays = 1;
+
+        if (typeof $params.scopeDays === 'number') {
+            const from = new Date();
+            from.setHours(0, 0, 0, 0);
+
+            const to = new Date(from.getTime());
+            to.setDate(to.getDate() + $params.scopeDays);
+            to.setHours(23, 59, 59, 999);
+
+            Object.assign($params, {from, to});
+        }
+
+        return $params;
+    }
 }
 
 ngModule.vnComponent('vnRoute', {

modules/route/front/main/index.spec.js

@@ -0,0 +1,49 @@
+import './index.js';
+
+describe('Route Component vnRoute', () => {
+    let controller;
+
+    beforeEach(ngModule('route'));
+
+    beforeEach(inject($componentController => {
+        let $element = angular.element(`<div></div>`);
+        controller = $componentController('vnRoute', {$element});
+    }));
+
+    describe('fetchParams()', () => {
+        it('should return a range of dates with passed scope days', () => {
+            let params = controller.fetchParams({
+                scopeDays: 2
+            });
+            const from = new Date();
+            from.setHours(0, 0, 0, 0);
+            const to = new Date(from.getTime());
+            to.setDate(to.getDate() + params.scopeDays);
+            to.setHours(23, 59, 59, 999);
+
+            const expectedParams = {
+                from,
+                scopeDays: params.scopeDays,
+                to
+            };
+
+            expect(params).toEqual(expectedParams);
+        });
+
+        it('should return default value for scope days', () => {
+            let params = controller.fetchParams({
+                scopeDays: 1
+            });
+
+            expect(params.scopeDays).toEqual(1);
+        });
+
+        it('should return the given scope days', () => {
+            let params = controller.fetchParams({
+                scopeDays: 2
+            });
+
+            expect(params.scopeDays).toEqual(2);
+        });
+    });
+});

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

@@ -1,6 +1,6 @@
 <div class="search-panel">
-    <form ng-submit="$ctrl.onSearch()">
+    <form id="manifold-form" ng-submit="$ctrl.onSearch()">
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
                 vn-one
                 label="General search"
@@ -9,7 +9,7 @@
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
             <vn-autocomplete 
                 vn-one
                 ng-model="filter.workerFk"
@@ -29,19 +29,37 @@
                 value-field="id">
             </vn-autocomplete>
         </vn-horizontal>
-        <vn-horizontal>
+        <section class="vn-px-md">
-            <vn-date-picker
+            <vn-horizontal class="manifold-panel vn-pa-md">
-                vn-one
+                <vn-date-picker
-                label="From"
+                    vn-one
-                ng-model="filter.from">
+                    label="From"
-            </vn-date-picker>
+                    ng-model="filter.from"
-            <vn-date-picker
+                    on-change="$ctrl.from = value">
-                vn-one
+                </vn-date-picker>
-                label="To"
+                <vn-date-picker
-                ng-model="filter.to">
+                    vn-one
-            </vn-date-picker>
+                    label="To"
-        </vn-horizontal>
+                    ng-model="filter.to"
-        <vn-horizontal>
+                    on-change="$ctrl.to = value">
+                </vn-date-picker>
+                <vn-none class="or vn-px-md" translate>Or</vn-none>
+                <vn-input-number
+                    vn-one
+                    min="0"
+                    step="1"
+                    label="Days onward"
+                    ng-model="filter.scopeDays"
+                    on-change="$ctrl.scopeDays = value"
+                    display-controls="true">
+                </vn-input-number>
+                <vn-icon color-marginal
+                    icon="info"
+                    vn-tooltip="Cannot choose a range of dates and days onward at the same time">
+                </vn-icon>
+            </vn-horizontal>
+        </section>
+        <vn-horizontal class="vn-px-lg">
             <vn-autocomplete
                 vn-one
                 label="Vehicle"
@@ -56,7 +74,7 @@
                 ng-model="filter.m3">
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
             <vn-autocomplete
                 vn-one
                 label="Warehouse"
@@ -71,7 +89,7 @@
                 ng-model="filter.description">
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal class="vn-mt-lg">
+        <vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>
     </form>

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

@@ -1,7 +1,43 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
 
+class Controller extends SearchPanel {
+    constructor($, $element) {
+        super($, $element);
+        this.filter = this.$.filter;
+    }
+
+    get from() {
+        return this._from;
+    }
+
+    set from(value) {
+        this._from = value;
+        this.filter.scopeDays = null;
+    }
+
+    get to() {
+        return this._to;
+    }
+
+    set to(value) {
+        this._to = value;
+        this.filter.scopeDays = null;
+    }
+
+    get scopeDays() {
+        return this._scopeDays;
+    }
+
+    set scopeDays(value) {
+        this._scopeDays = value;
+
+        this.filter.from = null;
+        this.filter.to = null;
+    }
+}
+
 ngModule.vnComponent('vnRouteSearchPanel', {
     template: require('./index.html'),
-    controller: SearchPanel
+    controller: Controller
 });

modules/route/front/search-panel/index.spec.js

@@ -0,0 +1,48 @@
+import './index';
+
+describe('Route Component vnRouteSearchPanel', () => {
+    let controller;
+
+    beforeEach(ngModule('route'));
+
+    beforeEach(inject($componentController => {
+        controller = $componentController('vnRouteSearchPanel', {$element: null});
+        controller.$t = () => {};
+        controller.filter = {};
+    }));
+
+    describe('from() setter', () => {
+        it('should clear the scope days when setting the from property', () => {
+            controller.filter.scopeDays = 1;
+
+            controller.from = new Date();
+
+            expect(controller.filter.scopeDays).toBeNull();
+            expect(controller.from).toBeDefined();
+        });
+    });
+
+    describe('to() setter', () => {
+        it('should clear the scope days when setting the to property', () => {
+            controller.filter.scopeDays = 1;
+
+            controller.to = new Date();
+
+            expect(controller.filter.scopeDays).toBeNull();
+            expect(controller.to).toBeDefined();
+        });
+    });
+
+    describe('scopeDays() setter', () => {
+        it('should clear the date range when setting the scopeDays property', () => {
+            controller.filter.from = new Date();
+            controller.filter.to = new Date();
+
+            controller.scopeDays = 1;
+
+            expect(controller.filter.from).toBeNull();
+            expect(controller.filter.to).toBeNull();
+            expect(controller.scopeDays).toBeDefined();
+        });
+    });
+});

modules/supplier/front/consumption/index.html

@@ -37,7 +37,7 @@
             <vn-thead>
                 <vn-tr>
                     <vn-th field="entryFk" expand>Entry </vn-th>
-                    <vn-td expand>{{::entry.id}}</vn-td>
+                    <vn-td>{{::entry.id}}</vn-td>
                     <vn-th field="data">Date</vn-th>
                     <vn-td>{{::entry.shipped | date: 'dd/MM/yyyy'}}</vn-td>
                     <vn-th field="ref">Reference</vn-th>
@@ -51,10 +51,15 @@
                             {{::buy.itemName}}
                         </span>
                     </vn-td>
-                    <vn-td expand>
+                    <vn-td vn-fetched-tags wide>
+                        <vn-one></vn-one>
+                        <vn-one ng-if="::buy.subName">
+                            <h3 title="{{::buy.subName}}">{{::buy.subName}}</h3>
+                        </vn-one>
                         <vn-fetched-tags
                             max-length="6"
-                            item="::buy">
+                            item="::buy"
+                            tabindex="-1">
                         </vn-fetched-tags>
                     </vn-td>
                     <vn-td number>{{::buy.quantity | dashIfEmpty}}</vn-td>

modules/supplier/front/routes.json

@@ -17,6 +17,9 @@
             {"state": "supplier.card.consumption", "icon": "show_chart"}
         ]
     },
+    "keybindings": [
+        {"key": "p", "state": "supplier.index"}
+    ],
     "routes": [
         {
             "url": "/supplier",

modules/ticket/back/methods/ticket/filter.js

@@ -197,6 +197,7 @@ module.exports = Self => {
                         t.id,
                         t.shipped,
                         CAST(DATE(t.shipped) AS CHAR) AS shippedDate,
+                        HOUR(t.shipped) AS shippedHour,
                         t.nickname,
                         t.refFk,
                         t.routeFk,

modules/ticket/back/models/ticket-request.js

@@ -1,4 +1,5 @@
 const LoopBackContext = require('loopback-context');
+const dateUtil = require('vn-loopback/util/date');
 
 module.exports = function(Self) {
     require('../methods/ticket-request/filter')(Self);
@@ -26,12 +27,7 @@ module.exports = function(Self) {
                 if (instance.price)
                     messageText = 'New ticket request has been created with price';
 
-                const shipped = new Intl.DateTimeFormat('es', {
+                const shipped = dateUtil.toString(ticket.shipped);
-                    year: 'numeric',
-                    month: 'numeric',
-                    day: 'numeric'
-                }).format(ticket.shipped);
-
                 const message = $t(messageText, {
                     description: instance.description,
                     shipped: shipped,

modules/ticket/front/basic-data/step-two/index.html

@@ -18,11 +18,15 @@
         <vn-tbody>
             <vn-tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id">
                 <vn-td number>{{("000000"+sale.itemFk).slice(-6)}}</vn-td>
-                <vn-td expand>
+                <vn-td vn-fetched-tags wide>
+                    <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
+                    <vn-one ng-if="::sale.item.subName">
+                        <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
+                    </vn-one>
                     <vn-fetched-tags
                         max-length="6"
                         item="::sale.item"
-                        name="::sale.concept">
+                        tabindex="-1">
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td number>{{::sale.quantity}}</vn-td>

modules/ticket/front/component/index.html

@@ -29,12 +29,15 @@
                             {{sale.itemFk | zeroFill:6}}
                         </span>
                     </td>
-                    <td rowspan="{{::sale.components.length + 1}}" expand>
+                    <td rowspan="{{::sale.components.length + 1}}" vn-fetched-tags>
+                        <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
+                        <vn-one ng-if="::sale.item.subName">
+                            <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
+                        </vn-one>
                         <vn-fetched-tags
                             max-length="6"
                             item="::sale.item"
-                            name="::sale.concept"
+                            tabindex="-1">
-                            sub-name="::sale.item.subName">
                         </vn-fetched-tags>
                     </td>
                     <td rowspan="{{::sale.components.length + 1}}" number>

modules/ticket/front/index/index.html

@@ -18,12 +18,12 @@
                 <vn-th field="salesPersonFk" class="expendable">Salesperson</vn-th>
                 <vn-th field="shipped">Date</vn-th>
                 <vn-th>Hour</vn-th>
+                <vn-th field="hour" shrink>Closure</vn-th>
                 <vn-th field="nickname">Alias</vn-th>
                 <vn-th field="provinceFk" class="expendable">Province</vn-th>
                 <vn-th field="stateFk" >State</vn-th>
                 <vn-th field="zoneFk">Zone</vn-th>
                 <vn-th field="warehouseFk">Warehouse</vn-th>
-                <vn-th field="hour" shrink>Closure</vn-th>
                 <vn-th number>Total</vn-th>
                 <vn-th></vn-th>
             </vn-tr>
@@ -86,6 +86,7 @@
                     </span>
                 </vn-td>
                 <vn-td>{{::ticket.shipped | date: 'HH:mm'}}</vn-td>
+                <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
                 <vn-td>
                     <span
                         title="{{::ticket.nickname}}"
@@ -118,7 +119,6 @@
                     </span>
                 </vn-td>
                 <vn-td>{{::ticket.warehouse}}</vn-td>
-                <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
                 <vn-td number>
                     <span class="chip {{$ctrl.totalPriceColor(ticket)}}">
                         {{::ticket.total | currency: 'EUR': 2}}

modules/ticket/front/main/index.html

@@ -2,7 +2,7 @@
     vn-id="model"
     url="Tickets/filter"
     limit="20"
-    order="shipped DESC, zoneHour DESC, zoneMinute DESC, clientFk">
+    order="shippedDate DESC, shippedHour ASC, zoneLanding ASC">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar

modules/ticket/front/sale-checked/index.html

@@ -34,12 +34,15 @@
                         {{::sale.itemFk | zeroFill:6}}
                     </span>
                 </vn-td>
-                <vn-td expand>
+                <vn-td vn-fetched-tags>
+                    <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
+                    <vn-one ng-if="::sale.item.subName">
+                        <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
+                    </vn-one>
                     <vn-fetched-tags
                         max-length="6"
                         item="::sale.item"
-                        name="::sale.concept"
+                        tabindex="-1">
-                        sub-name="::sale.item.subName">
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td number>{{::sale.quantity}}</vn-td>

modules/ticket/front/sale-tracking/index.html

@@ -8,7 +8,7 @@
     auto-load="true">
 </vn-crud-model>
 <vn-data-viewer model="model">
-    <vn-card class="vn-w-xl">
+    <vn-card class="vn-w-lg">
     <vn-table model="model">
         <vn-thead>
             <vn-tr>
@@ -39,12 +39,15 @@
                         {{sale.itemFk | zeroFill:6}}
                     </span>
                 </vn-td>
-                <vn-td expand>
+                <vn-td vn-fetched-tags wide>
+                    <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
+                    <vn-one ng-if="::sale.item.subName">
+                        <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
+                    </vn-one>
                     <vn-fetched-tags
                         max-length="6"
                         item="::sale.item"
-                        name="::sale.concept"
+                        tabindex="-1">
-                        sub-name="::sale.item.subName">
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td number>{{::sale.quantity}}</vn-td>

modules/ticket/front/sale/index.html

@@ -58,8 +58,8 @@
                     </vn-th>
                     <vn-th shrink></vn-th>
                     <vn-th shrink></vn-th>
-                    <vn-th number id="ticketId">Id</vn-th>
+                    <vn-th shrink id="ticketId">Id</vn-th>
-                    <vn-th>Quantity</vn-th>
+                    <vn-th shrink>Quantity</vn-th>
                     <vn-th>Item</vn-th>
                     <vn-th number>Price</vn-th>
                     <vn-th number>Disc</vn-th>
@@ -97,7 +97,7 @@
                         zoom-image="{{::$root.imagePath('catalog', '1600x900', sale.itemFk)}}"
                         on-error-src/>
                 </vn-td>
-                <vn-td number>
+                <vn-td shrink>
                     <span class="link" ng-if="sale.id"
                         ng-click="descriptor.show($event, sale.itemFk, sale.id)">
                         {{sale.itemFk}}
@@ -117,7 +117,7 @@
                         </tpl-item>
                     </vn-autocomplete>
                 </vn-td>
-                <vn-td-editable disabled="!$ctrl.isEditable" number>
+                <vn-td-editable disabled="!$ctrl.isEditable" shrink>
                     <text>{{sale.quantity}}</text>
                     <field>
                         <vn-input-number class="dense"
@@ -127,13 +127,16 @@
                         </vn-input-number>
                     </field>
                 </vn-td-editable>
-                <vn-td-editable disabled="!sale.id || !$ctrl.isEditable" expand>
+                <vn-td-editable vn-fetched-tags wide disabled="!sale.id || !$ctrl.isEditable">
                     <text>
+                        <vn-one title="{{sale.concept}}">{{sale.concept}}</vn-one>
+                        <vn-one ng-if="::sale.subName">
+                            <h3 title="{{::sale.subName}}">{{::sale.subName}}</h3>
+                        </vn-one>
                         <vn-fetched-tags
                             max-length="6"
                             item="::sale.item"
-                            name="sale.concept"
+                            tabindex="-1">
-                            sub-name="::sale.subName">
                         </vn-fetched-tags>
                     </text>
                     <field>

modules/ticket/front/sale/index.js

@@ -367,6 +367,7 @@ class Controller extends Section {
             notAvailables
         };
         this.newSMS = {
+            ticketId: this.ticket.id,
             destinationFk: this.ticket.clientFk,
             destination: phone,
             message: this.$t('Product not available', params)

modules/ticket/front/sale/style.scss

@@ -23,6 +23,25 @@ vn-ticket-sale {
             margin: 3px;
         }
     }
+    vn-td-editable[vn-fetched-tags] {
+        & text {
+            max-width: 430px;
+            min-width: 150px;
+            & vn-one {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                font-size: 0.75rem;
+            }
+        
+            & vn-one:nth-child(2) h3 {
+                color: $color-font-secondary;
+                text-transform: uppercase;
+                line-height: initial;
+                font-size: 0.75rem
+            }
+        }
+    }
+
     vn-dialog.edit {
         @extend .edit-popover;
     

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

@@ -35,7 +35,7 @@
                     ng-model="filter.to"
                     on-change="$ctrl.to = value">
                 </vn-date-picker>
-                <vn-none class="or vn-px-md">O</vn-none>
+                <vn-none class="or vn-px-md" translate>Or</vn-none>
                 <vn-input-number
                     vn-one
                     min="0"

modules/ticket/front/search-panel/locale/es.yml

@@ -17,4 +17,5 @@ FREE: Libre
 DELIVERED: Servido
 ON_PREPARATION: En preparacion
 PACKED: Encajado
-Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez
+Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez
+Or: O

modules/ticket/front/summary/index.html

@@ -149,12 +149,15 @@
                             </span>
                         </vn-td>
                         <vn-td number shrink>{{::sale.quantity}}</vn-td>
-                        <vn-td expand>
+                        <vn-td vn-fetched-tags wide>
-                            <vn-fetched-tags 
+                            <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
-                                max-length="6" 
+                            <vn-one ng-if="::sale.item.subName">
+                                <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
+                            </vn-one>
+                            <vn-fetched-tags
+                                max-length="6"
                                 item="::sale.item"
-                                name="::sale.concept"
+                                tabindex="-1">
-                                sub-name="::sale.item.subName">
                             </vn-fetched-tags>
                         </vn-td>
                         <vn-td number>{{::sale.price | currency: 'EUR':2}}</vn-td>

modules/ticket/front/summary/index.js

@@ -54,18 +54,14 @@ class Controller extends Summary {
     }
 
     setOkState() {
-        let params = {};
+        const params = {ticketFk: 'id' in this.ticket ? this.ticket.id : this.$params.id};
-
-        if (this.$params.id)
-            params = {ticketFk: this.$params.id};
-
-        if (!this.$params.id)
-            params = {ticketFk: this.ticket.id};
 
         params.code = 'OK';
 
         this.$http.post(`TicketTrackings/changeState`, params)
-            .then(() => this.reload())
+            .then(() => {
+                if ('id' in this.$params) this.reload();
+            })
             .then(() => {
                 this.vnApp.showSuccess(this.$t('Data saved!'));
             });

modules/ticket/front/volume/index.html

@@ -42,12 +42,16 @@
                                 {{sale.itemFk | zeroFill:6}}
                             </span>
                         </vn-td>
-                        <vn-td expand>
+                        <vn-td vn-fetched-tags>
-                            <vn-fetched-tags 
+                            <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
-                                max-length="6" 
+                            <vn-one ng-if="::sale.item.subName">
+                                <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
+                            </vn-one>
+                            <vn-fetched-tags
+                                max-length="6"
                                 item="::sale.item"
-                                name="::sale.concept"
+                                tabindex="-1">
-                                sub-name="::sale.item.subName"/>
+                            </vn-fetched-tags>
                         </vn-td>
                         <vn-td number>{{::sale.quantity}}</vn-td>
                         <vn-td number>{{::sale.saleVolume.volume | number:3}}</vn-td>

modules/travel/front/main/index.spec.js

@@ -12,29 +12,38 @@ describe('Travel Component vnTravel', () => {
 
     describe('fetchParams()', () => {
         it('should return a range of dates with passed scope days', () => {
-            /**
+            let params = controller.fetchParams({
-             * Calculates the difference in days between two dates, it also
+                scopeDays: 2
-             * accounts for cases where the two dates in question span a
+            });
-             * daylight saving time (DST) change.
+            const shippedFrom = new Date();
-             *
+            shippedFrom.setHours(0, 0, 0, 0);
-             * @param {Date} a The start date
+            const shippedTo = new Date(shippedFrom.getTime());
-             * @param {Date} b The end date
+            shippedTo.setDate(shippedTo.getDate() + params.scopeDays);
-             * @return {Number} The difference in days
+            shippedTo.setHours(23, 59, 59, 999);
-             */
-            function diffInDays(a, b) {
-                const utc1 = Date.UTC(a.getFullYear(), a.getMonth(), a.getDate());
-                const utc2 = Date.UTC(b.getFullYear(), b.getMonth(), b.getDate());
-                const msInDay = 86400 * 1000;
-                return Math.floor((utc2 - utc1) / msInDay);
-            }
 
-            let params = controller.fetchParams({scopeDays: 2});
+            const expectedParams = {
-            const diff = diffInDays(
+                shippedFrom,
-                params.shippedFrom,
+                scopeDays: params.scopeDays,
-                new Date(params.shippedTo.getTime() + 1)
+                shippedTo
-            );
+            };
 
-            expect(diff).toEqual(3);
+            expect(params).toEqual(expectedParams);
+        });
+
+        it('should return default value for scope days', () => {
+            let params = controller.fetchParams({
+                scopeDays: 1
+            });
+
+            expect(params.scopeDays).toEqual(1);
+        });
+
+        it('should return the given scope days', () => {
+            let params = controller.fetchParams({
+                scopeDays: 2
+            });
+
+            expect(params.scopeDays).toEqual(2);
         });
     });
 });

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

@@ -1,6 +1,6 @@
 <div class="search-panel">
-    <form ng-submit="$ctrl.onSearch()">
+    <form ng-submit="$ctrl.onSearch()" id="manifold-form">
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
                 vn-one
                 label="General search"
@@ -9,7 +9,7 @@
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
             <vn-textfield
                 vn-one
                 label="Reference"
@@ -21,7 +21,7 @@
                 ng-model="filter.totalEntries">
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
             <vn-textfield
                 vn-one
                 label="Travel id"
@@ -35,19 +35,37 @@
                 value-field="id">
             </vn-autocomplete>
         </vn-horizontal>
-        <vn-horizontal>
+        <section class="vn-px-md">
-            <vn-date-picker
+            <vn-horizontal class="manifold-panel vn-pa-md">
-                vn-one
+                <vn-date-picker
-                label="Shipped from"
+                    vn-one
-                ng-model="filter.shippedFrom">
+                    label="Shipped from"
-            </vn-date-picker>
+                    ng-model="filter.shippedFrom"
-            <vn-date-picker
+                    on-change="$ctrl.shippedFrom = value">
-                vn-one
+                </vn-date-picker>
-                label="Shipped to"
+                <vn-date-picker
-                ng-model="filter.shippedTo">
+                    vn-one
-            </vn-date-picker>
+                    label="Shipped to"
-        </vn-horizontal>
+                    ng-model="filter.shippedTo"
-        <vn-horizontal>
+                    on-change="$ctrl.shippedTo = value">
+                </vn-date-picker>
+                <vn-none class="or vn-px-md" translate>Or</vn-none>
+                <vn-input-number
+                    vn-one
+                    min="0"
+                    step="1"
+                    label="Days onward"
+                    ng-model="filter.scopeDays"
+                    on-change="$ctrl.scopeDays = value"
+                    display-controls="true">
+                </vn-input-number>
+                <vn-icon color-marginal
+                    icon="info"
+                    vn-tooltip="Cannot choose a range of dates and days onward at the same time">
+                </vn-icon>
+            </vn-horizontal>
+        </section>
+        <vn-horizontal class="vn-px-lg">
             <vn-date-picker
                 vn-one
                 label="Landed from"
@@ -59,7 +77,7 @@
                 ng-model="filter.landedTo">
             </vn-date-picker>
         </vn-horizontal>
-        <vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
             <vn-autocomplete vn-one
                 label="Warehouse Out"
                 ng-model="filter.warehouseOutFk"
@@ -75,7 +93,7 @@
                 value-field="id">
             </vn-autocomplete>
         </vn-horizontal>
-        <vn-horizontal class="vn-mt-lg">
+        <vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>
     </form>