refs #6757 return original triggers and fix test
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
56296ad10b
commit
3f9a6ca3fe
|
@ -4,7 +4,5 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeInsert
|
|||
FOR EACH ROW
|
||||
BEGIN
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
SET NEW.name = UPPER(NEW.name);
|
||||
SET NEW.nickname = UPPER(NEW.nickname);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
@ -10,9 +10,6 @@ BEGIN
|
|||
DECLARE vOldPayMethodName VARCHAR(20);
|
||||
DECLARE vNewPayMethodName VARCHAR(20);
|
||||
|
||||
SET NEW.name = UPPER(NEW.name);
|
||||
SET NEW.nickname = UPPER(NEW.nickname);
|
||||
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
|
||||
SELECT hasVerified INTO vPayMethodHasVerified
|
||||
|
|
|
@ -26,7 +26,7 @@ describe('travel getEntry()', () => {
|
|||
const entry = await models.Entry.getEntry(entryId, options);
|
||||
const supplierName = entry.supplier().nickname;
|
||||
|
||||
expect(supplierName).toEqual('PLANTS NICK');
|
||||
expect(supplierName).toEqual('Plants nick');
|
||||
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
|
|
|
@ -15,7 +15,7 @@ describe('InvoiceIn filter()', () => {
|
|||
const result = await models.InvoiceIn.filter(ctx, {}, options);
|
||||
|
||||
expect(result.length).toEqual(5);
|
||||
expect(result[0].supplierName).toEqual('PLANTS SL');
|
||||
expect(result[0].supplierName).toEqual('Plants SL');
|
||||
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
|
|
|
@ -5,7 +5,7 @@ describe('Supplier getSummary()', () => {
|
|||
const supplier = await app.models.Supplier.getSummary(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.account).toEqual('4100000001');
|
||||
expect(supplier.payDay).toEqual(15);
|
||||
|
|
|
@ -6,7 +6,7 @@ describe('Supplier updateFiscalData', () => {
|
|||
const administrativeId = 5;
|
||||
const employeeId = 1;
|
||||
const defaultData = {
|
||||
name: 'PLANTS SL',
|
||||
name: 'Plants SL',
|
||||
nif: '06089160W',
|
||||
account: '4100000001',
|
||||
sageTaxTypeFk: 4,
|
||||
|
|
Loading…
Reference in New Issue