Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions

front/salix/components/bank-entity/index.js

@@ -11,6 +11,7 @@ class Controller extends Dialog {
             throw new Error(`The country can't be empty`);
 
         return this.$http.post(`bankEntities`, this.data)
+            .then(res => this.data.id = res.data.id)
             .then(() => super.responseHandler(response))
             .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }

front/salix/components/bank-entity/index.spec.js

@@ -27,12 +27,13 @@ describe('Salix Component vnNewBankEntity', () => {
                 countryFk: 1
             };
 
-            $httpBackend.expectPOST('bankEntities', controller.data).respond(200);
+            $httpBackend.expectPOST('bankEntities', controller.data).respond({id: 1});
 
             controller.responseHandler('accept');
             $httpBackend.flush();
 
             expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+            expect(controller.data.id).toEqual(1);
         });
     });
 });

modules/client/front/summary/index.html

@@ -293,7 +293,7 @@
                         <vn-th field="id" number>Id</vn-th>
                         <vn-th field="nickname" expand>Nickname</vn-th>
                         <vn-th field="agencyModeFk" expand>Agency</vn-th>
-                        <vn-th field="routeFk" shrink>Route</vn-th>
+                        <vn-th field="routeFk" expand>Route</vn-th>
                         <vn-th field="packages" shrink>Packages</vn-th>
                         <vn-th field="shipped" shrink-date>Date</vn-th>
                         <vn-th field="stateFk">State</vn-th>

print/core/smtp.js

@@ -25,7 +25,7 @@ module.exports = {
             throw err;
         }).finally(async() => {
             await db.rawSql(`
-                INSERT INTO vn.mail (sender, replyTo, sent, subject, body, status)
+                INSERT INTO vn.mail (receiver, replyTo, sent, subject, body, status)
                     VALUES (?, ?, 1, ?, ?, ?)`, [
                 options.to,
                 options.replyTo,

print/templates/reports/delivery-note/locale/en.yml

@@ -29,7 +29,7 @@ services:
     amount: Amount
   tfoot:
     subtotal: Subtotal
-  warning: Deposit packaging will be invoiced if they have not been returned after 30 days of their delivery
+  warning: Deposit packaging will be invoiced if they have not been returned after 30 days of their delivery.
 packagings:
   title: Buckets and packaging
   theader:

print/templates/reports/delivery-note/locale/es.yml

@@ -29,7 +29,7 @@ services:
     amount: Importe
   tfoot:
     subtotal: Subtotal
-  warning: Los embalajes en depósito se facturarán si no han sido devueltos pasados 30 dias de su entrega
+  warning: Los embalajes en depósito se facturarán si no han sido devueltos pasados 30 dias de su entrega.
 packagings:
   title: Cubos y embalajes
   theader:

print/templates/reports/delivery-note/locale/fr.yml

@@ -29,7 +29,7 @@ services:
     amount: Montant
   tfoot:
     subtotal: Total partiel
-  warning: Les emballages de consigne seront facturés s'ils n'ont pas été retournés après 30 jours de leur livraison
+  warning: Les emballages de consigne seront facturés s'ils n'ont pas été retournés après 30 jours de leur livraison.
 packagings:
   title: Bacs et emballages
   theader:

print/templates/reports/delivery-note/locale/pt.yml

@@ -29,7 +29,7 @@ services:
     amount: Quantia
   tfoot:
     subtotal: Subtotal
-  warning: Os pacotes do armazém serão cobrados se não forem devolvidos 30 dias após a entrega
+  warning: As embalagens em depósito serão facturadas e cobradas se não são devolvidas 30 dias após a entrega.
 packagings:
   title: Baldes e Embalagens
   theader: