Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

db/changes/231601/00-observationEmailACL.sql

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

e2e/helpers/selectors.js

@@ -989,9 +989,9 @@ export default {
         saveButton: 'vn-worker-basic-data button[type=submit]'
     },
     workerNotes: {
-        addNoteFloatButton: 'vn-float-button',
-        note: 'vn-textarea[ng-model="$ctrl.note.text"]',
-        saveButton: 'button[type=submit]',
+        addNoteFloatButton: 'vn-worker-note vn-icon[icon="add"]',
+        note: 'vn-note-worker-create vn-textarea[ng-model="$ctrl.note.text"]',
+        saveButton: 'vn-note-worker-create button[type=submit]',
         firstNoteText: 'vn-worker-note .text'
     },
     workerPbx: {

e2e/paths/02-client/21_defaulter.spec.js

@@ -50,7 +50,7 @@ describe('Client defaulter path', () => {
         expect(message.text).toContain(`The message can't be empty`);
     });
 
-    it('shoul checked all defaulters', async() => {
+    it('should checked all defaulters', async() => {
         await page.loginAndModule('insurance', 'client');
         await page.accessToSection('client.defaulter');
 

e2e/paths/03-worker/08_add_notes.spec.js

@@ -7,7 +7,7 @@ describe('Worker Add notes path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('employee', 'worker');
+        await page.loginAndModule('hr', 'worker');
         await page.accessToSearchResult('Bruce Banner');
         await page.accessToSection('worker.card.note.index');
     });

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -249,6 +249,7 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
+        await page.waitToClick(selectors.globalItems.acceptButton);
         await page.waitForState('claim.card.basicData');
     });
 

modules/client/front/locale/es.yml

@@ -64,3 +64,4 @@ Compensation Account: Cuenta para compensar
 Amount to return: Cantidad a devolver
 Delivered amount: Cantidad entregada
 Unpaid: Impagado
+There is no zona: No hay zona

modules/client/front/postcode/locale/es.yml

@@ -8,4 +8,5 @@ The province can't be empty: La provincia no puede quedar vacía
 The country can't be empty: El país no puede quedar vacío
 The postcode has been created. You can save the data now: Se ha creado el código postal. Ahora puedes guardar los datos
 The city has been created: Se ha creado la ciudad
-The province has been created: Se ha creado la provincia
+The province has been created: Se ha creado la provincia
+Autonomy: Autonomia

modules/supplier/front/consumption/index.html

@@ -47,9 +47,11 @@
             <vn-tbody>
                 <vn-tr ng-repeat="buy in entry.buys">
                     <vn-td expand>
-                        <span>
-                            {{::buy.itemName}}
-                        </span>
+                        <span
+                        vn-click-stop="itemDescriptor.show($event, buy.id)"
+                        class="link">
+                        {{::buy.itemName}}
+                    </span>
                     </vn-td>
                     <vn-td vn-fetched-tags>
                         <div>
@@ -89,3 +91,7 @@
     message="The consumption report will be sent"
     on-accept="$ctrl.sendEmail()">
 </vn-confirm>
+<vn-item-descriptor-popover
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
+</vn-item-descriptor-popover>