Merge branch 'dev' into 5666-loggable_to_mixin

back/methods/docuware/specs/upload.spec.js

@@ -31,7 +31,7 @@ describe('docuware upload()', () => {
         try {
             const options = {transaction: tx};
             const user = await models.UserConfig.findById(userId, null, options);
-            await user.updateAttribute('tabletFk', 'Tablet1');
+            await user.updateAttribute('tabletFk', 'Tablet1', options);
             await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
 
             await tx.rollback();

back/methods/vn-user/specs/renew-token.spec.js

@@ -30,7 +30,6 @@ describe('Renew Token', () => {
     it('should renew token', async() => {
         const mockDate = new Date(startingTime + 26600000);
         jasmine.clock().mockDate(mockDate);
-        console.log(startingTime, mockDate)
         const {id} = await models.VnUser.renewToken(ctx);
 
         expect(id).not.toEqual(ctx.req.accessToken.id);

modules/invoiceOut/back/methods/invoiceOut/negativeBases.js

@@ -90,7 +90,7 @@ module.exports = Self => {
                             AND t.refFk IS NULL
                             AND c.typeFk IN ('normal','trust')
                         GROUP BY t.clientFk, negativeBase.taxableBase
-                        HAVING amount <> 0`, [args.from, args.to]));
+                        HAVING amount < 0`, [args.from, args.to]));
 
         stmt = new ParameterizedSQL(`
             SELECT f.*

modules/item/back/locale/item-shelving/en.yml

@@ -0,0 +1,13 @@
+name: itemShelving
+columns:
+    id: id
+    itemFk: item
+    shelvingFk: shelving
+    visible: visible
+    created: created
+    grouping: grouping
+    packing: packing
+    packagingFk: package
+    userFk: user
+    isChecked: isChecked
+    buyFk: buy

modules/item/back/locale/item-shelving/es.yml

@@ -0,0 +1,13 @@
+name: artículo del carro
+columns:
+    id: id
+    itemFk: artículo
+    shelvingFk: matrícula carro
+    visible: visible
+    created: creado
+    grouping: grouping
+    packing: packing
+    packagingFk: embalaje
+    userFk: usuario
+    isChecked: está revisado
+    buyFk: compra