Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -10,7 +10,6 @@ BEGIN
 
 	IF NEW.isBooked = OLD.isBooked AND (
 			NOT (NEW.supplierFk <=> OLD.supplierFk) OR
-			NOT (NEW.dated <=> OLD.dated) OR
 			NOT (NEW.travelFk <=> OLD.travelFk) OR
 			NOT (NEW.companyFk <=> OLD.companyFk) OR
 			NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) OR

modules/client/back/models/client.js

@@ -248,9 +248,10 @@ module.exports = Self => {
         const models = Self.app.models;
 
         const loopBackContext = LoopBackContext.getCurrentContext();
-        const accessToken = {req: loopBackContext.active.accessToken};
 
-        const editVerifiedDataWithoutTaxDataChecked = models.ACL.checkAccessAcl(
+        const accessToken = {req: {accessToken: loopBackContext.active.accessToken}};
+
+        const editVerifiedDataWithoutTaxDataChecked = await models.ACL.checkAccessAcl(
             accessToken,
             'Client',
             'editVerifiedDataWithoutTaxDataCheck',

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

@@ -32,6 +32,12 @@ module.exports = Self => {
                 description: 'The client id',
                 http: {source: 'query'}
             },
+            {
+                arg: 'companyFk',
+                type: 'integer',
+                description: 'The company id',
+                http: {source: 'query'}
+            },
             {
                 arg: 'fi',
                 type: 'string',
@@ -148,6 +154,7 @@ module.exports = Self => {
                 i.hasPdf,
                 i.customsAgentFk,
                 c.socialName AS clientSocialName,
+                i.companyFk,
                 co.code AS companyCode,
                 ca.fiscalName AS customsAgentName
             FROM invoiceOut i

modules/item/back/methods/fixed-price/filter.js

@@ -22,6 +22,11 @@ module.exports = Self => {
                 type: 'integer',
                 description: 'The item id',
             },
+            {
+                arg: 'name',
+                type: 'string',
+                description: 'The item name',
+            },
             {
                 arg: 'typeFk',
                 type: 'integer',
@@ -112,6 +117,8 @@ module.exports = Self => {
                     : {'it.code': {like: `%${value}%`}};
             case 'categoryFk':
                 return {'it.categoryFk': value};
+            case 'name':
+                return {'i.name': {like: `%${value}%`}};
             case 'buyerFk':
                 return {'it.workerFk': value};
             case 'warehouseFk':