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

WIP: feat: refs #178899 buy_beforeDelete restriction #2392

Closed
robert wants to merge 4 commits from 178899-buy_beforeDelete into dev
pull from: 178899-buy_beforeDelete
merge into: verdnatura:dev
Conversation 0 Commits 4 Files Changed 5 +6 -1
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 826cc837e3 - Show all commits

5
db/dump/fixtures.before.sql
View File

@ -3789,4 +3789,7 @@ INSERT INTO vn.workerTeam(id, team, workerFk)
(8, 1, 19);
INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment)
VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
UPDATE vn.buy
SET printedStickers=NULL;

1
db/versions/11027-grayGalax/00-firstScript.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.buy MODIFY COLUMN printedStickers int(10) unsigned DEFAULT NULL NULL;

1
modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
View File

@ -30,6 +30,7 @@ describe('Travel cloneWithEntries()', () => {
await models.Entry.destroyAll({
travelFk: newTravelId
}, options);
await models.Travel.destroyById(newTravelId, options);
await tx.rollback();
const travelRemoved = await models.Travel.findById(newTravelId, options);