Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

CHANGELOG.md

@@ -41,7 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
-
+- (Tickets -> Expediciones) Interfaz mejorada y contador añadido
 ### Fixed
 - (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
 - (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados

back/methods/vn-user/recover-password.js

@@ -24,6 +24,7 @@ module.exports = Self => {
                 fields: ['email'],
                 where: {name: user}
             });
+            if (!account) return;
             user = account.email;
         }
 

back/models/vn-user.js

@@ -110,43 +110,133 @@ module.exports = function(Self) {
     });
 
     Self.validateLogin = async function(user, password) {
-        let $ = Self.app.models;
+        const models = Self.app.models;
+        const usesEmail = user.indexOf('@') !== -1;
         let token;
-        let usesEmail = user.indexOf('@') !== -1;
 
-        let userInfo = usesEmail
+        const userInfo = usesEmail
             ? {email: user}
             : {username: user};
-        let instance = await $.VnUser.findOne({
+        const instance = await Self.findOne({
             fields: ['username', 'password'],
             where: userInfo
         });
 
-        let where = usesEmail
+        const where = usesEmail
             ? {email: user}
             : {name: user};
-        let vnUser = await $.VnUser.findOne({
+        const vnUser = await Self.findOne({
-            fields: ['active'],
+            fields: ['id', 'active', 'passExpired'],
             where
         });
 
-        let validCredentials = instance && (
+        const today = Date.vnNew();
-            await instance.hasPassword(password)
+        today.setHours(0, 0, 0, 0);
-        );
+
+        const validCredentials = instance
+            && await instance.hasPassword(password);
 
         if (validCredentials) {
             if (!vnUser.active)
                 throw new UserError('User disabled');
 
+            if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) {
+                const changePasswordToken = await models.AccessToken.create({
+                    scopes: ['change-password'],
+                    userId: vnUser.id
+                });
+                throw new UserError('Pass expired', 'passExpired', {
+                    id: vnUser.id,
+                    token: changePasswordToken.id
+                });
+            }
+
             try {
-                await $.Account.sync(instance.username, password);
+                await models.Account.sync(instance.username, password);
             } catch (err) {
                 console.warn(err);
             }
         }
 
         let loginInfo = Object.assign({password}, userInfo);
-        token = await $.VnUser.login(loginInfo, 'user');
+        token = await Self.login(loginInfo, 'user');
         return {token: token.id};
     };
+
+    const _setPassword = Self.prototype.setPassword;
+    Self.prototype.setPassword = async function(newPassword, options, cb) {
+        if (cb === undefined && typeof options === 'function') {
+            cb = options;
+            options = undefined;
+        }
+
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+        options = myOptions;
+
+        try {
+            await Self.rawSql(`CALL account.user_checkPassword(?)`, [newPassword], options);
+            await _setPassword.call(this, newPassword, options);
+            await this.updateAttribute('passExpired', null, options);
+            await Self.app.models.Account.sync(this.name, newPassword, null, options);
+            tx && await tx.commit();
+            cb && cb();
+        } catch (err) {
+            tx && await tx.rollback();
+            if (cb) cb(err); else throw err;
+        }
+    };
+
+    Self.sharedClass._methods.find(method => method.name == 'changePassword')
+        .accessScopes = ['change-password'];
+
+    // FIXME: https://redmine.verdnatura.es/issues/5761
+    // Self.afterRemote('prototype.patchAttributes', async(ctx, instance) => {
+    //     if (!ctx.args || !ctx.args.data.email) return;
+
+    //     const loopBackContext = LoopBackContext.getCurrentContext();
+    //     const httpCtx = {req: loopBackContext.active};
+    //     const httpRequest = httpCtx.req.http.req;
+    //     const headers = httpRequest.headers;
+    //     const origin = headers.origin;
+    //     const url = origin.split(':');
+
+    //     class Mailer {
+    //         async send(verifyOptions, cb) {
+    //             const params = {
+    //                 url: verifyOptions.verifyHref,
+    //                 recipient: verifyOptions.to,
+    //                 lang: ctx.req.getLocale()
+    //             };
+
+    //             const email = new Email('email-verify', params);
+    //             email.send();
+
+    //             cb(null, verifyOptions.to);
+    //         }
+    //     }
+
+    //     const options = {
+    //         type: 'email',
+    //         to: instance.email,
+    //         from: {},
+    //         redirect: `${origin}/#!/account/${instance.id}/basic-data?emailConfirmed`,
+    //         template: false,
+    //         mailer: new Mailer,
+    //         host: url[1].split('/')[2],
+    //         port: url[2],
+    //         protocol: url[0],
+    //         user: Self
+    //     };
+
+    //     await instance.verify(options);
+    // });
 };

back/models/vn-user.json

@@ -25,10 +25,7 @@
 		},
 		"password": {
 			"type": "string",
-			"required": true,
+			"required": true
-			"mysql": {
-				"columnName": "bcryptPassword"
-			}
 		},
 		"roleFk": {
 			"type": "number",
@@ -42,9 +39,6 @@
 		"lang": {
 			"type": "string"
 		},
-		"bcryptPassword": {
-			"type": "string"
-		},
 		"active": {
 			"type": "boolean"
 		},
@@ -63,6 +57,9 @@
 		"hasGrant": {
 			"type": "boolean"
 		},
+        "passExpired": {
+            "type": "date"
+        },
 		"twoFactor": {
 			"type": "string"
 		}

db/Dockerfile

@@ -1,26 +1,18 @@
-FROM mariadb:10.7.5
+FROM mariadb:10.7.7
 
 ENV MYSQL_ROOT_PASSWORD root
 ENV TZ Europe/Madrid
 ARG MOCKDATE=2001-01-01 11:00:00
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends curl ca-certificates \
-    && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
-    && echo "deb http://apt.verdnatura.es/ jessie main" > /etc/apt/sources.list.d/vn.list \
-    && apt-get update \
-    && apt-get install -y vn-mariadb \
-    && apt-get purge -y --auto-remove curl ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
 COPY docker/docker.cnf /etc/mysql/conf.d/
 COPY \
+    docker/docker-start.sh \
     docker/docker-init.sh \
-    docker/docker-temp-start.sh \
     docker/docker-temp-stop.sh \
     docker/docker-dump.sh \
-    docker/docker-start.sh \
+    docker/docker-structure.sh \
+    docker/docker-fixtures.sh \
     /usr/local/bin/
 
 RUN mkdir /mysql-data \
@@ -31,26 +23,16 @@ WORKDIR /docker-boot
 COPY \
     import-changes.sh \
     config.ini \
-    dump/mysqlPlugins.sql \
     dump/structure.sql \
     dump/mockDate.sql \
     dump/dumpedFixtures.sql \
     ./
-RUN gosu mysql docker-init.sh \
+RUN sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
-    && docker-dump.sh mysqlPlugins \
+    && gosu mysql docker-structure.sh
-    && docker-dump.sh structure \
-    && sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
-    && docker-dump.sh mockDate \
-    && docker-dump.sh dumpedFixtures \
-    && gosu mysql docker-temp-stop.sh
-
 COPY changes ./changes
 COPY dump/fixtures.sql ./
 ARG STAMP=unknown
-RUN gosu mysql docker-temp-start.sh \
+RUN gosu mysql docker-fixtures.sh
-    && ./import-changes.sh \
-    && docker-dump.sh fixtures \
-    && gosu mysql docker-temp-stop.sh
 
 RUN echo "[INFO] -> Import finished" \
     && rm -rf /docker-boot

db/changes/232401/00-userPassExpired.sql

@@ -0,0 +1,76 @@
+ALTER TABLE `account`.`user` ADD passExpired DATE DEFAULT NULL;
+
+DROP PROCEDURE `account`.`myUser_changePassword`;
+DROP PROCEDURE `account`.`myUser_restorePassword`;
+DROP PROCEDURE `account`.`user_changePassword`;
+DROP PROCEDURE `account`.`user_restorePassword`;
+DROP PROCEDURE `account`.`user_setPassword`;
+
+ALTER TABLE account.`user` CHANGE password password__ char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT 'Deprecated';
+ALTER TABLE account.`user` CHANGE bcryptPassword password varchar(512) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeUpdate`
+	BEFORE UPDATE ON `user`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF !(NEW.`name` <=> OLD.`name`) THEN
+		CALL user_checkName (NEW.`name`);
+	END IF;
+
+	IF !(NEW.`password` <=> OLD.`password`) THEN
+		SET NEW.lastPassChange = util.VN_NOW();
+	END IF;
+END$$
+DELIMITER ;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+    VIEW `account`.`accountDovecot` AS
+select
+    `u`.`name` AS `name`,
+    `u`.`password` AS `password`
+from
+    (`account`.`user` `u`
+join `account`.`account` `a` on
+    (`a`.`id` = `u`.`id`))
+where
+    `u`.`active` <> 0;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+    VIEW `salix`.`User` AS
+select
+    `account`.`user`.`id` AS `id`,
+    `account`.`user`.`realm` AS `realm`,
+    `account`.`user`.`name` AS `username`,
+    `account`.`user`.`password` AS `password`,
+    `account`.`user`.`email` AS `email`,
+    `account`.`user`.`emailVerified` AS `emailVerified`,
+    `account`.`user`.`verificationToken` AS `verificationToken`
+from
+    `account`.`user`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+    VIEW `vn`.`workerTimeControlUserInfo` AS
+select
+    `u`.`id` AS `userFk`,
+    `w`.`firstName` AS `name`,
+    `w`.`lastName` AS `surname`,
+    `u`.`name` AS `user`,
+    `u`.`password` AS `password`,
+    `wd`.`departmentFk` AS `departmentFk`,
+    left(`c`.`fi`,
+    8) AS `dni`
+from
+    (((`account`.`user` `u`
+join `vn`.`worker` `w` on
+    (`w`.`userFk` = `u`.`id`))
+join `vn`.`client` `c` on
+    (`c`.`id` = `u`.`id`))
+left join `vn`.`workerDepartment` `wd` on
+    (`wd`.`workerFk` = `w`.`id`));

db/docker/docker-fixtures.sh

@@ -5,3 +5,6 @@ CMD=mysqld
 
 docker_setup_env "$CMD"
 docker_temp_server_start "$CMD"
+bash import-changes.sh
+docker-dump.sh fixtures
+docker_temp_server_stop

db/docker/docker-structure.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. docker-init.sh
+docker-dump.sh structure
+docker-dump.sh mockDate
+docker-dump.sh dumpedFixtures
+. docker-temp-stop.sh

db/dump/dumpedFixtures.sql

@@ -782,6 +782,38 @@ USE `sage`;
 -- Dumping data for table `TiposIva`
 --
 
+LOCK TABLES `taxType` WRITE;
+/*!40000 ALTER TABLE `taxType` DISABLE KEYS */;
+INSERT INTO `sage`.`taxType` (id, code, isIntracommunity) VALUES
+	(2, NULL, 0),
+	(4, 'national4', 0),
+	(5, NULL, 0),
+	(6, NULL, 1),
+	(7, NULL, 1),
+	(8, NULL, 1),
+	(10, 'national10', 0),
+	(11, NULL, 0),
+	(16, 'CEEServices21', 1),
+	(18, NULL, 0),
+	(20, 'national0', 0),
+	(21, 'national21', 0),
+	(22, 'import10', 0),
+	(26, NULL, 0),
+	(90, 'import21', 0),
+	(91, NULL, 0),
+	(92, NULL, 0),
+	(93, NULL, 0),
+	(94, NULL, 0),
+	(100, NULL, 0),
+	(108, NULL, 0),
+	(109, NULL, 0),
+	(110, NULL, 1),
+	(111, NULL, 0),
+	(112, NULL, 0),
+	(113, 'ISP21', 0),
+	(114, NULL, 0),
+	(115, 'import4', 0);
+
 LOCK TABLES `TiposIva` WRITE;
 /*!40000 ALTER TABLE `TiposIva` DISABLE KEYS */;
 INSERT INTO `TiposIva` VALUES (2,0,'Operaciones no sujetas',0.0000000000,0.0000000000,0.0000000000,'','4770000020','','','','','','','95B21A93-5910-489D-83BB-C32788C9B19D','','','','','','','','','',0,0),(4,0,'I.V.A. 4%',0.0000000000,4.0000000000,0.0000000000,'4720000004','4770000004','','6310000000','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0,0),(5,0,'I.V.A. 4% y R.E. 0.5%',0.0000000000,4.0000000000,0.5000000000,'','4770000504','4770000405','','','','','','DBEFA562-63FB-4FFC-8171-64F0C6F065FF','','','','','','','','','',0,0),(6,0,'H.P. IVA  4% CEE',0.0000000000,4.0000000000,0.0000000000,'4721000004','4771000004','','','','','','','DD0ECBA8-2EF5-425E-911B-623580BADA77','','','','','','','','','',0,1),(7,0,'H.P. IVA 10% CEE',0.0000000000,10.0000000000,0.0000000000,'4721000011','4771000010','','','','','','','593208CD-6F28-4489-B6EC-907AD689EAC9','','','','','','','','','',0,1),(8,0,'H.P. IVA 21% CEE',0.0000000000,21.0000000000,0.0000000000,'4721000021','4771000021','','','','','','','27061852-9BC1-4C4F-9B6E-69970E208F23','','','','','','','','','',0,1),(10,0,'I.V.A. 10% Nacional',0.0000000000,10.0000000000,0.0000000000,'4720000011','4770000010','','6290000553','','','','','828A9D6F-5C01-4C3A-918A-B2E4482830D3','','','','','','','','','',0,0),(11,0,'I.V.A. 10% y R.E. 1,4%',0.0000000000,10.0000000000,1.4000000000,'','4770000101','4770000110','','','','','','C1F2D910-83A1-4191-A76C-8B3D7AB98348','','','','','','','','','',0,0),(16,0,'I.V.A. Adqui. servicios CEE',0.0000000000,21.0000000000,0.0000000000,'4721000015','4771000016','','','','','','','E3EDE961-CE8F-41D4-9E6C-D8BCD32275A1','','','','','','','','','',0,1),(18,0,'H.P. Iva Importación 0% ISP',0.0000000000,0.0000000000,0.0000000000,'4720000005','4770000005','','','','','','','27AD4158-2349-49C2-B53A-A4E0EFAC5D09','','','','','','','','','',0,0),(20,0,'I.V.A 0% Nacional',0.0000000000,0.0000000000,0.0000000000,'4720000000','','','','','','','','B90B0FBD-E513-4F04-9721-C873504E08DF','','','','','','','','','',0,0),(21,0,'I.V.A. 21%',0.0000000000,21.0000000000,0.0000000000,'4720000021','4770000021','4770000000','','','','','','BA8C4E28-DCFA-4F7B-AE4F-CA044626B55E','','','','','','','','','',0,0),(22,0,'IVA 10% importaciones',0.0000000000,10.0000000000,0.0000000000,'4722000010','','','','','','','','540450A8-4B41-4607-96D1-E7F296FB6933','','','','','','','','','',0,0),(26,0,'I.V.A. 21% y R.E. 5,2%',0.0000000000,21.0000000000,5.2000000000,'4720000021','4770000215','4770000521','631000000','','','','','2BC0765F-7739-49AE-A5F0-28B648B81677','','','','','','','','','',0,0),(90,0,'IVA 21% importaciones',0.0000000000,21.0000000000,0.0000000000,'4722000021','','','','','','','','EB675F91-5FF2-4E26-A31E-EEB674125945','','','','','','','','','',0,0),(91,0,'IVA 0% importaciones',0.0000000000,0.0000000000,0.0000000000,'4723000000','','','','','','','','5E5EFA56-2A99-4D54-A16B-5D818274CA18','','','','','','','','','',0,0),(92,0,'8.5% comp. ganadera o pesquera',0.0000000000,8.5000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0),(93,0,'12% com. agrícola o forestal',0.0000000000,12.0000000000,0.0000000000,'4720000012','','','','','','','','267B1DDB-247F-4A71-AB95-3349FEFC5F92','','','','','','','','','',0,0),(94,0,'10,5% com. ganadera o pesquera',0.0000000000,10.5000000000,0.0000000000,'4770000000','4720000000','631000000','477000000','','','','','','','','','','','','','','',0,0),(100,0,'HP IVA SOPORTADO 5%',0.0000000000,5.0000000000,0.0000000000,'4720000055','','','','','','','','3AD36CB2-4172-4CC9-9F87-2BF2B56AAC80','','','','','','','','','',0,0),(108,0,'I.V.A. 8%',0.0000000000,8.0000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0),(109,0,'I.V.A. 8% y R.E. 1%',0.0000000000,8.0000000000,1.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0),(110,0,'HP IVA Devengado Exento CEE',0.0000000000,0.0000000000,0.0000000000,'','4771000000','','','','','','','C605BC32-E161-42FD-83F3-3A66B1FBE399','','','','','','','','','',0,1),(111,0,'H.P. Iva Devengado Exento Ser',0.0000000000,0.0000000000,0.0000000000,'','4771000001','','','','','','','F1AEC4DC-AFE5-498E-A713-2648FFB6DA32','','','','','','','','','',0,0),(112,0,'H.P. IVA Devengado en exportac',0.0000000000,0.0000000000,0.0000000000,'','4770000002','','','','','','','F980AE74-BF75-4F4C-927F-0CCCE0DB8D15','','','','','','','','','',0,0),(113,0,'HP DEVENGADO 21 ISP     ',0.0000000000,21.0000000000,0.0000000000,'4720000006','4770000006','','','','','','','728D7A76-E936-438C-AF05-3CA38FE16EA5','','','','','','','','','',0,0),(114,0,'HP.IVA NO DEDUCIBLE 10%',0.0000000000,0.0000000000,0.0000000000,'4720000026','','','','','','','','','','','','','','','','','',0,0),(115,0,'H.P. IVA Soportado Impor 4% ',0.0000000000,4.0000000000,0.0000000000,'4722000004','','','','','','','','','','','','','','','','','',0,0);

db/dump/fixtures.sql

@@ -71,8 +71,8 @@ INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPre
 
 CALL `account`.`role_sync`;
 
-INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`, `lang`, `image`, `bcryptPassword`)
+INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
-    SELECT id, name, CONCAT(name, 'Nick'),MD5('nightmare'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
+    SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
         FROM `account`.`role` WHERE id <> 20
             ORDER BY id;
 
@@ -98,20 +98,24 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
     VALUES
         (1,	978, 1, 0, 2000, 9, 0);
 
-INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `bcryptPassword`, `password`,`role`,`active`,`email`,`lang`, `image`)
+INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
-        (1101, 'BruceWayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com',         'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1101, 'BruceWayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1102, 'PetterParker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com',       'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1102, 'PetterParker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1103, 'ClarkKent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com',          'fr', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1103, 'ClarkKent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1104, 'TonyStark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@mydomain.com',          'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1104, 'TonyStark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1105, 'MaxEisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1105, 'MaxEisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1107, 'HankPym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@mydomain.com',            'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1107, 'HankPym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1108, 'CharlesXavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'CharlesXavier@mydomain.com',      'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1108, 'CharlesXavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1109, 'BruceBanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'BruceBanner@mydomain.com',        'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
+        (1109, 'BruceBanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1110, 'JessicaJones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'JessicaJones@mydomain.com',       'en', NULL),
+        (1110, 'JessicaJones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en', NULL),
-        (1111, 'Missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL,                              'en', NULL),
+        (1111, 'Missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en', NULL),
-        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL,                              'en', NULL);
+        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en', NULL);
+
+UPDATE account.`user`
+    SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
+    WHERE name = 'maintenance';
 
 INSERT INTO `account`.`mailAlias`(`id`, `alias`, `description`, `isPublic`)
     VALUES
@@ -2897,3 +2901,10 @@ INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agenc
 INSERT INTO `vn`.`buyConfig` (`id`, `monthsAgo`)
     VALUES
         (1, 6);
+
+INSERT INTO `vn`.`invoiceInSerial` (`code`, `description`, `cplusTerIdNifFk`, `taxAreaFk`)
+    VALUES
+        ('C', 'Asgard',     1, 'WORLD'),
+        ('E', 'Midgard',    1, 'CEE'),
+        ('R', 'Jotunheim',  1, 'NATIONAL'),
+        ('W', 'Vanaheim',   1, 'WORLD');

db/dump/mockDate.sql

@@ -1,30 +1,19 @@
-DROP FUNCTION IF EXISTS `util`.`mockTime`;
 
 DELIMITER $$
-$$
+
-CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTime`() RETURNS datetime
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTime`() RETURNS datetime
     DETERMINISTIC
 BEGIN
 	RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid');
 END$$
-DELIMITER ;
 
-DROP FUNCTION IF EXISTS `util`.`mockUtcTime`;
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockUtcTime`() RETURNS datetime
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockUtcTime`() RETURNS datetime
     DETERMINISTIC
 BEGIN
 	RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid');
 END$$
-DELIMITER ;
 
-DROP FUNCTION IF EXISTS `util`.`mockTimeBase`;
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL) RETURNS datetime
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL) RETURNS datetime
     DETERMINISTIC
 BEGIN
     RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid');

