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

cambio landed por created #620

Merged
joan merged 4 commits from 2902-error-getSuggestedTickets into dev 2021-05-11 09:57:43 +00:00
Conversation 0 Commits 4 Files Changed 3 +3 -10
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1c30ca6d1 - Show all commits

3
modules/client/back/methods/client/createReceipt.js
View File

@ -83,9 +83,8 @@ module.exports = function(Self) {
throw new UserError('Invalid account');
await Self.rawSql(
`CALL vn.ledger_doCompensation(?, ?, ?, ?, ?, ?, ?)`,
`CALL vn.ledger_doCompensation(CURDATE(), ?, ?, ?, ?, ?, ?)`,
[
Date(),
args.compensationAccount,
args.bankFk,
accountingType.receiptDescription + args.compensationAccount,

10
modules/route/back/methods/route/getSuggestedTickets.js
View File

@ -20,12 +20,6 @@ module.exports = Self => {
});
Self.getSuggestedTickets = async id => {
const ticketsInRoute = await Self.app.models.Ticket.find({
where: {routeFk: id},
fields: ['id']
});
const idsToExclude = ticketsInRoute.map(ticket => ticket.id);
const route = await Self.app.models.Route.findById(id);
const zoneAgencyModes = await Self.app.models.ZoneAgencyMode.find({
@ -48,8 +42,8 @@ module.exports = Self => {
where: {
agencyModeFk: route.agencyModeFk,
zoneFk: {inq: zoneIds},
id: {nin: idsToExclude},
created: {between: [minDate, maxDate]}
routeFk: null,
landed: {between: [minDate, maxDate]}
},
include: [
{