diff --git a/db/changes/231601/00-observationEmailACL.sql b/db/changes/231601/00-observationEmailACL.sql new file mode 100644 index 000000000..1a5d475e8 --- /dev/null +++ b/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'); diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index b504244ea..7689892f0 100644 --- a/e2e/helpers/selectors.js +++ b/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: { diff --git a/e2e/paths/02-client/21_defaulter.spec.js b/e2e/paths/02-client/21_defaulter.spec.js index 0eb16441f..97e62abef 100644 --- a/e2e/paths/02-client/21_defaulter.spec.js +++ b/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'); diff --git a/e2e/paths/03-worker/08_add_notes.spec.js b/e2e/paths/03-worker/08_add_notes.spec.js index eb2e4c041..bdc475c90 100644 --- a/e2e/paths/03-worker/08_add_notes.spec.js +++ b/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'); }); diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index f9b520981..323646d29 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/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'); }); diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml index adbca8dbf..45ae33914 100644 --- a/modules/client/front/locale/es.yml +++ b/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 \ No newline at end of file diff --git a/modules/client/front/postcode/locale/es.yml b/modules/client/front/postcode/locale/es.yml index 782690e88..29d0d7af9 100644 --- a/modules/client/front/postcode/locale/es.yml +++ b/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 \ No newline at end of file +The province has been created: Se ha creado la provincia +Autonomy: Autonomia \ No newline at end of file diff --git a/modules/supplier/front/consumption/index.html b/modules/supplier/front/consumption/index.html index 9e3bdac17..e6c86abe3 100644 --- a/modules/supplier/front/consumption/index.html +++ b/modules/supplier/front/consumption/index.html @@ -47,9 +47,11 @@ - - {{::buy.itemName}} - + + {{::buy.itemName}} +
@@ -89,3 +91,7 @@ message="The consumption report will be sent" on-accept="$ctrl.sendEmail()"> + +