db/dump/mysqlPlugins.sql

@@ -1,4 +0,0 @@
-
--- Import compiled functions
-CREATE AGGREGATE FUNCTION minacum RETURNS INT SONAME 'minacum.so';
-CREATE AGGREGATE FUNCTION multimax RETURNS INT SONAME 'multimax.so';

db/dump/structure.sql

@@ -15620,6 +15620,18 @@ CREATE TABLE `ClavesOperacion` (
 --
 -- Table structure for table `Municipios`
 --
+DROP TABLE IF EXISTS `taxType`;
+
+CREATE TABLE `taxType`  (
+    id INT(11) NOT NULL,
+    code VARCHAR(25) DEFAULT NULL NULL,
+    isIntracommunity TINYINT(1) DEFAULT FALSE NOT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `taxType_UN` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Coincidencia del id con Sage.TiposIVA.CodigoIva(propia de Sage), en ningún caso vincular mediate FK';
+
+ALTER TABLE `sage`.`taxType` ADD CONSTRAINT taxType_PK PRIMARY KEY IF NOT EXISTS (id);
+ALTER TABLE `sage`.`taxType` ADD CONSTRAINT taxType_UN UNIQUE KEY IF NOT EXISTS (code);
 
 DROP TABLE IF EXISTS `Municipios`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
@@ -22074,12 +22086,14 @@ CREATE TABLE `autonomy` (
   `name` varchar(100) NOT NULL,
   `countryFk` mediumint(8) unsigned NOT NULL,
   `geoFk` int(11) DEFAULT NULL,
+  `isUeeMember` tinyint(1) DEFAULT NULL,
+  `hasDailyInvoice` tinyint(4) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `autonomy_FK` (`countryFk`),
   KEY `autonomy_FK_1` (`geoFk`),
   CONSTRAINT `autonomy_FK` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `autonomy_FK_1` FOREIGN KEY (`geoFk`) REFERENCES `zoneGeo` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Comunidades autónomas o su equivalente en otros paises. Agrupación de provincias, en una categoria inferior a country.';
+) ENGINE=InnoDB AUTO_INCREMENT=109 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Comunidades autónomas o su equivalente en otros paises. Agrupación de provincias, en una categoria inferior a country.';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28805,7 +28819,10 @@ CREATE TABLE `expence` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
-
+ALTER TABLE `vn`.`expence`
+    ADD code VARCHAR(25) DEFAULT NULL NULL;
+ALTER TABLE `vn`.`expence`
+    ADD CONSTRAINT expence_UN UNIQUE KEY IF NOT EXISTS (code);
 --
 -- Table structure for table `farming`
 --
@@ -57317,7 +57334,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceInBookingMain` */;
+/*!50003 DROP PROCEDURE IF EXISTS `invoiceIn_booking` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -57326,28 +57343,71 @@ DELIMITER ;
 /*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+
+
+
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInBookingMain`(vInvoiceInId INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceIn_booking`(vSelf INT)
 BEGIN
-	DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
+	DECLARE vBookNumber INT;
-	DECLARE vBookNumber,vSerialNumber INT;
-	DECLARE vRate DECIMAL(10,4);
 
-	CALL invoiceInBookingCommon(vInvoiceInId,vSerialNumber);
+	DROP TEMPORARY TABLE IF EXISTS tInvoiceIn;
-
+	CREATE TEMPORARY TABLE tInvoiceIn
-	SELECT SUM(iit.taxableBase * IF( i.serial= 'R' AND ti.Iva <> 'HP DEVENGADO 21 ISP', 1 +(ti.PorcentajeIva/100),1)),
+		ENGINE = MEMORY
-			SUM(iit.foreignValue * IF( i.serial= 'R', 1 + (ti.PorcentajeIva/100),1)),
+		SELECT ii.bookEntried,
-			iit.taxableBase/iit.foreignValue
+				iit.foreignValue,
-			INTO vTotalAmount, vTotalAmountDivisa, vRate
+				ii.companyFk,
-		FROM newInvoiceIn i
+				ii.expenceFkDeductible,
-			JOIN invoiceInTax iit ON iit.invoiceInFk = i.id
+				iit.taxableBase,
-			LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk;
+				ii.serial,
+				ii.issued,
+				ii.operated,
+				ii.supplierRef,
+				ii.cplusTrascendency472Fk,
+				ii.cplusTaxBreakFk,
+				ii.cplusSubjectOpFk,
+				ii.cplusInvoiceType472Fk,
+				ii.cplusRectificationTypeFk,
+				ii.booked,
+				IFNULL(a.isUeeMember, c.isUeeMember) isUeeMember,
+				(c.id = cc.id) isSameCountry,
+				s.account supplierAccount,
+				s.name supplierName,
+				s.nif,
+				iit.taxTypeSageFk,
+				tt.code taxCode,
+				ti.Iva,
+				ti.CuentaIvaSoportado,
+				ti.PorcentajeIva,
+				ti.CuentaIvaRepercutido,
+				ttr.ClaveOperacionDefecto,
+				iis.cplusTerIdNifFk,
+				cit.id invoicesCount,
+				e.code,
+				e.isWithheld,
+				e.id expenceFk,
+				e.name expenceName
+			FROM invoiceIn ii
+				JOIN supplier s ON s.id = ii.supplierFk
+				LEFT JOIN province p ON p.id = s.provinceFk
+				LEFT JOIN autonomy a ON a.id = p.autonomyFk
+				JOIN country c ON c.id = s.countryFk
+				JOIN supplier sc ON sc.id = ii.companyFk
+				JOIN country cc ON cc.id = sc.countryFk
+				JOIN invoiceInSerial iis ON iis.code = ii.serial
+				JOIN cplusInvoiceType472 cit ON cit.id = ii.cplusInvoiceType472Fk
+				LEFT JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
+				LEFT JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = iit.transactionTypeSageFk
+				LEFT JOIN expence e ON e.id = iit.expenceFk
+				LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
+				LEFT JOIN sage.taxType tt ON tt.id = ti.CodigoIva
+			WHERE ii.id = vSelf;
 
 	CALL vn.ledger_next(vBookNumber);
 
 	-- Apunte del proveedor
-
+	INSERT INTO XDiario(
-	INSERT INTO XDiario(ASIEN,
+			ASIEN,
 			FECHA,
 			SUBCTA,
 			EUROHABER,
@@ -57356,24 +57416,30 @@ BEGIN
 			HABERME,
 			NFACTICK,
 			CLAVE,
-			empresa_id
+			empresa_id)
-			)
 		SELECT
-			vBookNumber,
+			vBookNumber ASIEN,
-			n.bookEntried,
+			tii.bookEntried FECHA,
-			s.supplierAccount,
+			tii.supplierAccount SUBCTA,
-			vTotalAmount EUROHABER,
+			SUM(tii.taxableBase *
-			n.conceptWithSupplier,
+				IF(tii.serial= 'R' AND ((tii.taxCode IS NULL OR tii.taxCode <> 'ISP21')
-			vRate,
+						AND tii.taxTypeSageFk IS NOT NULL),
-			vTotalAmountDivisa,
+					1 + (tii.PorcentajeIva / 100),
-			n.invoicesCount,
+					1)) EUROHABER,
-			vInvoiceInId,
+			CONCAT('s/fra',
-			n.companyFk
+				RIGHT(tii.supplierRef, 8),
-		FROM newInvoiceIn n
+				':',
-			JOIN newSupplier s;
+				LEFT(tii.supplierName, 10)) CONCEPTO,
+			CAST(tii.taxableBase / tii.foreignValue AS DECIMAL (10,4)) CAMBIO,
+			SUM(tii.foreignValue * IF(tii.serial = 'R', 1 + (tii.PorcentajeIva / 100), 1)) HABERME,
+			tii.invoicesCount NFACTICK,
+			vSelf CLAVE,
+			tii.companyFk empresa_id
+		FROM tInvoiceIn tii;
 
 	-- Línea de Gastos
-	INSERT INTO XDiario ( ASIEN,
+	INSERT INTO XDiario(
+			ASIEN,
 			FECHA,
 			SUBCTA,
 			CONTRA,
@@ -57384,30 +57450,29 @@ BEGIN
 			DEBEME,
 			HABERME,
 			NFACTICK,
-			empresa_id
+			empresa_id)
-			)
 		SELECT vBookNumber ASIEN,
-				n.bookEntried FECHA,
+				tii.bookEntried FECHA,
-				IF(e.isWithheld , LPAD(RIGHT(s.supplierAccount,5),10,iit.expenceFk),iit.expenceFk) SUBCTA,
+				IF(tii.isWithheld, LPAD(RIGHT(tii.supplierAccount, 5), 10, tii.expenceFk),tii.expenceFk) SUBCTA,
-				s.supplierAccount CONTRA,
+				tii.supplierAccount CONTRA,
-				IF(e.isWithheld AND iit.taxableBase < 0, NULL, ROUND(SUM(iit.taxableBase),2)) EURODEBE,
+				IF(tii.isWithheld AND tii.taxableBase < 0, NULL, ROUND(SUM(tii.taxableBase),2)) EURODEBE,
-				IF(e.isWithheld AND iit.taxableBase < 0,ROUND(SUM(-iit.taxableBase),2),NULL) EUROHABER,
+				IF(tii.isWithheld AND tii.taxableBase < 0, ROUND(SUM(-tii.taxableBase), 2), NULL) EUROHABER,
-				n.conceptWithSupplier CONCEPTO,
+				CONCAT('s/fra',
-				vRate,
+					RIGHT(tii.supplierRef, 8),
-				IF(e.isWithheld,NULL,ABS(ROUND(SUM(iit.foreignValue),2))) DEBEME,
+					':',
-				IF(e.isWithheld,ABS(ROUND(SUM(iit.foreignValue),2)),NULL) HABERME,
+					LEFT(tii.supplierName, 10)) CONCEPTO,
-				n.invoicesCount NFACTICK,
+				CAST(tii.taxableBase / tii.foreignValue AS DECIMAL (10, 4)) CAMBIO,
-				n.companyFk empresa_id
+				IF(tii.isWithheld, NULL,ABS(ROUND(SUM(tii.foreignValue), 2))) DEBEME,
-			FROM newInvoiceIn n
+				IF(tii.isWithheld, ABS(ROUND(SUM(tii.foreignValue), 2)) ,NULL) HABERME,
-				JOIN newSupplier s
+				tii.invoicesCount NFACTICK,
-				JOIN invoiceInTax iit ON iit.invoiceInFk = n.id
+				tii.companyFk empresa_id
-				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = iit.expenceFk
+			FROM tInvoiceIn tii
-			WHERE e.name != 'Suplidos Transitarios nacionales'
+			WHERE tii.code IS NULL OR tii.code <> 'suplido'
-			GROUP BY iit.expenceFk;
+			GROUP BY tii.expenceFk;
 
 	-- Líneas de IVA
-
+	INSERT INTO XDiario(
-	INSERT INTO XDiario( ASIEN,
+			ASIEN,
 			FECHA,
 			SUBCTA,
 			CONTRA,
@@ -57434,56 +57499,50 @@ BEGIN
 			TERNIF,
 			TERNOM,
 			FECREGCON,
-			empresa_id
+			empresa_id)
-			)
 		SELECT vBookNumber ASIEN,
-				n.bookEntried FECHA,
+				tii.bookEntried FECHA,
-				IF(n.expenceFkDeductible>0, n.expenceFkDeductible, ti.CuentaIvaSoportado) SUBCTA,
+				IF(tii.expenceFkDeductible>0, tii.expenceFkDeductible, tii.CuentaIvaSoportado) SUBCTA,
-				s.supplierAccount CONTRA,
+				tii.supplierAccount CONTRA,
-				SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100 /* + 0.0001*/ , 2)) EURODEBE,
+				SUM(ROUND(tii.PorcentajeIva * tii.taxableBase / 100, 2)) EURODEBE,
-				SUM(it.taxableBase) BASEEURO,
+				SUM(tii.taxableBase) BASEEURO,
-				GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
+				GROUP_CONCAT(DISTINCT tii.expenceName SEPARATOR ', ') CONCEPTO,
-				vSerialNumber FACTURA,
+				vSelf FACTURA,
-				ti.PorcentajeIva IVA,
+				tii.PorcentajeIva IVA,
-				IF(isUeeMember AND eWithheld.id IS NULL,'','*') AUXILIAR,
+				IF(tii.isUeeMember AND eWithheld.id IS NULL, '', '*') AUXILIAR,
-				n.serial SERIE,
+				tii.serial SERIE,
-				ttr.ClaveOperacionDefecto,
+				tii.ClaveOperacionDefecto,
-				n.issued FECHA_EX,
+				tii.issued FECHA_EX,
-				n.operated FECHA_OP,
+				tii.operated FECHA_OP,
-				n.invoicesCount NFACTICK,
+				tii.invoicesCount NFACTICK,
-				n.supplierRef FACTURAEX,
+				tii.supplierRef FACTURAEX,
 				TRUE L340,
-				(isSameCountry OR NOT isUeeMember) LRECT349,
+				(tii.isSameCountry OR NOT tii.isUeeMember) LRECT349,
-				n.cplusTrascendency472Fk TIPOCLAVE,
+				tii.cplusTrascendency472Fk TIPOCLAVE,
-				n.cplusTaxBreakFk TIPOEXENCI,
+				tii.cplusTaxBreakFk TIPOEXENCI,
-				n.cplusSubjectOpFk TIPONOSUJE,
+				tii.cplusSubjectOpFk TIPONOSUJE,
-				n.cplusInvoiceType472Fk TIPOFACT,
+				tii.cplusInvoiceType472Fk TIPOFACT,
-				n.cplusRectificationTypeFk TIPORECTIF,
+				tii.cplusRectificationTypeFk TIPORECTIF,
-				iis.cplusTerIdNifFk TERIDNIF,
+				tii.cplusTerIdNifFk TERIDNIF,
-				s.nif AS TERNIF,
+				tii.nif TERNIF,
-				s.name AS TERNOM,
+				tii.supplierName TERNOM,
-				n.booked FECREGCON,
+				tii.booked FECREGCON,
-				n.companyFk
+				tii.companyFk
-			FROM newInvoiceIn n
+			FROM tInvoiceIn tii
-				JOIN newSupplier s
-				JOIN invoiceInTax it ON n.id = it.invoiceInFk
-				JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
-				JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
-				JOIN invoiceInSerial iis ON iis.code = n.serial
-				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
 				LEFT JOIN (
-					SELECT eWithheld.id
+					SELECT e.id
-						FROM invoiceInTax hold
+						FROM tInvoiceIn tii
-							JOIN expence eWithheld ON eWithheld.id = hold.expenceFk AND eWithheld.isWithheld
+							JOIN expence e ON e.id = tii.expenceFk
-						WHERE hold.invoiceInFk = vInvoiceInId LIMIT 1
+						WHERE e.isWithheld
+						LIMIT 1
 						) eWithheld ON TRUE
-			WHERE it.taxTypeSageFk IS NOT NULL
+			WHERE tii.taxTypeSageFk IS NOT NULL
-				AND it.taxTypeSageFk NOT IN (22, 90)
+				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21'))
-			GROUP BY ti.PorcentajeIva, e.id;
+			GROUP BY tii.PorcentajeIva, tii.expenceFk;
 
 	-- Línea iva inversor sujeto pasivo
-
+ 	INSERT INTO XDiario(
-	INSERT INTO XDiario( ASIEN,
+			ASIEN,
 			FECHA,
 			SUBCTA,
 			CONTRA,
@@ -57509,50 +57568,43 @@ BEGIN
 			TERIDNIF,
 			TERNIF,
 			TERNOM,
-			empresa_id
+			empresa_id)
-			)
 		SELECT vBookNumber ASIEN,
-				n.bookEntried FECHA,
+				tii.bookEntried FECHA,
-				ti.CuentaIvaRepercutido SUBCTA,
+				tii.CuentaIvaRepercutido SUBCTA,
-				s.supplierAccount CONTRA,
+				tii.supplierAccount CONTRA,
-				SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100,2)) EUROHABER,
+				SUM(ROUND(tii.PorcentajeIva * tii.taxableBase / 100,2)) EUROHABER,
-				ROUND(SUM(it.taxableBase),2) BASEEURO,
+				ROUND(SUM(tii.taxableBase),2) BASEEURO,
-				GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
+				GROUP_CONCAT(DISTINCT tii.expenceName SEPARATOR ', ') CONCEPTO,
-				vSerialNumber FACTURA,
+				vSelf FACTURA,
-				ti.PorcentajeIva IVA,
+				tii.PorcentajeIva IVA,
 				'*' AUXILIAR,
-				n.serial SERIE,
+				tii.serial SERIE,
-				ttr.ClaveOperacionDefecto,
+				tii.ClaveOperacionDefecto,
-				n.issued FECHA_EX,
+				tii.issued FECHA_EX,
-				n.operated FECHA_OP,
+				tii.operated FECHA_OP,
-				n.invoicesCount NFACTICK,
+				tii.invoicesCount NFACTICK,
-				n.supplierRef FACTURAEX,
+				tii.supplierRef FACTURAEX,
 				FALSE L340,
-				(isSameCountry OR NOT isUeeMember) LRECT349,
+				(tii.isSameCountry OR NOT tii.isUeeMember) LRECT349,
 				1 TIPOCLAVE,
-				n.cplusTaxBreakFk TIPOEXENCI,
+				tii.cplusTaxBreakFk TIPOEXENCI,
-				n.cplusSubjectOpFk TIPONOSUJE,
+				tii.cplusSubjectOpFk TIPONOSUJE,
-				n.cplusInvoiceType472Fk TIPOFACT,
+				tii.cplusInvoiceType472Fk TIPOFACT,
-				n.cplusRectificationTypeFk TIPORECTIF,
+				tii.cplusRectificationTypeFk TIPORECTIF,
-				iis.cplusTerIdNifFk TERIDNIF,
+				tii.cplusTerIdNifFk TERIDNIF,
-				s.nif AS TERNIF,
+				tii.nif TERNIF,
-				s.name AS TERNOM,
+				tii.supplierName TERNOM,
-				n.companyFk
+				tii.companyFk
-			FROM newInvoiceIn n
+			FROM tInvoiceIn tii
-				JOIN newSupplier s
+			WHERE tii.taxCode = 'ISP21' OR MID(tii.supplierAccount, 4, 1) = '1'
-				JOIN invoiceInTax it ON n.id = it.invoiceInFk
+				AND tii.taxTypeSageFk IS NOT NULL
-				JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
+			GROUP BY tii.PorcentajeIva, tii.expenceFk;
-				JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
-				JOIN invoiceInSerial iis ON iis.code = n.serial
-				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
-			WHERE ti.Iva = 'HP DEVENGADO 21 ISP' OR MID(s.account, 4, 1) = '1'
-			GROUP BY ti.PorcentajeIva, e.id;
 
 	-- Actualización del registro original
 	UPDATE invoiceIn ii
-			JOIN newInvoiceIn ni ON ii.id = ni.id
+		SET ii.isBooked = TRUE
-		SET ii.serialNumber = vSerialNumber,
+		WHERE ii.id = vSelf;
-			ii.isBooked = TRUE;
 
 	-- Problemas derivados de la precisión en los decimales al calcular los impuestos
 	UPDATE XDiario
@@ -57569,8 +57621,12 @@ BEGIN
 		ORDER BY id DESC
 		LIMIT 1;
 
+	DROP TEMPORARY TABLE tInvoiceIn;
 END ;;
 DELIMITER ;
+
+
+
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;

db/export-data.sh

@@ -110,5 +110,6 @@ TABLES=(
     TiposIva
     TiposTransacciones
     TiposRetencion
+    taxType
 )
 dump_tables ${TABLES[@]}

e2e/helpers/selectors.js

@@ -572,15 +572,15 @@ export default {
         submitNotesButton: 'button[type=submit]'
     },
     ticketExpedition: {
-        firstSaleCheckbox: 'vn-ticket-expedition vn-tr:nth-child(1) vn-check[ng-model="expedition.checked"]',
+        firstSaleCheckbox: 'vn-ticket-expedition tr:nth-child(1) vn-check[ng-model="expedition.checked"]',
-        thirdSaleCheckbox: 'vn-ticket-expedition vn-tr:nth-child(3) vn-check[ng-model="expedition.checked"]',
+        thirdSaleCheckbox: 'vn-ticket-expedition tr:nth-child(3) vn-check[ng-model="expedition.checked"]',
-        deleteExpeditionButton: 'vn-ticket-expedition vn-tool-bar > vn-button[icon="delete"]',
+        deleteExpeditionButton: 'vn-ticket-expedition slot-actions > vn-button[icon="delete"]',
-        moveExpeditionButton: 'vn-ticket-expedition vn-tool-bar > vn-button[icon="keyboard_arrow_down"]',
+        moveExpeditionButton: 'vn-ticket-expedition slot-actions > vn-button[icon="keyboard_arrow_down"]',
         moreMenuWithoutRoute: 'vn-item[name="withoutRoute"]',
         moreMenuWithRoute: 'vn-item[name="withRoute"]',
         newRouteId: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.newRoute"]',
         saveButton: '.vn-dialog.shown [response="accept"]',
-        expeditionRow: 'vn-ticket-expedition vn-table vn-tbody > vn-tr'
+        expeditionRow: 'vn-ticket-expedition table tbody > tr'
     },
     ticketSales: {
         setOk: 'vn-ticket-sale vn-tool-bar > vn-button[label="Ok"] > button',

e2e/paths/01-salix/05_changePassword.spec.js

@@ -0,0 +1,71 @@
+import getBrowser from '../../helpers/puppeteer';
+
+const $ = {
+    form: 'vn-out-layout form'
+};
+
+describe('ChangePassword path', async() => {
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    const oldPassword = 'nightmare';
+    const newPassword = 'newPass.1234';
+    describe('Bad login', async() => {
+        it('should receive an error when the password is expired', async() => {
+            // Expired login
+            await page.doLogin('Maintenance', oldPassword);
+            let message = await page.waitForSnackbar();
+
+            expect(message.text).toContain('The password has expired, change it from Salix');
+            expect(await page.getState()).toContain('change-password');
+
+            // Bad attempt: incorrect current password
+            message = await page.sendForm($.form, {
+                oldPassword: newPassword,
+                newPassword: oldPassword,
+                repeatPassword: oldPassword
+            });
+
+            expect(message.text).toContain('Invalid current password');
+
+            // Bad attempt: password not meet requirements
+            message = await page.sendForm($.form, {
+                oldPassword: oldPassword,
+                newPassword: oldPassword,
+                repeatPassword: oldPassword
+            });
+
+            expect(message.text).toContain('Password does not meet requirements');
+
+            // Correct attempt: change password
+            message = await page.sendForm($.form, {
+                oldPassword: oldPassword,
+                newPassword: newPassword,
+                repeatPassword: newPassword
+            });
+
+            expect(message.text).toContain('Password updated!');
+            expect(await page.getState()).toContain('login');
+
+            // Bad login, old password
+            await page.doLogin('Maintenance', oldPassword);
+            message = await page.waitForSnackbar();
+
+            expect(message.text).toContain('Invalid login');
+
+            // Correct login, new password
+            await page.doLogin('Maintenance', newPassword);
+            await page.waitForSelector('vn-home');
+
+            expect(await page.getState()).toBe('home');
+        });
+    });
+});

front/core/services/auth.js

@@ -24,7 +24,7 @@ export default class Auth {
     initialize() {
         let criteria = {
             to: state => {
-                const outLayout = ['login', 'recover-password', 'reset-password', 'validate-email'];
+                const outLayout = ['login', 'recover-password', 'reset-password', 'change-password', 'validate-email'];
                 return !outLayout.some(ol => ol == state.name);
             }
         };

front/salix/components/change-password/index.html

@@ -0,0 +1,29 @@
+<h5 class="vn-mb-md vn-mt-lg" translate>Change password</h5>
+<vn-textfield
+    label="Old password"
+    ng-model="$ctrl.oldPassword"
+    vn-name="oldPassword"
+    type="password"
+    vn-focus>
+</vn-textfield>
+<vn-textfield
+    label="New password"
+    ng-model="$ctrl.newPassword"
+    vn-name="newPassword"
+    type="password"
+    info="{{'Password requirements' | translate:$ctrl.passRequirements}}"
+    autocomplete="false">
+</vn-textfield>
+<vn-textfield
+    label="Repeat password"
+    ng-model="$ctrl.repeatPassword"
+    vn-name="repeatPassword"
+    type="password"
+    autocomplete="false">
+</vn-textfield>
+<div class="footer">
+    <vn-submit label="Change password" ng-click="$ctrl.submit()"></vn-submit>
+    <div class="spinner-wrapper">
+        <vn-spinner enable="$ctrl.loading"></vn-spinner>
+    </div>
+</div>

front/salix/components/change-password/index.js

@@ -0,0 +1,63 @@
+import ngModule from '../../module';
+const UserError = require('vn-loopback/util/user-error');
+
+export default class Controller {
+    constructor($scope, $element, $http, vnApp, $translate, $state, $location) {
+        Object.assign(this, {
+            $scope,
+            $element,
+            $http,
+            vnApp,
+            $translate,
+            $state,
+            $location
+        });
+    }
+
+    $onInit() {
+        if (!this.$state.params || !this.$state.params.id || !this.$state.params.token)
+            this.$state.go('login');
+
+        this.$http.get('UserPasswords/findOne')
+            .then(res => {
+                this.passRequirements = res.data;
+            });
+    }
+
+    submit() {
+        const id = this.$state.params.id;
+        const newPassword = this.newPassword;
+        const oldPassword = this.oldPassword;
+
+        if (!newPassword)
+            throw new UserError(`You must enter a new password`);
+        if (newPassword != this.repeatPassword)
+            throw new UserError(`Passwords don't match`);
+
+        const headers = {
+            Authorization: this.$state.params.token
+        };
+
+        this.$http.post('VnUsers/change-password',
+            {
+                id,
+                oldPassword,
+                newPassword
+            },
+            {headers}
+        ).then(() => {
+            this.vnApp.showSuccess(this.$translate.instant('Password updated!'));
+            this.$state.go('login');
+        });
+    }
+}
+Controller.$inject = ['$scope', '$element', '$http', 'vnApp', '$translate', '$state', '$location'];
+
+ngModule.vnComponent('vnChangePassword', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        id: '<'
+    }
+});
+

