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

refs #6952 subName #2636

Merged
carlossa merged 9 commits from 6952-productorItemPDF into dev 2024-07-03 12:43:47 +00:00
Conversation 0 Commits 9 Files Changed 6 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 420daeba9f - Show all commits

1
db/versions/11129-limeHydrangea/00-firstScript.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE vn.greuge CHANGE Id id int(10) unsigned auto_increment NOT NULL;

2
modules/entry/back/methods/entry/filter.js
View File

@ -146,7 +146,7 @@ module.exports = Self => {
});
filter = mergeFilters(ctx.args.filter, {where});
const userId = ctx.req.accessToken.userId;
const isSupplier = await Self.app.models.Supplier.findById(userId, options);
const isSupplier = await Self.app.models.Supplier.findById(userId, myOptions);
if (isSupplier) {
if (!filter.where) filter.where = {};
filter.where[`e.supplierFk`] = ctx.req.accessToken.userId;