verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

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

This commit is contained in:
Joan Sanchez 2023-04-18 08:34:20 +02:00
parent 06a845e7f0 d6fb05cc93
commit 6fd5c8ae2d
8 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/changes/231601/00-observationEmailACL.sql Normal file
View File

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

6
e2e/helpers/selectors.js
View File

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

2
e2e/paths/02-client/21_defaulter.spec.js
View File

@ -50,7 +50,7 @@ describe('Client defaulter path', () => {
expect(message.text).toContain(`The message can't be empty`); 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.loginAndModule('insurance', 'client');
await page.accessToSection('client.defaulter'); await page.accessToSection('client.defaulter');

2
e2e/paths/03-worker/08_add_notes.spec.js
View File

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

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

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

1
modules/client/front/locale/es.yml
View File

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

1
modules/client/front/postcode/locale/es.yml
View File

@ -9,3 +9,4 @@ 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 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 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

8
modules/supplier/front/consumption/index.html
View File

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