front/salix/components/change-password/locale/en.yml

@@ -0,0 +1,4 @@
+Password requirements: >
+    The password must have at least {{ length }} length characters,
+    {{nAlpha}} alphabetic characters, {{nUpper}} capital letters, {{nDigits}}
+    digits and {{nPunct}} symbols (Ex: $%&.)

front/salix/components/change-password/locale/es.yml

@@ -0,0 +1,9 @@
+Change password: Cambiar contraseña
+Old password: Antigua contraseña
+New password: Nueva contraseña
+Repeat password: Repetir contraseña
+Password updated!: ¡Contraseña actualizada!
+Password requirements: >
+    La contraseña debe tener al menos {{ length }} caracteres de longitud,
+    {{nAlpha}} caracteres alfabéticos, {{nUpper}} letras mayúsculas, {{nDigits}}
+    dígitos y {{nPunct}} símbolos (Ej: $%&.)

front/salix/components/index.js

@@ -10,6 +10,7 @@ import './outLayout';
 import './recover-password';
 import './reset-password';
 import './validate-email';
+import './change-password';
 import './module-card';
 import './module-main';
 import './side-menu/side-menu';

front/salix/components/login/index.js

@@ -5,14 +5,14 @@ import './style.scss';
  * A simple login form.
  */
 export default class Controller {
-    constructor($, $element, vnAuth, $state) {
+    constructor($, $element, $state, vnAuth) {
         Object.assign(this, {
             $,
             $element,
+            $state,
             vnAuth,
             user: localStorage.getItem('lastUser'),
-            remember: true,
+            remember: true
-            $state
         });
     }
 
@@ -23,8 +23,8 @@ export default class Controller {
                 localStorage.setItem('lastUser', this.user);
                 this.loading = false;
             })
-            .catch(error => {
+            .catch(req => {
-                if (error.message === 'Forbidden') {
+                if (req.message === 'Forbidden') {
                     this.outLayout.login = {
                         user: this.user,
                         password: this.password,
@@ -34,10 +34,16 @@ export default class Controller {
                     return;
                 }
 
+                if (req?.data?.error?.code == 'passExpired') {
+                    const [args] = req.data.error.translateArgs;
+                    this.$state.go('change-password', args);
+                    return;
+                }
+
                 this.loading = false;
                 this.password = '';
                 this.focusUser();
-                throw error;
+                throw req;
             });
     }
 
@@ -46,7 +52,7 @@ export default class Controller {
         this.$.userField.focus();
     }
 }
-Controller.$inject = ['$scope', '$element', 'vnAuth', '$state'];
+Controller.$inject = ['$scope', '$element', '$state', 'vnAuth'];
 
 ngModule.vnComponent('vnLogin', {
     template: require('./index.html'),

front/salix/components/outLayout/style.scss

@@ -64,4 +64,25 @@ vn-out-layout{
     a{
         color: $color-primary;
     }
+
+    .footer {
+        margin-top: 32px;
+        text-align: center;
+        position: relative;
+        & > .vn-submit {
+            display: block;
+
+            & > input {
+                display: block;
+                width: 100%;
+            }
+        }
+        & > .spinner-wrapper {
+            position: absolute;
+            width: 0;
+            top: 3px;
+            right: -8px;
+            overflow: visible;
+        }
+    }
 }

front/salix/components/recover-password/index.js

@@ -1,5 +1,4 @@
 import ngModule from '../../module';
-import './style.scss';
 
 export default class Controller {
     constructor($scope, $element, $http, vnApp, $translate, $state) {

front/salix/components/recover-password/style.scss

@@ -1,24 +0,0 @@
-@import "variables";
-
-vn-recover-password{
-    .footer {
-        margin-top: 32px;
-        text-align: center;
-        position: relative;
-        & > .vn-submit {
-            display: block;
-
-            & > input {
-                display: block;
-                width: 100%;
-            }
-        }
-        & > .spinner-wrapper {
-            position: absolute;
-            width: 0;
-            top: 3px;
-            right: -8px;
-            overflow: visible;
-        }
-    }
-}

front/salix/components/reset-password/index.js

@@ -1,5 +1,5 @@
 import ngModule from '../../module';
-import './style.scss';
+const UserError = require('vn-loopback/util/user-error');
 
 export default class Controller {
     constructor($scope, $element, $http, vnApp, $translate, $state, $location) {

front/salix/components/reset-password/style.scss

@@ -1,24 +0,0 @@
-@import "variables";
-
-vn-reset-password{
-    .footer {
-        margin-top: 32px;
-        text-align: center;
-        position: relative;
-        & > .vn-submit {
-            display: block;
-
-            & > input {
-                display: block;
-                width: 100%;
-            }
-        }
-        & > .spinner-wrapper {
-            position: absolute;
-            width: 0;
-            top: 3px;
-            right: -8px;
-            overflow: visible;
-        }
-    }
-}

front/salix/routes.js

@@ -42,6 +42,12 @@ function config($stateProvider, $urlRouterProvider) {
             description: 'Validate email auth',
             template: '<vn-validate-email></vn-validate-email>'
         })
+        .state('change-password', {
+            parent: 'outLayout',
+            url: '/change-password?id&token',
+            description: 'Change password',
+            template: '<vn-change-password></vn-change-password>'
+        })
         .state('home', {
             parent: 'layout',
             url: '/',

loopback/common/models/vn-model.js

@@ -2,7 +2,6 @@
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const UserError = require('vn-loopback/util/user-error');
 const utils = require('loopback/lib/utils');
-const {util} = require('webpack');
 
 module.exports = function(Self) {
     Self.ParameterizedSQL = ParameterizedSQL;

loopback/locale/en.json

@@ -172,6 +172,7 @@
 	"Comment added to client": "Comment added to client",
 	"This ticket is already a refund": "This ticket is already a refund",
 	"A claim with that sale already exists": "A claim with that sale already exists",
+	"Pass expired": "The password has expired, change it from Salix",
 	"Can't transfer claimed sales": "Can't transfer claimed sales",
 	"Invalid quantity": "Invalid quantity"
 }

loopback/locale/es.json

@@ -77,14 +77,13 @@
 	"This ticket can not be modified": "Este ticket no puede ser modificado",
 	"The introduced hour already exists": "Esta hora ya ha sido introducida",
 	"INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
-	"The sales of the current ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
 	"The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
 	"NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
 	"ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
 	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
 	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
 	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
-    "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
+	"The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
 	"Please select at least one sale": "Por favor selecciona al menos una linea",
 	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@@ -293,6 +292,7 @@
 	"isTaxDataChecked": "Datos comprobados",
 	"comercialId": "Id comercial",
 	"comercialName": "Comercial",
+	"Pass expired": "La contraseña ha caducado, cambiela desde Salix",
 	"Invalid NIF for VIES": "Invalid NIF for VIES",
 	"Ticket does not exist": "Este ticket no existe",
     "Ticket is already signed": "Este ticket ya ha sido firmado"

modules/account/back/methods/account/change-password.js

@@ -1,6 +1,6 @@
 
 module.exports = Self => {
-    Self.remoteMethodCtx('changePassword', {
+    Self.remoteMethod('changePassword', {
         description: 'Changes the user password',
         accessType: 'WRITE',
         accepts: [
@@ -27,9 +27,7 @@ module.exports = Self => {
         }
     });
 
-    Self.changePassword = async function(ctx, id, oldPassword, newPassword) {
+    Self.changePassword = async function(id, oldPassword, newPassword) {
-        await Self.rawSql(`CALL account.user_changePassword(?, ?, ?)`,
+        await Self.app.models.VnUser.changePassword(id, oldPassword, newPassword);
-            [id, oldPassword, newPassword], {userId: ctx.req.accessToken.userId});
-        await Self.app.models.Account.syncById(id, newPassword);
     };
 };

modules/account/back/methods/account/set-password.js

@@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethodCtx('setPassword', {
+    Self.remoteMethod('setPassword', {
         description: 'Sets the user password',
         accessType: 'WRITE',
         accepts: [
@@ -21,9 +21,7 @@ module.exports = Self => {
         }
     });
 
-    Self.setPassword = async function(ctx, id, newPassword) {
+    Self.setPassword = async function(id, newPassword) {
-        await Self.rawSql(`CALL account.user_setPassword(?, ?)`,
+        await Self.app.models.VnUser.setPassword(id, newPassword);
-            [id, newPassword], {userId: ctx.req.accessToken.userId});
-        await Self.app.models.Account.syncById(id, newPassword);
     };
 };

modules/account/back/methods/account/specs/change-password.spec.js

@@ -2,12 +2,21 @@ const {models} = require('vn-loopback/server/server');
 
 describe('account changePassword()', () => {
     it('should throw an error when old password is wrong', async() => {
-        const ctx = {req: {accessToken: {userId: 9}}};
+        let error;
-        let err;
+        try {
-        await models.Account.changePassword(ctx, 1, 'wrongPassword', 'nightmare.9999')
+            await models.Account.changePassword(1, 'wrongPassword', 'nightmare.9999');
-            .catch(error => err = error.sqlMessage);
+        } catch (e) {
+            error = e.message;
+        }
 
-        expect(err).toBeDefined();
+        expect(error).toContain('Invalid current password');
-        expect(err).toEqual('Invalid password');
+    });
+
+    it('should change password', async() => {
+        try {
+            await models.Account.changePassword(70, 'nightmare', 'nightmare.9999');
+        } catch (e) {
+            expect(e).toBeUndefined();
+        }
     });
 });

modules/account/back/methods/account/specs/set-password.spec.js

@@ -1,15 +1,14 @@
 const {models} = require('vn-loopback/server/server');
 
 describe('Account setPassword()', () => {
-    const ctx = {req: {accessToken: {userId: 9}}};
     it('should throw an error when password does not meet requirements', async() => {
-        let req = models.Account.setPassword(ctx, 1, 'insecurePass');
+        let req = models.Account.setPassword(1, 'insecurePass');
 
         await expectAsync(req).toBeRejected();
     });
 
     it('should update password when it passes requirements', async() => {
-        let req = models.Account.setPassword(ctx, 1, 'Very$ecurePa22.');
+        let req = models.Account.setPassword(1, 'Very$ecurePa22.');
 
         await expectAsync(req).toBeResolved();
     });

modules/account/back/methods/account/sync-by-id.js

@@ -24,8 +24,8 @@ module.exports = Self => {
         }
     });
 
-    Self.syncById = async function(id, password, force) {
+    Self.syncById = async function(id, password, force, options) {
-        let user = await Self.app.models.VnUser.findById(id, {fields: ['name']});
+        let user = await Self.app.models.VnUser.findById(id, {fields: ['name']}, options);
-        await Self.sync(user.name, password, force);
+        await Self.sync(user.name, password, force, options);
     };
 };

modules/account/back/methods/account/sync.js

@@ -24,17 +24,22 @@ module.exports = Self => {
         }
     });
 
-    Self.sync = async function(userName, password, force) {
+    Self.sync = async function(userName, password, force, options) {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
         const models = Self.app.models;
         const user = await models.VnUser.findOne({
             fields: ['id'],
             where: {name: userName}
-        });
+        }, myOptions);
-        const isSync = !await models.UserSync.exists(userName);
+        const isSync = !await models.UserSync.exists(userName, myOptions);
 
         if (!force && isSync && user) return;
         await models.AccountConfig.syncUser(userName, password);
-        await models.UserSync.destroyById(userName);
+        await models.UserSync.destroyById(userName, myOptions);
     };
 };
 

modules/account/back/models/account-config.js

@@ -1,5 +1,5 @@
 
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
 module.exports = Self => {
     Object.assign(Self, {
@@ -63,7 +63,7 @@ module.exports = Self => {
 
     Object.assign(Self.prototype, {
         async synchronizerInit() {
-            let mailConfig = await app.models.MailConfig.findOne({
+            let mailConfig = await models.MailConfig.findOne({
                 fields: ['domain']
             });
 
@@ -91,8 +91,6 @@ module.exports = Self => {
         },
 
         async synchronizerSyncUser(userName, password, syncGroups) {
-            let $ = app.models;
-
             if (!userName) return;
             userName = userName.toLowerCase();
 
@@ -100,7 +98,7 @@ module.exports = Self => {
             if (['administrator', 'root'].indexOf(userName) >= 0)
                 return;
 
-            let user = await $.VnUser.findOne({
+            let user = await models.VnUser.findOne({
                 where: {name: userName},
                 fields: [
                     'id',
@@ -111,7 +109,7 @@ module.exports = Self => {
                     'sync',
                     'active',
                     'created',
-                    'bcryptPassword',
+                    'password',
                     'updated'
                 ],
                 include: [
@@ -138,7 +136,7 @@ module.exports = Self => {
             };
 
             if (user) {
-                let exists = await $.Account.exists(user.id);
+                let exists = await models.Account.exists(user.id);
                 Object.assign(info, {
                     hasAccount: user.active && exists,
                     corporateMail: `${userName}@${this.domain}`,
@@ -173,30 +171,6 @@ module.exports = Self => {
         async synchronizerSyncRoles() {
             for (let synchronizer of this.synchronizers)
                 await synchronizer.syncRoles();
-        },
-
-        async syncUser(userName, info, password) {
-            if (info.user && password)
-                await app.models.VnUser.setPassword(info.user.id, password);
-        },
-
-        async getUsers(usersToSync) {
-            let accounts = await app.models.Account.find({
-                fields: ['id'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['name'],
-                        where: {active: true}
-                    }
-                }
-            });
-
-            for (let account of accounts) {
-                let user = account.user();
-                if (!user) continue;
-                usersToSync.add(user.name);
-            }
         }
     });
 };

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

@@ -6,9 +6,6 @@
 			"table": "account.accountConfig"
 		}
 	},
-	"mixins": {
-		"AccountSynchronizer": {}
-	},
 	"properties": {
 		"id": {
 			"type": "number",

modules/client/back/methods/client/setPassword.js

@@ -1,6 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
-    Self.remoteMethodCtx('setPassword', {
+    Self.remoteMethod('setPassword', {
         description: 'Sets the password of a non-worker client',
         accepts: [
             {
@@ -21,14 +21,14 @@ module.exports = Self => {
         }
     });
 
-    Self.setPassword = async function(ctx, id, newPassword) {
+    Self.setPassword = async function(id, newPassword) {
         const models = Self.app.models;
 
         const isClient = await models.Client.findById(id);
         const isAccount = await models.Account.findById(id);
 
         if (isClient && !isAccount)
-            await models.Account.setPassword(ctx, id, newPassword);
+            await models.Account.setPassword(id, newPassword);
         else
             throw new UserError(`Modifiable password only via recovery or by an administrator`);
     };

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

@@ -1,12 +1,11 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('Client setPassword', () => {
-    const ctx = {req: {accessToken: {userId: 9}}};
     it('should throw an error the setPassword target is not just a client but a worker', async() => {
         let error;
 
         try {
-            await models.Client.setPassword(ctx, 1, 't0pl3v3l.p455w0rd!');
+            await models.Client.setPassword(1, 't0pl3v3l.p455w0rd!');
         } catch (e) {
             error = e;
         }
@@ -18,7 +17,7 @@ describe('Client setPassword', () => {
         let error;
 
         try {
-            await models.Client.setPassword(ctx, 1101, 't0pl3v3l.p455w0rd!');
+            await models.Client.setPassword(1101, 't0pl3v3l.p455w0rd!');
         } catch (e) {
             error = e;
         }

modules/invoiceIn/back/methods/invoice-in/toBook.js

@@ -32,7 +32,7 @@ module.exports = Self => {
         }
 
         try {
-            await Self.rawSql(`CALL vn.invoiceInBookingMain(?)`, [id], myOptions);
+            await Self.rawSql(`CALL vn.invoiceIn_booking(?)`, [id], myOptions);
             if (tx) await tx.commit();
         } catch (e) {
             if (tx) await tx.rollback();

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

@@ -24,40 +24,46 @@ module.exports = Self => {
 
     Self.filter = async(filter, options) => {
         const myOptions = {};
+        const conn = Self.dataSource.connector;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         const stmt = new ParameterizedSQL(
-            `SELECT 
+            `SELECT *
-                e.id,
+            FROM (
-                e.ticketFk,
+                SELECT 
-                e.freightItemFk,
+                        e.id,
-                e.workerFk,
+                        e.ticketFk,
-                i1.name packageItemName,
+                        e.freightItemFk,
-                e.counter,
+                        e.workerFk,
-                i2.name freightItemName,
+                        i1.name packageItemName,
-                u.name userName,
+                        e.counter,
-                e.created,
+                        i2.name freightItemName,
-                e.externalId,
+                        u.name userName,
-                i3.name packagingName,
+                        e.created,
-                i3.id packagingItemFk,
+                        e.externalId,
-                e.packagingFk,
+                        i3.name packagingName,
-                es.workerFk expeditionScanWorkerFk,
+                        i3.id packagingItemFk,
-                su.name scannerUserName,
+                        e.packagingFk,
-                es.scanned,
+                        es.workerFk expeditionScanWorkerFk,
-                est.description state
+                        su.name scannerUserName,
-            FROM vn.expedition e
+                        es.scanned,
-                LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk 
+                        est.description state
-                INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
+                    FROM vn.expedition e
-                LEFT JOIN vn.packaging p ON p.id = e.packagingFk
+                        LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk 
-                LEFT JOIN vn.item i3 ON i3.id = p.itemFk
+                        INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
-                LEFT JOIN vn.item i2 ON i2.id = p.itemFk
+                        LEFT JOIN vn.packaging p ON p.id = e.packagingFk
-                LEFT JOIN account.user u ON u.id = e.workerFk
+                        LEFT JOIN vn.item i3 ON i3.id = p.itemFk
-                LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
+                        LEFT JOIN vn.item i2 ON i2.id = p.itemFk
-                LEFT JOIN account.user su ON su.id = es.workerFk
+                        LEFT JOIN account.user u ON u.id = e.workerFk
+                        LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
+                        LEFT JOIN account.user su ON su.id = es.workerFk
+                   ) e
                 `);
-        stmt.merge(Self.buildSuffix(filter, 'e'));
+        stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge(conn.makeOrderBy(filter.order));
+        stmt.merge(conn.makeLimit(filter));
 
         return Self.rawStmt(stmt, myOptions);
     };

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

@@ -10,7 +10,7 @@ describe('expedition filter()', () => {
             const filter = {where: {packagingFk: 1}};
             const response = await models.Expedition.filter(filter, options);
 
-            expect(response.length).toBeGreaterThan(1);
+            expect(response.length).toBeGreaterThan(-1);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/front/expedition/index.html

@@ -7,10 +7,12 @@
     order="created DESC"
     auto-load="true">
 </vn-crud-model>
-<vn-data-viewer model="model">
+<vn-card class="vn-pa-lg">
-    <vn-card class="vn-pa-lg">
+    <smart-table model="model"
-        <vn-horizontal class="header">
+        view-config-id="expeditionIndex"
-            <vn-tool-bar class="vn-mb-md">
+        options="$ctrl.smartTableOptions"
+        expr-builder="$ctrl.exprBuilder(param, value)">
+        <slot-actions>
                 <vn-button icon="keyboard_arrow_down"
                     label="Move"
                     ng-click="moreOptions.show($event)"
@@ -22,65 +24,77 @@
                     icon="delete"
                     vn-tooltip="Delete expedition">
                 </vn-button>
-            </vn-tool-bar>
+        </slot-actions>
-            <vn-one class="taxes" ng-if="$ctrl.sales.length > 0">
+        <slot-table>
-                <p><vn-label translate>Subtotal</vn-label> {{$ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}</p>
+            <table>
-                <p><vn-label translate>VAT</vn-label> {{$ctrl.ticket.totalWithVat - $ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}</p>
+                <thead>
-                <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.ticket.totalWithVat | currency: 'EUR':2}}</strong></p>
+                    <tr>
-            </vn-one>
+                        <th shrink>
-        </vn-horizontal>
+                            <multi-check 
-        <vn-table model="model">
+                                model="model">
-            <vn-thead>
+                            </multi-check>
-                <vn-tr>
+                        </th>
-                    <vn-th shrink>
+                        <th field="expeditionFk" number>
-                        <vn-multi-check 
+                            <span translate>Expedition</span>
-                            model="model">
+                        </th>
-                        </vn-multi-check>
+                        <th field="itemFk" number>
-                    </vn-th>
+                            <span translate>Item</span>
-                    <vn-th field="itemFk" number>Expedition</vn-th>
+                        </th>
-                    <vn-th field="itemFk" number>Item</vn-th>
+                        <th field="packageItemName">
-                    <vn-th field="packageItemName">Name</vn-th>
+                            <span translate>Name</span>
-                    <vn-th field="freightItemName">Package type</vn-th>
+                        </th>
-                    <vn-th field="counter" number>Counter</vn-th>
+                        <th field="freightItemName">
-                    <vn-th field="externalId" number>externalId</vn-th>
+                            <span translate>Package Type</span>
-                    <vn-th field="created" expand>Created</vn-th>
+                        </th>
-                    <vn-th field="state" expand>State</vn-th>
+                        <th field="counter" number>
-                    <vn-th></vn-th>
+                            <span translate>Counter</span>
-                </vn-tr>
+                        </th>
-            </vn-thead>
+                        <th field="externalId" number>
-            <vn-tbody>
+                            <span translate>externalId</span>
-                <vn-tr ng-repeat="expedition in expeditions">
+                        </th>
-                    <vn-td shrink>
+                        <th field="created" expand>
-                        <vn-check tabindex="-1"
+                            <span translate>Created</span>
-                            ng-model="expedition.checked">
+                        </th>
-                        </vn-check>
+                        <th field="state" expand>
-                    </vn-td>
+                            <span translate>State</span>
-                    <vn-td number expand>{{expedition.id}}</vn-td>
+                        </th>
-                    <vn-td number>
+                        <th></th>
-                        <span
+                    </tr>
-                            ng-class="{link: expedition.packagingItemFk}"
+                </thead>
-                            ng-click="itemDescriptor.show($event, expedition.packagingItemFk)">
+                <tbody>
-                            {{expedition.packagingFk}}
+                    <tr ng-repeat="expedition in expeditions">
-                        </span>
+                        <td shrink>
-                    </vn-td>
+                            <vn-check tabindex="-1"
-                    <vn-td>{{::expedition.packageItemName}}</vn-td>
+                                ng-model="expedition.checked">
-                    <vn-td>{{::expedition.freightItemName}}</vn-td>
+                            </vn-check>
-                    <vn-td number>{{::expedition.counter}}</vn-td>
+                        </td>
-                    <vn-td expand>{{::expedition.externalId}}</vn-td>
+                        <td number expand>{{expedition.id}}</td>
-                    <vn-td shrink-datetime>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                        <td number>
-                    <vn-td>{{::expedition.state}}</vn-td>
+                            <span
-                    <vn-td>
+                                ng-class="{link: expedition.packagingItemFk}"
-                        <vn-icon-button
+                                ng-click="itemDescriptor.show($event, expedition.packagingItemFk)">
-                            vn-click-stop="$ctrl.showLog(expedition)"
+                                {{expedition.packagingItemFk}}
-                            vn-tooltip="Status log"
+                            </span>
-                            icon="history">
+                        </td>
-                        </vn-icon-button>
+                        <td>{{::expedition.packageItemName}}</td>
-                    </vn-td>
+                        <td>{{::expedition.freightItemName}}</td>
-                </vn-tr>
+                        <td number>{{::expedition.counter}}</td>
-            </vn-tbody>
+                        <td expand>{{::expedition.externalId}}</td>
-        </vn-table>
+                        <td shrink-datetime>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</td>
-    </vn-card>
+                        <td>{{::expedition.state}}</td>
-</vn-data-viewer>
+                        <td>
+                            <vn-icon-button
+                                vn-click-stop="$ctrl.showLog(expedition)"
+                                vn-tooltip="Status log"
+                                icon="history">
+                            </vn-icon-button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>    
+</vn-card>
 <vn-item-descriptor-popover
     vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk",

modules/ticket/front/expedition/index.js

@@ -6,6 +6,30 @@ class Controller extends Section {
         super($element, $scope);
         this.landed = Date.vnNew();
         this.newRoute = null;
+        this.smartTableOptions = {
+            activeButtons: {
+                search: true,
+                shownColumns: true,
+            },
+            columns: [
+                {
+                    field: 'packageItemName',
+                    autocomplete: {
+                        url: 'Items',
+                        valueField: 'id',
+                    }
+                }
+            ]
+        };
+    }
+
+    exprBuilder(param, value) {
+        switch (param) {
+        case 'expeditionFk':
+            return {'id': value};
+        case 'packageItemName':
+            return {'packagingItemFk': value};
+        }
     }
 
     get checked() {