Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions

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

@@ -1,4 +0,0 @@
-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

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

db/changes/10281-valentineDay/00-ACL.sql

@@ -1,5 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) 
-    VALUES 
-        ('SupplierAccount', '*', '*', 'ALLOW', 'ROLE', 'administrative'),
-        ('Entry', '*', '*', 'ALLOW', 'ROLE', 'administrative'),
-        ('InvoiceIn', '*', '*', 'ALLOW', 'ROLE', 'administrative');

db/changes/10281-valentineDay/00-item_getBalance.sql

@@ -1,137 +0,0 @@
-DROP PROCEDURE `vn`.`item_getBalance`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`item_getBalance`(IN vItemId INT, IN vWarehouse INT)
-BEGIN
-    DECLARE vDateInventory DATETIME;
-    DECLARE vCurdate DATE DEFAULT CURDATE();
-    DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
-    
-    SELECT inventoried INTO vDateInventory FROM config;
-    SET @a = 0;
-	SET @currentLineFk = 0;
-    SET @shipped = '';
-    
-    SELECT DATE(@shipped:= shipped) shipped,
-		alertLevel,
-		stateName,
-		origin,
-		reference,
-		clientFk,
-		name,
-		`in`,
-		`out`,
-		@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
-		@currentLineFk := IF (@shipped < CURDATE() 
-							OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)),
-						lineFk,@currentLineFk) lastPreparedLineFk,
-        isTicket,
-        lineFk,
-        isPicked,
-        clientType
-        FROM
-            ( SELECT  tr.landed AS shipped,
-                    b.quantity AS `in`,
-                    NULL AS `out`,
-                    al.alertLevel AS alertLevel,
-                    st.name AS stateName,
-                    s.name AS name,
-                    e.ref AS reference,
-                    e.id AS origin,
-                    s.id AS clientFk,
-                    IF(al.alertLevel = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id lineFk,
-                    NULL `order`,
-                    NULL AS clientType
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.alertLevel = 
-						CASE
-							WHEN tr.shipped < CURDATE() THEN 3
-							WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-						END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.landed >= vDateInventory
-                    AND vWarehouse = tr.warehouseInFk 
-                    AND b.itemFk = vItemId
-                    AND e.isInventory = FALSE
-					AND e.isRaid = FALSE
-            UNION ALL
-
-            SELECT tr.shipped,
-                    NULL as `in`,
-                    b.quantity AS `out`,
-                    al.alertLevel AS alertLevel,
-                    st.name AS stateName,
-                    s.name AS name,
-                    e.ref AS reference,
-                    e.id AS origin,
-                    s.id AS clientFk,
-                    IF(al.alertLevel = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id,
-                    NULL `order`,
-                    NULL AS clientType
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN warehouse w ON w.id = tr.warehouseOutFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.alertLevel = 
-						CASE
-							WHEN tr.shipped < CURDATE() THEN 3
-							WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-						END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.shipped >= vDateInventory
-                    AND vWarehouse =tr.warehouseOutFk
-                    AND s.id <> 4
-                    AND b.itemFk = vItemId
-                    AND e.isInventory = FALSE
-                    AND w.isFeedStock = FALSE
-					AND e.isRaid = FALSE
-            UNION ALL
-
-            SELECT DATE(t.shipped),
-                NULL as `in`,
-                s.quantity AS `out`,
-                al.alertLevel AS alertLevel,
-                st.name AS stateName,
-                t.nickname AS name,
-                t.refFk AS reference,
-                t.id AS origin,
-                t.clientFk,
-                stk.id AS isPicked,
-                TRUE AS isTicket,
-                s.id,
-				st.`order`,
-                ct.code AS clientType
-				FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk
-                    LEFT JOIN ticketState ts ON ts.ticket = t.id
-                    LEFT JOIN state st ON st.code = ts.code
-                    JOIN client c ON c.id = t.clientFk
-				    JOIN clientType ct ON ct.id = c.clientTypeFk
-                    JOIN alertLevel al ON al.alertLevel = 
-						CASE
-							WHEN t.shipped < curdate() THEN 3
-							WHEN t.shipped > util.dayEnd(curdate()) THEN 0
-                            ELSE IFNULL(ts.alertLevel, 0)
-						END
-					LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-                    LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
-                WHERE t.shipped >= vDateInventory
-                    AND s.itemFk = vItemId
-                    AND vWarehouse =t.warehouseFk
-				ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
-            ) AS itemDiary;
-        
-END$$
-DELIMITER ;
-

db/changes/10281-valentineDay/00-supplier.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`supplier` ADD COLUMN `workerFk` INT(11) NULL DEFAULT NULL COMMENT 'Responsible for approving invoices' AFTER `isTrucker`;
-ALTER TABLE `vn`.`supplier` ADD CONSTRAINT `supplier_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE;

db/changes/10290-invoiceIn/00-ACL.sql

@@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) 
-    VALUES 
-        ('StarredModule', '*', '*', 'ALLOW', 'ROLE', 'employee'),
-        ('ItemBotanical', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss');

db/changes/10290-invoiceIn/00-module.sql

@@ -1,20 +0,0 @@
-CREATE TABLE `salix`.`module` (
-    `code` VARCHAR(45) COLLATE utf8_unicode_ci NOT NULL,
-    PRIMARY KEY (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `salix`.`module`(`code`)
-    VALUES
-        ('Items'),
-        ('Orders'),
-        ('Clients'),
-        ('Entries'),
-        ('Travels'),
-        ('Invoices out'),
-        ('Suppliers'),
-        ('Claims'),
-        ('Routes'),
-        ('Tickets'),
-        ('Workers'),
-        ('Users'),
-        ('Zones');

db/changes/10290-invoiceIn/01-starredModule.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `vn`.`starredModule` (
-  `id` INT(11) unsigned NOT NULL AUTO_INCREMENT,
-  `workerFk` INT(10) NOT NULL,
-  `moduleFk` VARCHAR(45) COLLATE utf8_unicode_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `starred_workerFk` (`workerFk`),
-  KEY `starred_moduleFk` (`moduleFk`),
-  CONSTRAINT `starred_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `starred_moduleFk` FOREIGN KEY (`moduleFk`) REFERENCES `salix`.`module` (`code`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

db/changes/10291-invoiceIn/00-ACL.sql

@@ -1,5 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) 
-    VALUES 
-        ('Genus', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss'),
-        ('Specie', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss'),
-        ('InvoiceOut', 'createPdf', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');

db/dump/fixtures.sql

@@ -294,6 +294,10 @@ INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`)
         (103, 0,   DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
         (104, -30, DATE_ADD(CURDATE(), INTERVAL -1 MONTH));
 
+INSERT INTO `vn`.`clientConfig`(`riskTolerance`)
+    VALUES
+        (200);
+
 INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`, `isDefaultAddress`)
     VALUES
         (1,     'Bruce Wayne',                  '1007 Mountain Drive, Gotham',                  'Silla', 46460, 1, 1111111111, 222222222, 1, 101,    2, NULL, NULL, 0, 1),
@@ -711,14 +715,14 @@ INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`, `icon`, `code`
         (7, 'Accessories', 1, NULL,     'icon-accessory',   'accessory'),
         (8, 'Fruit',       1, NULL,     'icon-fruit',       'fruit');
 
-INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`, `isPackaging`)
+INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `warehouseFk`, `life`,`workerFk`, `isPackaging`)
     VALUES
-        (1, 'CRI', 'Crisantemo',     2, 31,     35, 0),
+        (1, 'CRI', 'Crisantemo',     2, 1, 31,     35, 0),
-        (2, 'ITG', 'Anthurium',      1, 31,     35, 0),
+        (2, 'ITG', 'Anthurium',      1, 1, 31,     35, 0),
-        (3, 'WPN', 'Paniculata',     2, 31,     35, 0),
+        (3, 'WPN', 'Paniculata',     2, 1, 31,     35, 0),
-        (4, 'PRT', 'Delivery ports', 3, NULL,   35, 1),
+        (4, 'PRT', 'Delivery ports', 3, 1, NULL,   35, 1),
-        (5, 'CON', 'Container',      3, NULL,   35, 1),
+        (5, 'CON', 'Container',      3, 1, NULL,   35, 1),
-        (6, 'ALS', 'Alstroemeria',   1, 31,     35, 0);
+        (6, 'ALS', 'Alstroemeria',   1, 1, 31,     35, 0);
 
 INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
     VALUES
@@ -2254,7 +2258,10 @@ INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`)
         (10, 10, 10);
 
 INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
-    SELECT `id` FROM `vn`.`ticket`;
+    SELECT `id` 
+        FROM `vn`.`ticket` t
+            LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id
+        WHERE tr.ticketFk IS NULL;
 
 CALL `vn`.`ticket_doRecalc`();
 

db/export-structure.sh

@@ -86,6 +86,8 @@ IGNORETABLES=(
     --ignore-table=vn.warehouseJoined
     --ignore-table=vn.workerTeam__
     --ignore-table=vn.XDiario__
+    --ignore-table=sage.movConta
+    --ignore-table=sage.movContaCopia
 )
 mysqldump \
     --defaults-file=config.production.ini \

e2e/paths/14-account/01_create_and_basic_data.spec.js

@@ -59,6 +59,6 @@ describe('Account create and basic data path', () => {
         await page.accessToSection('account.card.roles');
         const rolesCount = await page.countElement(selectors.accountRoles.anyResult);
 
-        expect(rolesCount).toEqual(3);
+        expect(rolesCount).toEqual(4);
     });
 });

e2e/paths/14-account/03_role_create_and_basic_data.spec.js

@@ -81,6 +81,6 @@ describe('Account Role create and basic data path', () => {
         await page.accessToSection('account.role.card.inherited');
         const rolesCount = await page.countElement(selectors.accountRoleInheritance.anyResult);
 
-        expect(rolesCount).toEqual(6);
+        expect(rolesCount).toEqual(7);
     });
 });

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

@@ -1,7 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-// #2868 Excluded until database export
+describe('ticket filter()', () => {
-xdescribe('ticket filter()', () => {
     it('should return the tickets matching the filter', async() => {
         const ctx = {req: {accessToken: {userId: 9}}, args: {}};
         const filter = {order: 'id DESC'};
@@ -24,7 +23,7 @@ xdescribe('ticket filter()', () => {
         const filter = {};
         const result = await app.models.Ticket.filter(ctx, filter);
 
-        expect(result.length).toEqual(4);
+        expect(result.length).toEqual(3);
     });
 
     it('should return the tickets matching the problems on false', async() => {
@@ -42,7 +41,7 @@ xdescribe('ticket filter()', () => {
         const filter = {};
         const result = await app.models.Ticket.filter(ctx, filter);
 
-        expect(result.length).toEqual(10);
+        expect(result.length).toEqual(7);
     });
 
     it('should return the tickets matching the problems on null', async() => {