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

sin toClientId
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Javi Gallego 2022-10-06 15:19:55 +02:00
parent d73dab3454
commit d5592d6a0f
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/invoiceOut/back/methods/invoiceOut/globalInvoicing.js
View File

@ -21,7 +21,8 @@ module.exports = Self => {
{ {
arg: 'toClientId', arg: 'toClientId',
type: 'number', type: 'number',
description: 'The maximum client id' description: 'The maximum client id',
required: false
}, },
{ {
arg: 'companyFk', arg: 'companyFk',
@ -77,13 +78,10 @@ module.exports = Self => {
const minShipped = new Date(); const minShipped = new Date();
minShipped.setFullYear(minShipped.getFullYear() - 1); minShipped.setFullYear(minShipped.getFullYear() - 1);
if (args.fromClientId == args.toClientId) {
minShipped.setFullYear(2021);
minShipped.setMonth(1); minShipped.setMonth(1);
minShipped.setDate(1); minShipped.setDate(1);
minShipped.setHours(0, 0, 0, 0); minShipped.setHours(0, 0, 0, 0);
}
// Packaging liquidation // Packaging liquidation
const vIsAllInvoiceable = false; const vIsAllInvoiceable = false;
@ -200,11 +198,13 @@ module.exports = Self => {
JOIN ticketPackaging tp ON t.id = tp.ticketFk JOIN ticketPackaging tp ON t.id = tp.ticketFk
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
WHERE t.shipped BETWEEN '2017-11-21' AND ? WHERE t.shipped BETWEEN '2017-11-21' AND ?
AND t.clientFk BETWEEN ? AND ? AND t.clientFk >= ?
AND (t.clientFk <= ? OR ? IS NULL)
AND c.isActive`; AND c.isActive`;
return models.InvoiceOut.rawSql(query, [ return models.InvoiceOut.rawSql(query, [
args.maxShipped, args.maxShipped,
args.fromClientId, args.fromClientId,
args.toClientId,
args.toClientId args.toClientId
], options); ], options);
} }
@ -233,15 +233,17 @@ module.exports = Self => {
LEFT JOIN ticketService ts ON ts.ticketFk = t.id LEFT JOIN ticketService ts ON ts.ticketFk = t.id
JOIN address a ON a.id = t.addressFk JOIN address a ON a.id = t.addressFk
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
WHERE ISNULL(t.refFk) AND c.id BETWEEN ? AND ? WHERE ISNULL(t.refFk) AND c.id >= ?
AND (t.clientFk <= ? OR ? IS NULL)
AND t.shipped BETWEEN ? AND util.dayEnd(?) AND t.shipped BETWEEN ? AND util.dayEnd(?)
AND t.companyFk = ? AND c.hasToInvoice AND t.companyFk = ? AND c.hasToInvoice
AND c.isTaxDataChecked AND c.isTaxDataChecked AND c.isActive
GROUP BY c.id, IF(c.hasToInvoiceByAddress,a.id,TRUE) HAVING sumAmount > 0`; GROUP BY c.id, IF(c.hasToInvoiceByAddress,a.id,TRUE) HAVING sumAmount > 0`;
return models.InvoiceOut.rawSql(query, [ return models.InvoiceOut.rawSql(query, [
args.fromClientId, args.fromClientId,
args.toClientId, args.toClientId,
args.toClientId,
minShipped, minShipped,
args.maxShipped, args.maxShipped,
args.companyFk args.companyFk

2
modules/invoiceOut/front/index/global-invoicing/index.js
View File

@ -54,7 +54,7 @@ class Controller extends Dialog {
if (!this.invoice.invoiceDate || !this.invoice.maxShipped) if (!this.invoice.invoiceDate || !this.invoice.maxShipped)
throw new Error('Invoice date and the max date should be filled'); throw new Error('Invoice date and the max date should be filled');
if (!this.invoice.fromClientId || !this.invoice.toClientId) if (!this.invoice.fromClientId)
throw new Error('Choose a valid clients range'); throw new Error('Choose a valid clients range');
this.isInvoicing = true; this.isInvoicing = true;