verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

refs #6757 return original triggers and fix test
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Ivan Mas 2024-01-31 12:42:03 +01:00
parent 56296ad10b
commit 3f9a6ca3fe
6 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/routines/vn/triggers/supplier_beforeInsert.sql
View File

@ -4,7 +4,5 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeInsert
FOR EACH ROW FOR EACH ROW
BEGIN BEGIN
SET NEW.editorFk = account.myUser_getId(); SET NEW.editorFk = account.myUser_getId();
SET NEW.name = UPPER(NEW.name);
SET NEW.nickname = UPPER(NEW.nickname);
END$$ END$$
DELIMITER ; DELIMITER ;

3
db/routines/vn/triggers/supplier_beforeUpdate.sql
View File

@ -10,9 +10,6 @@ BEGIN
DECLARE vOldPayMethodName VARCHAR(20); DECLARE vOldPayMethodName VARCHAR(20);
DECLARE vNewPayMethodName VARCHAR(20); DECLARE vNewPayMethodName VARCHAR(20);
SET NEW.name = UPPER(NEW.name);
SET NEW.nickname = UPPER(NEW.nickname);
SET NEW.editorFk = account.myUser_getId(); SET NEW.editorFk = account.myUser_getId();
SELECT hasVerified INTO vPayMethodHasVerified SELECT hasVerified INTO vPayMethodHasVerified

2
modules/entry/back/methods/entry/specs/getEntry.spec.js
View File

@ -26,7 +26,7 @@ describe('travel getEntry()', () => {
const entry = await models.Entry.getEntry(entryId, options); const entry = await models.Entry.getEntry(entryId, options);
const supplierName = entry.supplier().nickname; const supplierName = entry.supplier().nickname;
expect(supplierName).toEqual('PLANTS NICK'); expect(supplierName).toEqual('Plants nick');
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {

2
modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
View File

@ -15,7 +15,7 @@ describe('InvoiceIn filter()', () => {
const result = await models.InvoiceIn.filter(ctx, {}, options); const result = await models.InvoiceIn.filter(ctx, {}, options);
expect(result.length).toEqual(5); expect(result.length).toEqual(5);
expect(result[0].supplierName).toEqual('PLANTS SL'); expect(result[0].supplierName).toEqual('Plants SL');
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {

2
modules/supplier/back/methods/supplier/specs/getSummary.spec.js
View File

@ -5,7 +5,7 @@ describe('Supplier getSummary()', () => {
const supplier = await app.models.Supplier.getSummary(1); const supplier = await app.models.Supplier.getSummary(1);
expect(supplier.id).toEqual(1); expect(supplier.id).toEqual(1);
expect(supplier.name).toEqual('PLANTS SL'); expect(supplier.name).toEqual('Plants SL');
expect(supplier.nif).toEqual('06089160W'); expect(supplier.nif).toEqual('06089160W');
expect(supplier.account).toEqual('4100000001'); expect(supplier.account).toEqual('4100000001');
expect(supplier.payDay).toEqual(15); expect(supplier.payDay).toEqual(15);

2
modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
View File

@ -6,7 +6,7 @@ describe('Supplier updateFiscalData', () => {
const administrativeId = 5; const administrativeId = 5;
const employeeId = 1; const employeeId = 1;
const defaultData = { const defaultData = {
name: 'PLANTS SL', name: 'Plants SL',
nif: '06089160W', nif: '06089160W',
account: '4100000001', account: '4100000001',
sageTaxTypeFk: 4, sageTaxTypeFk: 4,