e2e/paths/05-ticket/18_index_payout.spec.js

@@ -63,6 +63,6 @@ describe('Ticket index payout path', () => {
         const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
 
         expect(count).toEqual(4);
-        expect(reference).toContain('Cash,Albaran: 7, 8Payment');
+        expect(reference).toContain('Cash, Albaran: 7, 8Payment');
     });
 });

loopback/locale/es.json

@@ -263,6 +263,6 @@
 	"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
 	"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
 	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
-	"There is no assigned email for this client": "No hay correo asignado para este cliente"
+	"There is no assigned email for this client": "No hay correo asignado para este cliente",
+	"Not exist this branch": "La rama no existe"
 }
-

modules/client/front/balance/create/index.js

@@ -68,7 +68,7 @@ class Controller extends Dialog {
                     this.receipt.description.push(accountingType.receiptDescription);
                 if (this.originalDescription)
                     this.receipt.description.push(this.originalDescription);
-                this.receipt.description.join(', ');
+                this.receipt.description = this.receipt.description.join(', ');
             }
             this.maxAmount = accountingType && accountingType.maxAmount;
 

modules/client/front/balance/create/index.spec.js

@@ -38,7 +38,7 @@ describe('Client', () => {
                     }
                 };
 
-                expect(controller.receipt.description.join(',')).toEqual('Cash,Albaran: 1, 2');
+                expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2');
             });
         });
 

modules/item/front/diary/index.js

@@ -70,6 +70,7 @@ class Controller extends Section {
     }
 
     $onDestroy() {
+        if (this.$state.getCurrentPath()[2].state.name === 'item')
             this.card.reload();
     }
 }

modules/mdb/back/methods/mdbVersion/upload.js

@@ -47,7 +47,16 @@ module.exports = Self => {
             verb: 'POST'
         }
     });
-    Self.upload = async(ctx, options) => {
+    Self.upload = async(
+        ctx,
+        appName,
+        toVersion,
+        branch,
+        fromVersion,
+        description,
+        unlock,
+        options
+    ) => {
         const models = Self.app.models;
         const myOptions = {};
         const $t = ctx.req.__; // $translate
@@ -55,12 +64,6 @@ module.exports = Self => {
         const AccessContainer = models.AccessContainer;
         const fileOptions = {};
         let tx;
-        const appName = ctx.args.appName;
-        const toVersion = ctx.args.toVersion;
-        const branch = ctx.args.branch;
-        const fromVersion = ctx.args.fromVersion;
-        let description = ctx.args.description;
-        const unlock = ctx.args.unlock;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -153,11 +156,14 @@ module.exports = Self => {
                 formatDesc += `*${appName.toUpperCase()}* v.${toVersion} `;
 
                 const oldVersion = await models.MdbVersionTree.findOne({
-                    where: {version: fromVersion},
+                    where: {
+                        version: fromVersion,
+                        app: appName
+                    },
                     fields: ['branchFk']
                 }, myOptions);
 
-                if (branch == oldVersion.branchFk)
+                if (!oldVersion || branch == oldVersion.branchFk)
                     formatDesc += `[*${branch}*]: `;
                 else
                     formatDesc += `[*${oldVersion.branchFk}* » *${branch}*]: `;

modules/supplier/back/methods/supplier/updateFiscalData.js

@@ -64,6 +64,10 @@ module.exports = Self => {
         {
             arg: 'healthRegister',
             type: 'string'
+        },
+        {
+            arg: 'isTrucker',
+            type: 'boolean'
         }],
         returns: {
             arg: 'res',

print/templates/reports/collection-label/collection-label.js

@@ -66,8 +66,10 @@ module.exports = {
             else
                 value = '---';
 
-            if (labelData.routeFk)
+            if (labelData.routeFk) {
-                value = `${value} [${labelData.routeFk.toString().substring(0, 3)}]`;
+                let routeFk = labelData.routeFk.toString();
+                value = `${value} [${routeFk.substring(routeFk.length - 3)}]`;
+            }
 
             return value;
         },

print/templates/reports/collection-label/options.json

@@ -3,9 +3,9 @@
     "height": "4.9cm",
     "margin": {
         "top": "0.3cm",
-        "right": "0.6cm",
+        "right": "0.3cm",
         "bottom": "0cm",
-        "left": "0cm"
+        "left": "0.2cm"
     },
     "printBackground": true
 }