diff --git a/db/changes/240201/00-invoiceRectification.sql b/db/changes/240201/00-invoiceRectification.sql new file mode 100644 index 000000000..4648a7eb2 --- /dev/null +++ b/db/changes/240201/00-invoiceRectification.sql @@ -0,0 +1,21 @@ +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('InvoiceIn', 'rectification', 'WRITE', 'ALLOW', 'ROLE', 'employee'); + +CREATE TABLE `vn`.`invoiceInCorrection` ( + `correctingFk` mediumint(8) UNSIGNED NOT NULL COMMENT 'Factura rectificativa', + `correctedFk` mediumint(8) UNSIGNED NOT NULL COMMENT 'Factura rectificada', + `cplusRectificationTypeFk` int(10) UNSIGNED NOT NULL, + `siiTypeInvoiceOutFk` int(10) UNSIGNED NOT NULL, + `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3, + PRIMARY KEY (`correctingFk`), + KEY `invoiceInCorrection_correctedFk` (`correctedFk`), + KEY `invoiceInCorrection_cplusRectificationTypeFk` (`cplusRectificationTypeFk`), + KEY `invoiceInCorrection_siiTypeInvoiceOut` (`siiTypeInvoiceOutFk`), + KEY `invoiceInCorrection_invoiceCorrectionTypeFk` (`invoiceCorrectionTypeFk`), + CONSTRAINT `invoiceInCorrection_correctedFk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `invoiceInCorrection_correctingFk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `invoiceInCorrection_siiTypeInvoiceOut` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE, + CONSTRAINT `invoiceInCorrection_invoiceCorrectionTypeFk` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE, + CONSTRAINT `invoiceInCorrection_cplusRectificationTypeFk` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE +); diff --git a/modules/invoiceIn/back/methods/invoice-in/clone.js b/modules/invoiceIn/back/methods/invoice-in/clone.js index 18df53a95..662ef52be 100644 --- a/modules/invoiceIn/back/methods/invoice-in/clone.js +++ b/modules/invoiceIn/back/methods/invoice-in/clone.js @@ -2,13 +2,17 @@ module.exports = Self => { Self.remoteMethodCtx('clone', { description: 'Clone the invoiceIn and as many invoiceInTax and invoiceInDueDay referencing it', accessType: 'WRITE', - accepts: { + accepts: [{ arg: 'id', type: 'number', required: true, description: 'The invoiceIn id', http: {source: 'path'} - }, + }, { + arg: 'isRectification', + type: 'boolean', + description: 'Clone quantities in negative and clone Intrastat' + }], returns: { type: 'object', root: true @@ -19,7 +23,7 @@ module.exports = Self => { } }); - Self.clone = async(ctx, id, options) => { + Self.clone = async(ctx, id, isRectification, options) => { const models = Self.app.models; let tx; const myOptions = {}; @@ -45,10 +49,22 @@ module.exports = Self => { 'isVatDeductible', 'withholdingSageFk', 'deductibleExpenseFk', - ] + ], + include: [ + { + relation: 'invoiceInTax', + }, + { + relation: 'invoiceInDueDay', + }, + { + relation: 'invoiceInIntrastat' + } + ], }, myOptions); - const sourceInvoiceInTax = await models.InvoiceInTax.find({where: {invoiceInFk: id}}, myOptions); - const sourceInvoiceInDueDay = await models.InvoiceInDueDay.find({where: {invoiceInFk: id}}, myOptions); + const invoiceInTax = sourceInvoiceIn.invoiceInTax(); + const invoiceInDueDay = sourceInvoiceIn.invoiceInDueDay(); + const invoiceInIntrastat = sourceInvoiceIn.invoiceInIntrastat(); const issued = new Date(sourceInvoiceIn.issued); issued.setMonth(issued.getMonth() + 1); @@ -68,30 +84,47 @@ module.exports = Self => { const promises = []; - for (let tax of sourceInvoiceInTax) { + for (let tax of invoiceInTax) { promises.push(models.InvoiceInTax.create({ invoiceInFk: clone.id, - taxableBase: tax.taxableBase, + taxableBase: isRectification ? -tax.taxableBase : tax.taxableBase, expenseFk: tax.expenseFk, - foreignValue: tax.foreignValue, + foreignValue: isRectification ? -tax.foreignValue : tax.foreignValue, taxTypeSageFk: tax.taxTypeSageFk, transactionTypeSageFk: tax.transactionTypeSageFk }, myOptions)); } - for (let dueDay of sourceInvoiceInDueDay) { - const dueDated = dueDay.dueDated; - dueDated.setMonth(dueDated.getMonth() + 1); + if (!isRectification) { + for (let dueDay of invoiceInDueDay) { + const dueDated = dueDay.dueDated; + dueDated.setMonth(dueDated.getMonth() + 1); - promises.push(models.InvoiceInDueDay.create({ - invoiceInFk: clone.id, - dueDated: dueDated, - bankFk: dueDay.bankFk, - amount: dueDay.amount, - foreignValue: dueDated.foreignValue, - }, myOptions)); + promises.push(models.InvoiceInDueDay.create({ + invoiceInFk: clone.id, + dueDated: dueDated, + bankFk: dueDay.bankFk, + amount: dueDay.amount, + foreignValue: dueDated.foreignValue, + }, myOptions)); + } } + if (isRectification) { + console.log(invoiceInIntrastat); + for (let intrastat of invoiceInIntrastat) { + promises.push(models.InvoiceInIntrastat.create({ + invoiceInFk: clone.id, + net: -intrastat.net, + intrastatFk: intrastat.intrastatFk, + amount: -intrastat.amount, + stems: -intrastat.stems, + country: intrastat.countryFk, + dated: Date.vnNew(), + statisticalValue: intrastat.statisticalValue + }, myOptions)); + } + } await Promise.all(promises); if (tx) await tx.commit(); diff --git a/modules/invoiceIn/back/methods/invoice-in/rectification.js b/modules/invoiceIn/back/methods/invoice-in/rectification.js new file mode 100644 index 000000000..95cac6d16 --- /dev/null +++ b/modules/invoiceIn/back/methods/invoice-in/rectification.js @@ -0,0 +1,58 @@ +module.exports = Self => { + Self.remoteMethodCtx('rectification', { + description: 'Creates a rectificated invoice in', + accessType: 'WRITE', + accepts: [{ + arg: 'id', + type: 'number' + }, { + arg: 'invoiceReason', + type: 'string', + }, { + arg: 'invoiceType', + type: 'string', + }, { + arg: 'invoiceClass', + type: 'string' + }], + returns: { + type: 'number', + root: true + }, + http: { + path: '/rectification', + verb: 'POST' + } + }); + + Self.rectification = async(ctx, id, invoiceReason, invoiceType, invoiceClass, options) => { + const models = Self.app.models; + const myOptions = {}; + let tx; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + try { + const clone = await Self.clone(ctx, id, true, myOptions); + await models.InvoiceInCorrection.create({ + correctingFk: id, + correctedFk: clone.id, + cplusRectificationTypeFk: invoiceReason, + siiTypeInvoiceOutFk: invoiceClass, + invoiceCorrectionTypeFk: invoiceType + }, myOptions); + + if (tx) await tx.commit(); + return clone.id; + } catch (e) { + if (tx) await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/invoiceIn/back/model-config.json b/modules/invoiceIn/back/model-config.json index bd37b3bf1..4e0adf7a3 100644 --- a/modules/invoiceIn/back/model-config.json +++ b/modules/invoiceIn/back/model-config.json @@ -5,6 +5,9 @@ "InvoiceInConfig": { "dataSource": "vn" }, + "InvoiceInCorrection": { + "dataSource": "vn" + }, "InvoiceInDueDay": { "dataSource": "vn" }, diff --git a/modules/invoiceIn/back/models/invoice-in-correction.json b/modules/invoiceIn/back/models/invoice-in-correction.json new file mode 100644 index 000000000..742812f7d --- /dev/null +++ b/modules/invoiceIn/back/models/invoice-in-correction.json @@ -0,0 +1,41 @@ +{ + "name": "InvoiceInCorrection", + "base": "VnModel", + "options": { + "mysql": { + "table": "invoiceInCorrection" + } + }, + "properties": { + "correctingFk": { + "id": true, + "type": "number" + }, + "correctedFk": { + "type": "number" + } + }, + "relations": { + "invoiceIn": { + "type": "belongsTo", + "model": "InvoiceIn", + "foreignKey": "correctingFk" + }, + "cplusRectificationType": { + "type": "belongsTo", + "model": "CplusRectificationType", + "foreignKey": "cplusRectificationTypeFk" + }, + "invoiceCorrectionType": { + "type": "belongsTo", + "model": "InvoiceCorrectionType", + "foreignKey": "invoiceCorrectionTypeFk" + }, + "siiTypeInvoiceOutFk": { + "type": "belongsTo", + "model": "SiiTypeInvoiceOut", + "foreignKey": "siiTypeInvoiceOutFk" + } + + } +} \ No newline at end of file diff --git a/modules/invoiceIn/back/models/invoice-in.js b/modules/invoiceIn/back/models/invoice-in.js index 82e0bf078..776ee720b 100644 --- a/modules/invoiceIn/back/models/invoice-in.js +++ b/modules/invoiceIn/back/models/invoice-in.js @@ -9,6 +9,7 @@ module.exports = Self => { require('../methods/invoice-in/invoiceInPdf')(Self); require('../methods/invoice-in/invoiceInEmail')(Self); require('../methods/invoice-in/getSerial')(Self); + require('../methods/invoice-in/rectification')(Self); Self.rewriteDbError(function(err) { if (err.code === 'ER_ROW_IS_REFERENCED_2' && err.sqlMessage.includes('vehicleInvoiceIn')) return new UserError(`This invoice has a linked vehicle.`);