mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-21 07:10:33 +00:00
fix: delete inventory adjustment gl entries
This commit is contained in:
@@ -39,6 +39,7 @@
|
|||||||
"@nestjs/passport": "^11.0.5",
|
"@nestjs/passport": "^11.0.5",
|
||||||
"@nestjs/platform-express": "^10.0.0",
|
"@nestjs/platform-express": "^10.0.0",
|
||||||
"@nestjs/schedule": "^4.1.2",
|
"@nestjs/schedule": "^4.1.2",
|
||||||
|
"@nestjs/serve-static": "^5.0.3",
|
||||||
"@nestjs/swagger": "^7.4.2",
|
"@nestjs/swagger": "^7.4.2",
|
||||||
"@nestjs/throttler": "^6.2.1",
|
"@nestjs/throttler": "^6.2.1",
|
||||||
"@supercharge/promise-pool": "^3.2.0",
|
"@supercharge/promise-pool": "^3.2.0",
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export class DeleteInventoryAdjustmentService {
|
|||||||
return this.uow.withTransaction(async (trx: Knex.Transaction) => {
|
return this.uow.withTransaction(async (trx: Knex.Transaction) => {
|
||||||
// Triggers `onInventoryAdjustmentDeleting` event.
|
// Triggers `onInventoryAdjustmentDeleting` event.
|
||||||
await this.eventEmitter.emitAsync(events.inventoryAdjustment.onDeleting, {
|
await this.eventEmitter.emitAsync(events.inventoryAdjustment.onDeleting, {
|
||||||
oldInventoryAdjustment,
|
inventoryAdjustment: oldInventoryAdjustment,
|
||||||
trx,
|
trx,
|
||||||
} as IInventoryAdjustmentDeletingPayload);
|
} as IInventoryAdjustmentDeletingPayload);
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export class InventoryAdjustmentsGLEntries {
|
|||||||
const adjustment = await this.inventoryAdjustment()
|
const adjustment = await this.inventoryAdjustment()
|
||||||
.query(trx)
|
.query(trx)
|
||||||
.findById(inventoryAdjustmentId)
|
.findById(inventoryAdjustmentId)
|
||||||
.withGraphFetched('entries.item');
|
.withGraphFetched('entries.item.inventoryAccount');
|
||||||
|
|
||||||
const tenantMeta = await this.tenancyContext.getTenantMetadata();
|
const tenantMeta = await this.tenancyContext.getTenantMetadata();
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { OnEvent } from '@nestjs/event-emitter';
|
import { OnEvent } from '@nestjs/event-emitter';
|
||||||
import { InventoryAdjustmentsGLEntries } from '../commands/ledger/InventoryAdjustmentsGLEntries';
|
import { InventoryAdjustmentsGLEntries } from '../commands/ledger/InventoryAdjustmentsGLEntries';
|
||||||
import { IInventoryAdjustmentEventDeletedPayload } from '../types/InventoryAdjustments.types';
|
import {
|
||||||
|
IInventoryAdjustmentDeletingPayload,
|
||||||
|
IInventoryAdjustmentEventPublishedPayload,
|
||||||
|
} from '../types/InventoryAdjustments.types';
|
||||||
import { IInventoryAdjustmentEventCreatedPayload } from '../types/InventoryAdjustments.types';
|
import { IInventoryAdjustmentEventCreatedPayload } from '../types/InventoryAdjustments.types';
|
||||||
import { events } from '@/common/events/events';
|
import { events } from '@/common/events/events';
|
||||||
|
|
||||||
@@ -13,10 +16,11 @@ export class InventoryAdjustmentsGLSubscriber {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles writing increment inventory adjustment GL entries.
|
* Handles writing increment inventory adjustment GL entries.
|
||||||
|
* @param {IInventoryAdjustmentEventCreatedPayload} payload -
|
||||||
*/
|
*/
|
||||||
@OnEvent(events.inventoryAdjustment.onQuickCreated)
|
@OnEvent(events.inventoryAdjustment.onQuickCreated)
|
||||||
@OnEvent(events.inventoryAdjustment.onPublished)
|
@OnEvent(events.inventoryAdjustment.onPublished)
|
||||||
public async handleGLEntriesOnceIncrementAdjustmentCreated({
|
async handleGLEntriesOnceIncrementAdjustmentCreated({
|
||||||
inventoryAdjustmentId,
|
inventoryAdjustmentId,
|
||||||
inventoryAdjustment,
|
inventoryAdjustment,
|
||||||
trx,
|
trx,
|
||||||
@@ -37,19 +41,20 @@ export class InventoryAdjustmentsGLSubscriber {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Reverts the inventory adjustment GL entries once the transaction deleted.
|
* Reverts the inventory adjustment GL entries once the transaction deleted.
|
||||||
* @param {IInventoryAdjustmentEventDeletedPayload} payload -
|
* @param {IInventoryAdjustmentDeletingPayload} payload -
|
||||||
*/
|
*/
|
||||||
@OnEvent(events.inventoryAdjustment.onDeleted)
|
@OnEvent(events.inventoryAdjustment.onDeleting)
|
||||||
public async revertAdjustmentGLEntriesOnceDeleted({
|
async revertAdjustmentGLEntriesOnceDeleted({
|
||||||
inventoryAdjustmentId,
|
inventoryAdjustment,
|
||||||
oldInventoryAdjustment,
|
trx,
|
||||||
}: IInventoryAdjustmentEventDeletedPayload) {
|
}: IInventoryAdjustmentDeletingPayload) {
|
||||||
// Can't continue if the inventory adjustment is not published.
|
// Can't continue if the inventory adjustment is not published.
|
||||||
if (!oldInventoryAdjustment.isPublished) {
|
if (!inventoryAdjustment.isPublished) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await this.inventoryAdjustmentGL.revertAdjustmentGLEntries(
|
await this.inventoryAdjustmentGL.revertAdjustmentGLEntries(
|
||||||
inventoryAdjustmentId,
|
inventoryAdjustment.id,
|
||||||
|
trx,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,39 +63,16 @@ export class InventoryAdjustmentsGLSubscriber {
|
|||||||
* @param {IInventoryAdjustmentEventPublishedPayload} payload
|
* @param {IInventoryAdjustmentEventPublishedPayload} payload
|
||||||
* @param {IInventoryAdjustmentEventCreatedPayload} payload -
|
* @param {IInventoryAdjustmentEventCreatedPayload} payload -
|
||||||
*/
|
*/
|
||||||
// private handleWriteInventoryTransactionsOncePublished = async ({
|
@OnEvent(events.inventoryAdjustment.onPublished)
|
||||||
// inventoryAdjustment,
|
async handleWriteInventoryTransactionsOncePublished({
|
||||||
// trx,
|
inventoryAdjustmentId,
|
||||||
// }:
|
trx,
|
||||||
// | IInventoryAdjustmentEventPublishedPayload
|
}:
|
||||||
// | IInventoryAdjustmentEventCreatedPayload) => {
|
| IInventoryAdjustmentEventPublishedPayload
|
||||||
// await this.inventoryAdjustment.writeInventoryTransactions(
|
| IInventoryAdjustmentEventCreatedPayload) {
|
||||||
// tenantId,
|
await this.inventoryAdjustmentGL.writeAdjustmentGLEntries(
|
||||||
// inventoryAdjustment,
|
inventoryAdjustmentId,
|
||||||
// false,
|
trx,
|
||||||
// trx
|
);
|
||||||
// );
|
}
|
||||||
// };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles reverting invetory transactions once the inventory adjustment deleted.
|
|
||||||
* @param {IInventoryAdjustmentEventDeletedPayload} payload -
|
|
||||||
*/
|
|
||||||
// private handleRevertInventoryTransactionsOnceDeleted = async ({
|
|
||||||
// tenantId,
|
|
||||||
// inventoryAdjustmentId,
|
|
||||||
// oldInventoryAdjustment,
|
|
||||||
// trx,
|
|
||||||
// }: IInventoryAdjustmentEventDeletedPayload) => {
|
|
||||||
// // Can't continue if the inventory adjustment is not published.
|
|
||||||
// if (!oldInventoryAdjustment.isPublished) {
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// // Reverts the inventory transactions of adjustment transaction.
|
|
||||||
// await this.inventoryAdjustment.revertInventoryTransactions(
|
|
||||||
// tenantId,
|
|
||||||
// inventoryAdjustmentId,
|
|
||||||
// trx
|
|
||||||
// );
|
|
||||||
// };
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ export interface IInventoryAdjustmentEventDeletedPayload {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface IInventoryAdjustmentDeletingPayload {
|
export interface IInventoryAdjustmentDeletingPayload {
|
||||||
oldInventoryAdjustment: InventoryAdjustment;
|
inventoryAdjustment: InventoryAdjustment;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
0
packages/server/static/views/financial-sheet.css
Normal file
0
packages/server/static/views/financial-sheet.css
Normal file
26
packages/server/static/views/financial-sheet.pug
Normal file
26
packages/server/static/views/financial-sheet.pug
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
block head
|
||||||
|
style
|
||||||
|
include ./financial-sheet.css
|
||||||
|
|
||||||
|
style.
|
||||||
|
!{customCSS}
|
||||||
|
|
||||||
|
block content
|
||||||
|
.sheet
|
||||||
|
.sheet__header
|
||||||
|
.sheet__company-name=organizationName
|
||||||
|
.sheet__sheet-type=sheetName
|
||||||
|
.sheet__sheet-date=sheetDate
|
||||||
|
|
||||||
|
table.sheet__table
|
||||||
|
thead
|
||||||
|
tr
|
||||||
|
each column in table.columns
|
||||||
|
th(style=column.style class='column--' + column.key)= column.label
|
||||||
|
|
||||||
|
tbody
|
||||||
|
each row in table.rows
|
||||||
|
tr(class=row.classNames)
|
||||||
|
each cell in row.cells
|
||||||
|
td(class='cell--' + cell.key)
|
||||||
|
span!= cell.value
|
||||||
29
pnpm-lock.yaml
generated
29
pnpm-lock.yaml
generated
@@ -96,6 +96,9 @@ importers:
|
|||||||
'@nestjs/schedule':
|
'@nestjs/schedule':
|
||||||
specifier: ^4.1.2
|
specifier: ^4.1.2
|
||||||
version: 4.1.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)
|
version: 4.1.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)
|
||||||
|
'@nestjs/serve-static':
|
||||||
|
specifier: ^5.0.3
|
||||||
|
version: 5.0.3(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)
|
||||||
'@nestjs/swagger':
|
'@nestjs/swagger':
|
||||||
specifier: ^7.4.2
|
specifier: ^7.4.2
|
||||||
version: 7.4.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)
|
version: 7.4.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)
|
||||||
@@ -7114,6 +7117,27 @@ packages:
|
|||||||
- chokidar
|
- chokidar
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/@nestjs/serve-static@5.0.3(@nestjs/common@10.4.7)(@nestjs/core@10.4.7):
|
||||||
|
resolution: {integrity: sha512-0jFjTlSVSLrI+mot8lfm+h2laXtKzCvgsVStv9T1ZBZTDwS26gM5czIhIESmWAod0PfrbCDFiu9C1MglObL8VA==}
|
||||||
|
peerDependencies:
|
||||||
|
'@fastify/static': ^8.0.4
|
||||||
|
'@nestjs/common': ^11.0.2
|
||||||
|
'@nestjs/core': ^11.0.2
|
||||||
|
express: ^5.0.1
|
||||||
|
fastify: ^5.2.1
|
||||||
|
peerDependenciesMeta:
|
||||||
|
'@fastify/static':
|
||||||
|
optional: true
|
||||||
|
express:
|
||||||
|
optional: true
|
||||||
|
fastify:
|
||||||
|
optional: true
|
||||||
|
dependencies:
|
||||||
|
'@nestjs/common': 10.4.7(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
|
||||||
|
'@nestjs/core': 10.4.7(@nestjs/common@10.4.7)(@nestjs/platform-express@10.4.7)(reflect-metadata@0.2.2)(rxjs@7.8.1)
|
||||||
|
path-to-regexp: 8.2.0
|
||||||
|
dev: false
|
||||||
|
|
||||||
/@nestjs/swagger@7.4.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2):
|
/@nestjs/swagger@7.4.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2):
|
||||||
resolution: {integrity: sha512-Mu6TEn1M/owIvAx2B4DUQObQXqo2028R2s9rSZ/hJEgBK95+doTwS0DjmVA2wTeZTyVtXOoN7CsoM5pONBzvKQ==}
|
resolution: {integrity: sha512-Mu6TEn1M/owIvAx2B4DUQObQXqo2028R2s9rSZ/hJEgBK95+doTwS0DjmVA2wTeZTyVtXOoN7CsoM5pONBzvKQ==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -23424,6 +23448,11 @@ packages:
|
|||||||
/path-to-regexp@3.3.0:
|
/path-to-regexp@3.3.0:
|
||||||
resolution: {integrity: sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==}
|
resolution: {integrity: sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==}
|
||||||
|
|
||||||
|
/path-to-regexp@8.2.0:
|
||||||
|
resolution: {integrity: sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==}
|
||||||
|
engines: {node: '>=16'}
|
||||||
|
dev: false
|
||||||
|
|
||||||
/path-type@3.0.0:
|
/path-type@3.0.0:
|
||||||
resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
|
resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
|
|||||||
Reference in New Issue
Block a user