Merge branch 'dev' into 5728-bugEntry/buy

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

@@ -3,6 +3,7 @@ const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     Self.remoteMethodCtx('renewToken', {
         description: 'Checks if the token has more than renewPeriod seconds to live and if so, renews it',
+        accessType: 'WRITE',
         accepts: [],
         returns: {
             type: 'Object',

db/changes/232601/00-aclVnUser_renewToken.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('VnUser', 'renewToken', 'WRITE', 'ALLOW', 'ROLE', 'employee')

print/core/components/report-footer/report-footer.js

@@ -5,10 +5,9 @@ module.exports = {
     name: 'report-footer',
     async serverPrefetch() {
         this.company = await db.findOne(`
-            SELECT IFNULL(ci.footnotes, cl.footnotes) as footnotes
+            SELECT IFNULL(ci.footnotes, c.footnotes) footnotes
                 FROM company c
-                    LEFT JOIN companyL10n cl ON c.id = cl.id 
-                    LEFT JOIN companyI18n ci ON ci.companyFk = cl.id 
+                    LEFT JOIN companyI18n ci ON ci.companyFk = c.id
                         AND ci.lang = (SELECT lang FROM account.user where id = ?)
                 WHERE c.code = ?`,
         [this.recipientId, this.companyCode]);