feat(webapp): add socket to vite server proxy

fix(server): refund credit note gl entries

packages/server/package.json

@@ -167,6 +167,9 @@
       "**/*.(t|j)s"
     ],
     "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "^@/(.*)$": "<rootDir>/$1"
+    }
   }
 }

packages/server/src/constants/metable-options.ts

@@ -1,4 +1,27 @@
-// import { getTransactionsLockingSettingsSchema } from '@/api/controllers/TransactionsLocking/utils';
+import { chain, mapKeys } from 'lodash';
+
+const getTransactionsLockingSettingsSchema = (modules: string[]) => {
+  const moduleSchema = {
+    active: { type: 'boolean' },
+    lock_to_date: { type: 'date' },
+    unlock_from_date: { type: 'date' },
+    unlock_to_date: { type: 'date' },
+    lock_reason: { type: 'string' },
+    unlock_reason: { type: 'string' },
+  };
+  return chain(modules)
+    .map((module: string) => {
+      return mapKeys(moduleSchema, (value, key: string) => `${module}.${key}`);
+    })
+    .flattenDeep()
+    .reduce((result, value) => {
+      return {
+        ...result,
+        ...value,
+      };
+    }, {})
+    .value();
+};
 
 export const SettingsOptions = {
   organization: {
@@ -223,12 +246,12 @@ export const SettingsOptions = {
     'locking-type': {
       type: 'string',
     },
-    // ...getTransactionsLockingSettingsSchema([
-    //   'all',
-    //   'sales',
-    //   'purchases',
-    //   'financial',
-    // ]),
+    ...getTransactionsLockingSettingsSchema([
+      'all',
+      'sales',
+      'purchases',
+      'financial',
+    ]),
   },
   features: {
     'multi-warehouses': {

packages/server/src/i18n/en/account.json

@@ -3,6 +3,7 @@
   "field.description": "Description",
   "field.slug": "Account slug",
   "field.code": "Account code",
+  "field.code_hint": "Unique number to identify the account.",
   "field.root_type": "Root type",
   "field.normal": "Account normal",
   "field.normal.credit": "Credit",
@@ -13,5 +14,6 @@
   "field.balance": "Balance",
   "field.bank_balance": "Bank Balance",
   "field.parent_account": "Parent Account",
-  "field.created_at": "Created at"
+  "field.created_at": "Created at",
+  "field.account_hint": "Matches the account name or code."
 }

packages/server/src/i18n/en/bill.json

@@ -0,0 +1,27 @@
+{
+  "field.vendor": "Vendor",
+  "field.bill_number": "Bill No.",
+  "field.bill_date": "Date",
+  "field.due_date": "Due Date",
+  "field.reference_no": "Reference No.",
+  "field.exchange_rate": "Exchange Rate",
+  "field.note": "Note",
+  "field.open": "Open",
+  "field.entries": "Entries",
+  "field.item": "Item",
+  "field.item_hint": "Matches the item name or code.",
+  "field.rate": "Rate",
+  "field.quantity": "Quantity",
+  "field.description": "Line Description",
+  "field.amount": "Amount",
+  "field.payment_amount": "Payment Amount",
+  "field.status": "Status",
+  "field.status.paid": "Paid",
+  "field.status.partially-paid": "Partially Paid",
+  "field.status.overdue": "Overdue",
+  "field.status.unpaid": "Unpaid",
+  "field.status.opened": "Opened",
+  "field.status.draft": "Draft",
+  "field.created_at": "Created At"
+}
+

packages/server/src/i18n/en/bill_payment.json

@@ -0,0 +1,15 @@
+{
+  "field.vendor": "Vendor",
+  "field.payment_date": "Payment Date",
+  "field.payment_number": "Payment No.",
+  "field.payment_account": "Payment Account",
+  "field.exchange_rate": "Exchange Rate",
+  "field.note": "Note",
+  "field.reference": "Reference",
+  "field.entries": "Entries",
+  "field.entries.bill": "Bill",
+  "field.entries.payment_amount": "Payment Amount",
+  "field.payment_number_hint": "The payment number should be unique.",
+  "field.bill_hint": "Matches the bill number."
+}
+

packages/server/src/i18n/en/credit_note.json

@@ -0,0 +1,16 @@
+{
+  "field.customer": "Customer",
+  "field.exchange_rate": "Exchange Rate",
+  "field.credit_note_date": "Credit Note Date",
+  "field.reference_no": "Reference No.",
+  "field.note": "Note",
+  "field.terms_conditions": "Terms & Conditions",
+  "field.credit_note_number": "Credit Note Number",
+  "field.open": "Open",
+  "field.entries": "Entries",
+  "field.item": "Item",
+  "field.rate": "Rate",
+  "field.quantity": "Quantity",
+  "field.description": "Description"
+}
+

packages/server/src/i18n/en/customer.json

@@ -0,0 +1,5 @@
+{
+  "type.business": "Business",
+  "type.individual": "Individual"
+}
+

packages/server/src/i18n/en/estimate.json

@@ -0,0 +1,21 @@
+{
+  "field.customer": "Customer",
+  "field.estimate_date": "Estimate Date",
+  "field.expiration_date": "Expiration Date",
+  "field.estimate_number": "Estimate No.",
+  "field.reference_no": "Reference No.",
+  "field.exchange_rate": "Exchange Rate",
+  "field.currency": "Currency",
+  "field.note": "Note",
+  "field.terms_conditions": "Terms & Conditions",
+  "field.delivered": "Delivered",
+  "field.entries": "Entries",
+  "field.amount": "Amount",
+  "field.status": "Status",
+  "field.status.draft": "Draft",
+  "field.status.delivered": "Delivered",
+  "field.status.rejected": "Rejected",
+  "field.status.approved": "Approved",
+  "field.created_at": "Created At"
+}
+

packages/server/src/i18n/en/invoice.json

@@ -26,6 +26,7 @@
   "field.due_amount": "Due amount",
   "field.delivered": "Delivered",
   "field.item_name": "Item Name",
+  "field.item_hint": "Matches the item name or code.",
   "field.rate": "Rate",
   "field.quantity": "Quantity",
   "field.description": "Description",
@@ -38,5 +39,7 @@
   "field.status.draft": "Draft",
   "field.created_at": "Created at",
   "field.currency": "Currency",
-  "field.entries": "Entries"
+  "field.entries": "Entries",
+  "field.branch": "Branch",
+  "field.warehouse": "Warehouse"
 }

packages/server/src/i18n/en/item.json

@@ -17,6 +17,7 @@
   "field.quantity_on_hand": "Quantity on Hand",
   "field.note": "Note",
   "field.category": "Category",
+  "field.category_hint": "Matches the category name.",
   "field.active": "Active",
   "field.created_at": "Created At"
 }

packages/server/src/i18n/en/payment_receive.json

@@ -0,0 +1,17 @@
+{
+  "field.customer": "Customer",
+  "field.payment_date": "Payment Date",
+  "field.amount": "Amount",
+  "field.reference_no": "Reference No.",
+  "field.deposit_account": "Deposit Account",
+  "field.payment_receive_no": "Payment No.",
+  "field.statement": "Statement",
+  "field.entries": "Entries",
+  "field.exchange_rate": "Exchange Rate",
+  "field.invoice": "Invoice",
+  "field.entries.payment_amount": "Payment Amount",
+  "field.created_at": "Created At",
+  "field.payment_no_hint": "The payment number should be unique.",
+  "field.invoice_hint": "Matches the invoice number."
+}
+

packages/server/src/i18n/en/receipt.json

@@ -10,5 +10,21 @@
   "paper.receipt_amount": "Receipt amount",
   "paper.total": "Total",
   "paper.balance_due": "Balance Due",
-  "paper.payment_amount": "Payment Amount"
+  "paper.payment_amount": "Payment Amount",
+
+  "field.receipt_date": "Receipt Date",
+  "field.customer": "Customer",
+  "field.deposit_account": "Deposit Account",
+  "field.exchange_rate": "Exchange Rate",
+  "field.receipt_number": "Receipt Number",
+  "field.reference_no": "Reference No.",
+  "field.closed": "Closed",
+  "field.entries": "Entries",
+  "field.statement": "Statement",
+  "field.receipt_message": "Receipt Message",
+  "field.amount": "Amount",
+  "field.status": "Status",
+  "field.status.draft": "Draft",
+  "field.status.closed": "Closed",
+  "field.created_at": "Created At"
 }

packages/server/src/i18n/en/vendor_credit.json

@@ -2,5 +2,18 @@
   "view.draft": "Draft",
   "view.published": "Published",
   "view.open": "Open",
-  "view.closed": "Closed"
+  "view.closed": "Closed",
+
+  "field.vendor": "Vendor",
+  "field.vendor_credit_number": "Vendor Credit No.",
+  "field.vendor_credit_date": "Vendor Credit Date",
+  "field.reference_no": "Reference No.",
+  "field.exchange_rate": "Exchange Rate",
+  "field.note": "Note",
+  "field.open": "Open",
+  "field.entries": "Entries",
+  "field.item": "Item",
+  "field.rate": "Rate",
+  "field.quantity": "Quantity",
+  "field.description": "Description"
 }

packages/server/src/models/Model.ts

@@ -48,14 +48,30 @@ export class PaginationQueryBuilder<
       // No relations defined
       return this.delete();
     }
+
+    // Only check HasManyRelation and ManyToManyRelation relations, as BelongsToOneRelation are just 
+    // foreign key references and shouldn't prevent deletion. Only dependent records should block deletion.
+    const dependentRelationNames = relationNames.filter((name) => {
+      const relation = relationMappings[name];
+      return relation && (
+        relation.relation === Model.HasManyRelation ||
+        relation.relation === Model.ManyToManyRelation
+      );
+    });
+
+    if (dependentRelationNames.length === 0) {
+      // No dependent relations defined, safe to delete
+      return this.delete();
+    }
+
     const recordQuery = this.clone();
 
-    relationNames.forEach((relationName: string) => {
+    dependentRelationNames.forEach((relationName: string) => {
       recordQuery.withGraphFetched(relationName);
     });
     const record = await recordQuery;
 
-    const hasRelations = relationNames.some((name) => {
+    const hasRelations = dependentRelationNames.some((name) => {
       const val = record[name];
       return Array.isArray(val) ? val.length > 0 : val != null;
     });

packages/server/src/modules/Accounts/models/Account.meta.ts

@@ -156,7 +156,7 @@ export const AccountMeta = {
       minLength: 3,
       maxLength: 6,
       unique: true,
-      importHint: 'Unique number to identify the account.',
+      importHint: 'account.field.code_hint',
     },
     accountType: {
       name: 'account.field.type',

packages/server/src/modules/BankingCategorize/commands/UncategorizedTransactionsImportable.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Knex } from 'knex';
 import * as yup from 'yup';
-import uniqid from 'uniqid';
+import * as uniqid from 'uniqid';
 import { Importable } from '../../Import/Importable';
 import { CreateUncategorizedTransactionService } from './CreateUncategorizedTransaction.service';
 import { ImportableContext } from '../../Import/interfaces';
@@ -9,8 +9,10 @@ import { BankTransactionsSampleData } from '../../BankingTransactions/constants'
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { CreateUncategorizedTransactionDTO } from '../types/BankingCategorize.types';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-
+import { ImportableService } from '../../Import/decorators/Import.decorator';
+import { UncategorizedBankTransaction } from '../../BankingTransactions/models/UncategorizedBankTransaction';
 @Injectable()
+@ImportableService({ name: UncategorizedBankTransaction.name })
 export class UncategorizedTransactionsImportable extends Importable {
   constructor(
     private readonly createUncategorizedTransaction: CreateUncategorizedTransactionService,

packages/server/src/modules/BankingMatching/_utils.ts

@@ -1,6 +1,6 @@
 import * as moment from 'moment';
 import * as R from 'ramda';
-import { isEmpty, sumBy } from 'lodash';
+import { isEmpty, round, sumBy } from 'lodash';
 import { ERRORS, MatchedTransactionPOJO } from './types';
 import { ServiceError } from '../Items/ServiceError';
 
@@ -22,18 +22,24 @@ export const sortClosestMatchTransactions = (
 };
 
 export const sumMatchTranasctions = (transactions: Array<any>) => {
-  return transactions.reduce(
-    (total, item) =>
-      total +
-      (item.transactionNormal === 'debit' ? 1 : -1) * parseFloat(item.amount),
+  const total = transactions.reduce(
+    (sum, item) => {
+      const amount = parseFloat(item.amount) || 0;
+      const multiplier = item.transactionNormal === 'debit' ? 1 : -1;
+      return sum + multiplier * amount;
+    },
     0
   );
+  // Round to 2 decimal places to avoid floating-point precision issues
+  return round(total, 2);
 };
 
 export const sumUncategorizedTransactions = (
   uncategorizedTransactions: Array<any>
 ) => {
-  return sumBy(uncategorizedTransactions, 'amount');
+  const total = sumBy(uncategorizedTransactions, 'amount');
+  // Round to 2 decimal places to avoid floating-point precision issues
+  return round(total, 2);
 };
 
 export const validateUncategorizedTransactionsNotMatched = (

packages/server/src/modules/BankingMatching/commands/MatchTransactions.ts

@@ -34,7 +34,7 @@ export class MatchBankTransactions {
     private readonly uncategorizedBankTransactionModel: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-  ) {}
+  ) { }
 
   /**
    * Validates the match bank transactions DTO.
@@ -100,7 +100,10 @@ export class MatchBankTransactions {
     );
     // Validates the total given matching transcations whether is not equal
     // uncategorized transaction amount.
-    if (totalUncategorizedTransactions !== totalMatchedTranasctions) {
+    // Use tolerance-based comparison to handle floating-point precision issues
+    const tolerance = 0.01; // Allow 0.01 difference for floating-point precision
+    const difference = Math.abs(totalUncategorizedTransactions - totalMatchedTranasctions);
+    if (difference > tolerance) {
       throw new ServiceError(ERRORS.TOTAL_MATCHING_TRANSACTIONS_INVALID);
     }
   }

packages/server/src/modules/BankingMatching/commands/MatchTransactionsTypes.ts

@@ -12,24 +12,30 @@ export class MatchTransactionsTypes {
   private static registry: MatchTransactionsTypesRegistry;
 
   /**
-   * Consttuctor method.
+   * Constructor method.
    */
-  constructor() {
+  constructor(
+    private readonly getMatchedInvoicesService: GetMatchedTransactionsByInvoices,
+    private readonly getMatchedBillsService: GetMatchedTransactionsByBills,
+    private readonly getMatchedExpensesService: GetMatchedTransactionsByExpenses,
+    private readonly getMatchedManualJournalsService: GetMatchedTransactionsByManualJournals,
+    private readonly getMatchedCashflowService: GetMatchedTransactionsByCashflow,
+  ) {
     this.boot();
   }
 
   get registered() {
     return [
-      { type: 'SaleInvoice', service: GetMatchedTransactionsByInvoices },
-      { type: 'Bill', service: GetMatchedTransactionsByBills },
-      { type: 'Expense', service: GetMatchedTransactionsByExpenses },
+      { type: 'SaleInvoice', service: this.getMatchedInvoicesService },
+      { type: 'Bill', service: this.getMatchedBillsService },
+      { type: 'Expense', service: this.getMatchedExpensesService },
       {
         type: 'ManualJournal',
-        service: GetMatchedTransactionsByManualJournals,
+        service: this.getMatchedManualJournalsService,
       },
       {
         type: 'CashflowTransaction',
-        service: GetMatchedTransactionsByCashflow,
+        service: this.getMatchedCashflowService,
       },
     ];
   }
@@ -50,14 +56,13 @@ export class MatchTransactionsTypes {
    * Boots all the registered importables.
    */
   public boot() {
-    if (!MatchTransactionsTypes.registry) {
-      const instance = MatchTransactionsTypesRegistry.getInstance();
+    const instance = MatchTransactionsTypesRegistry.getInstance();
 
-      this.registered.forEach((registered) => {
-        // const serviceInstanace = Container.get(registered.service);
-        // instance.register(registered.type, serviceInstanace);
-      });
-      MatchTransactionsTypes.registry = instance;
-    }
+    // Always register services to ensure they're available
+    this.registered.forEach((registered) => {
+      instance.register(registered.type, registered.service);
+    });
+
+    MatchTransactionsTypes.registry = instance;
   }
 }

packages/server/src/modules/BankingTransactions/BankingTransactions.module.ts

@@ -83,4 +83,4 @@ const models = [
     CreateBankTransactionService
   ],
 })
-export class BankingTransactionsModule {}
+export class BankingTransactionsModule { }

packages/server/src/modules/BankingTransactions/models/UncategorizedBankTransaction.meta.ts

@@ -0,0 +1,72 @@
+export const UncategorizedBankTransactionMeta = {
+  defaultFilterField: 'createdAt',
+  defaultSort: {
+    sortOrder: 'DESC',
+    sortField: 'created_at',
+  },
+  importable: true,
+  fields: {
+    date: {
+      name: 'Date',
+      column: 'date',
+      fieldType: 'date',
+    },
+    payee: {
+      name: 'Payee',
+      column: 'payee',
+      fieldType: 'text',
+    },
+    description: {
+      name: 'Description',
+      column: 'description',
+      fieldType: 'text',
+    },
+    referenceNo: {
+      name: 'Reference No.',
+      column: 'reference_no',
+      fieldType: 'text',
+    },
+    amount: {
+      name: 'Amount',
+      column: 'Amount',
+      fieldType: 'numeric',
+      required: true,
+    },
+    account: {
+      name: 'Account',
+      column: 'account_id',
+      fieldType: 'relation',
+      to: { model: 'Account', to: 'id' },
+    },
+    createdAt: {
+      name: 'Created At',
+      column: 'createdAt',
+      fieldType: 'date',
+      importable: false,
+    },
+  },
+  fields2: {
+    date: {
+      name: 'Date',
+      fieldType: 'date',
+      required: true,
+    },
+    payee: {
+      name: 'Payee',
+      fieldType: 'text',
+    },
+    description: {
+      name: 'Description',
+      fieldType: 'text',
+    },
+    referenceNo: {
+      name: 'Reference No.',
+      fieldType: 'text',
+    },
+    amount: {
+      name: 'Amount',
+      fieldType: 'number',
+      required: true,
+    },
+  },
+};

packages/server/src/modules/BankingTransactions/models/UncategorizedBankTransaction.ts

@@ -2,7 +2,10 @@
 import * as moment from 'moment';
 import { Model } from 'objection';
 import { TenantBaseModel } from '@/modules/System/models/TenantBaseModel';
+import { UncategorizedBankTransactionMeta } from './UncategorizedBankTransaction.meta';
+import { InjectModelMeta } from '@/modules/Tenancy/TenancyModels/decorators/InjectModelMeta.decorator';
 
+@InjectModelMeta(UncategorizedBankTransactionMeta)
 export class UncategorizedBankTransaction extends TenantBaseModel {
   readonly amount!: number;
   readonly date!: Date | string;

packages/server/src/modules/BillPayments/BillPayments.module.ts

@@ -14,6 +14,7 @@ import { BranchesSettingsService } from '../Branches/BranchesSettings';
 import { BillPaymentsController } from './BillPayments.controller';
 import { BillPaymentGLEntries } from './commands/BillPaymentGLEntries';
 import { BillPaymentGLEntriesSubscriber } from './subscribers/BillPaymentGLEntriesSubscriber';
+import { BillPaymentBillSyncSubscriber } from './subscribers/BillPaymentBillSyncSubscriber';
 import { LedgerModule } from '../Ledger/Ledger.module';
 import { AccountsModule } from '../Accounts/Accounts.module';
 import { BillPaymentsExportable } from './queries/BillPaymentsExportable';
@@ -39,6 +40,7 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
     TenancyContext,
     BillPaymentGLEntries,
     BillPaymentGLEntriesSubscriber,
+    BillPaymentBillSyncSubscriber,
     BillPaymentsExportable,
     BillPaymentsImportable,
     GetBillPaymentsService,
@@ -52,4 +54,4 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
   ],
   controllers: [BillPaymentsController],
 })
-export class BillPaymentsModule {}
+export class BillPaymentsModule { }

packages/server/src/modules/BillPayments/commands/CreateBillPayment.service.ts

@@ -38,7 +38,7 @@ export class CreateBillPaymentService {
 
     @Inject(BillPayment.name)
     private readonly billPaymentModel: TenantModelProxy<typeof BillPayment>,
-  ) {}
+  ) { }
 
   /**
    * Creates a new bill payment transcations and store it to the storage
@@ -103,11 +103,19 @@ export class CreateBillPaymentService {
       } as IBillPaymentCreatingPayload);
 
       // Writes the bill payment graph to the storage.
-      const billPayment = await this.billPaymentModel()
+      const insertedBillPayment = await this.billPaymentModel()
         .query(trx)
         .insertGraphAndFetch({
           ...billPaymentObj,
         });
+
+      // Fetch the bill payment with entries to ensure they're loaded for the subscriber.
+      const billPayment = await this.billPaymentModel()
+        .query(trx)
+        .withGraphFetched('entries')
+        .findById(insertedBillPayment.id)
+        .throwIfNotFound();
+
       // Triggers `onBillPaymentCreated` event.
       await this.eventPublisher.emitAsync(events.billPayment.onCreated, {
         billPayment,

packages/server/src/modules/BillPayments/commands/EditBillPayment.service.ts

@@ -29,7 +29,7 @@ export class EditBillPayment {
 
     @Inject(Vendor.name)
     private readonly vendorModel: TenantModelProxy<typeof Vendor>,
-  ) {}
+  ) { }
 
   /**
    * Edits the details of the given bill payment.
@@ -116,12 +116,20 @@ export class EditBillPayment {
       } as IBillPaymentEditingPayload);
 
       // Edits the bill payment transaction graph on the storage.
-      const billPayment = await this.billPaymentModel()
+      await this.billPaymentModel()
         .query(trx)
-        .upsertGraphAndFetch({
+        .upsertGraph({
           id: billPaymentId,
           ...billPaymentObj,
         });
+
+      // Fetch the bill payment with entries to ensure they're loaded for the subscriber.
+      const billPayment = await this.billPaymentModel()
+        .query(trx)
+        .withGraphFetched('entries')
+        .findById(billPaymentId)
+        .throwIfNotFound();
+
       // Triggers `onBillPaymentEdited` event.
       await this.eventPublisher.emitAsync(events.billPayment.onEdited, {
         billPaymentId,

packages/server/src/modules/BillPayments/dtos/BillPaymentResponse.dto.ts

@@ -104,6 +104,12 @@ export class BillPaymentResponseDto {
   @ApiProperty({ description: 'The formatted amount', example: '100.00 USD' })
   formattedAmount: string;
 
+  @ApiProperty({ description: 'The formatted total', example: '100.00 USD' })
+  formattedTotal: string;
+
+  @ApiProperty({ description: 'The formatted subtotal', example: '100.00 USD' })
+  formattedSubtotal: string;
+
   @ApiProperty({
     description: 'The date when the payment was created',
     example: '2024-01-01T12:00:00Z',

packages/server/src/modules/BillPayments/models/BillPayment.meta.ts

@@ -167,7 +167,7 @@ export const BillPaymentMeta = {
       name: 'bill_payment.field.payment_number',
       fieldType: 'text',
       unique: true,
-      importHint: 'The payment number should be unique.',
+      importHint: 'bill_payment.field.payment_number_hint',
     },
     paymentAccountId: {
       name: 'bill_payment.field.payment_account',
@@ -175,7 +175,7 @@ export const BillPaymentMeta = {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'Matches the account name or code.',
+      importHint: 'account.field.account_hint',
     },
     exchangeRate: {
       name: 'bill_payment.field.exchange_rate',
@@ -203,7 +203,7 @@ export const BillPaymentMeta = {
           relationModel: 'Bill',
           relationImportMatch: 'billNumber',
           required: true,
-          importHint: 'Matches the bill number.',
+          importHint: 'bill_payment.field.bill_hint',
         },
         paymentAmount: {
           name: 'bill_payment.field.entries.payment_amount',
@@ -213,7 +213,7 @@ export const BillPaymentMeta = {
       },
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/BillPayments/queries/BillPaymentTransformer.ts

@@ -13,6 +13,8 @@ export class BillPaymentTransformer extends Transformer {
       'formattedPaymentDate',
       'formattedCreatedAt',
       'formattedAmount',
+      'formattedTotal',
+      'formattedSubtotal',
       'entries',
       'attachments',
     ];
@@ -47,6 +49,29 @@ export class BillPaymentTransformer extends Transformer {
     });
   };
 
+  /**
+   * Retrieves the formatted total.
+   * @param {IBillPayment} billPayment
+   * @returns {string}
+   */
+  protected formattedTotal = (billPayment: BillPayment): string => {
+    return this.formatNumber(billPayment.amount, {
+      currencyCode: billPayment.currencyCode,
+      money: true,
+    });
+  };
+
+  /**
+   * Retrieves the formatted subtotal.
+   * @param {IBillPayment} billPayment
+   * @returns {string}
+   */
+  protected formattedSubtotal = (billPayment: BillPayment): string => {
+    return this.formatNumber(billPayment.amount, {
+      currencyCode: billPayment.currencyCode,
+    });
+  };
+
   /**
    * Retreives the bill payment entries.
    */

packages/server/src/modules/BillPayments/queries/BillPaymentsExportable.ts

@@ -16,8 +16,6 @@ export class BillPaymentsExportable extends Exportable {
 
   /**
    * Retrieves the accounts data to exportable sheet.
-   * @param {number} tenantId
-   * @returns
    */
   public async exportable(query: any) {
     const filterQuery = (builder) => {

packages/server/src/modules/BillPayments/subscribers/BillPaymentBillSyncSubscriber.ts

@@ -0,0 +1,80 @@
+import {
+  IBillPaymentEventCreatedPayload,
+  IBillPaymentEventDeletedPayload,
+  IBillPaymentEventEditedPayload,
+} from '../types/BillPayments.types';
+import { BillPaymentBillSync } from '../commands/BillPaymentBillSync.service';
+import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+import { events } from '@/common/events/events';
+
+@Injectable()
+export class BillPaymentBillSyncSubscriber {
+  /**
+   * @param {BillPaymentBillSync} billPaymentBillSync - Bill payment bill sync service.
+   */
+  constructor(private readonly billPaymentBillSync: BillPaymentBillSync) { }
+
+  /**
+   * Handle bill increment/decrement payment amount
+   * once created, edited or deleted.
+   */
+  @OnEvent(events.billPayment.onCreated)
+  async handleBillIncrementPaymentOnceCreated({
+    billPayment,
+    trx,
+  }: IBillPaymentEventCreatedPayload) {
+    // Ensure entries are available - they should be included in insertGraphAndFetch
+    const entries = billPayment.entries || [];
+    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
+      entries.map((entry) => ({
+        billId: entry.billId,
+        paymentAmount: entry.paymentAmount,
+      })),
+      null,
+      trx,
+    );
+  }
+
+  /**
+   * Handle bill increment/decrement payment amount once edited.
+   */
+  @OnEvent(events.billPayment.onEdited)
+  async handleBillIncrementPaymentOnceEdited({
+    billPayment,
+    oldBillPayment,
+    trx,
+  }: IBillPaymentEventEditedPayload) {
+    const entries = billPayment.entries || [];
+    const oldEntries = oldBillPayment?.entries || null;
+
+    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
+      entries.map((entry) => ({
+        billId: entry.billId,
+        paymentAmount: entry.paymentAmount,
+      })),
+      oldEntries,
+      trx,
+    );
+  }
+
+  /**
+   * Handle revert bills payment amount once bill payment deleted.
+   */
+  @OnEvent(events.billPayment.onDeleted)
+  async handleBillDecrementPaymentAmount({
+    oldBillPayment,
+    trx,
+  }: IBillPaymentEventDeletedPayload) {
+    const oldEntries = oldBillPayment.entries || [];
+
+    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
+      oldEntries.map((entry) => ({
+        billId: entry.billId,
+        paymentAmount: 0,
+      })),
+      oldEntries,
+      trx,
+    );
+  }
+}

packages/server/src/modules/Bills/models/Bill.meta.ts

@@ -184,76 +184,76 @@ export const BillMeta = {
   },
   fields2: {
     billNumber: {
-      name: 'Bill No.',
+      name: 'bill.field.bill_number',
       fieldType: 'text',
       required: true,
     },
     referenceNo: {
-      name: 'Reference No.',
+      name: 'bill.field.reference_no',
       fieldType: 'text',
     },
     billDate: {
-      name: 'Date',
+      name: 'bill.field.bill_date',
       fieldType: 'date',
       required: true,
     },
     dueDate: {
-      name: 'Due Date',
+      name: 'bill.field.due_date',
       fieldType: 'date',
       required: true,
     },
     vendorId: {
-      name: 'Vendor',
+      name: 'bill.field.vendor',
       fieldType: 'relation',
       relationModel: 'Contact',
       relationImportMatch: 'displayName',
       required: true,
     },
     exchangeRate: {
-      name: 'Exchange Rate',
+      name: 'bill.field.exchange_rate',
       fieldType: 'number',
     },
     note: {
-      name: 'Note',
+      name: 'bill.field.note',
       fieldType: 'text',
     },
     open: {
-      name: 'Open',
+      name: 'bill.field.open',
       fieldType: 'boolean',
     },
     entries: {
-      name: 'Entries',
+      name: 'bill.field.entries',
       fieldType: 'collection',
       collectionOf: 'object',
       collectionMinLength: 1,
       required: true,
       fields: {
         itemId: {
-          name: 'Item',
+          name: 'bill.field.item',
           fieldType: 'relation',
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: 'bill.field.item_hint',
         },
         rate: {
-          name: 'Rate',
+          name: 'bill.field.rate',
           fieldType: 'number',
           required: true,
         },
         quantity: {
-          name: 'Quantity',
+          name: 'bill.field.quantity',
           fieldType: 'number',
           required: true,
         },
         description: {
-          name: 'Line Description',
+          name: 'bill.field.description',
           fieldType: 'text',
         },
       },
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -261,7 +261,7 @@ export const BillMeta = {
       required: true,
     },
     warehouseId: {
-      name: 'Warehouse',
+      name: 'invoice.field.warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/Bills/queries/Bill.transformer.ts

@@ -94,6 +94,7 @@ export class BillTransformer extends Transformer {
   protected formattedDueAmount = (bill: Bill): string => {
     return this.formatNumber(bill.dueAmount, {
       currencyCode: bill.currencyCode,
+      money: true,
     });
   };
 
@@ -169,6 +170,7 @@ export class BillTransformer extends Transformer {
   protected totalFormatted = (bill: Bill): string => {
     return this.formatNumber(bill.total, {
       currencyCode: bill.currencyCode,
+      money: true,
     });
   };
 

packages/server/src/modules/CreditNoteRefunds/CreditNoteRefunds.module.ts

@@ -7,9 +7,13 @@ import { CreditNotesRefundsApplication } from './CreditNotesRefundsApplication.s
 import { CreditNoteRefundsController } from './CreditNoteRefunds.controller';
 import { CreditNotesModule } from '../CreditNotes/CreditNotes.module';
 import { GetCreditNoteRefundsService } from './queries/GetCreditNoteRefunds.service';
+import { RefundCreditNoteGLEntries } from './commands/RefundCreditNoteGLEntries';
+import { RefundCreditNoteGLEntriesSubscriber } from '../CreditNotes/subscribers/RefundCreditNoteGLEntriesSubscriber';
+import { LedgerModule } from '../Ledger/Ledger.module';
+import { AccountsModule } from '../Accounts/Accounts.module';
 
 @Module({
-  imports: [forwardRef(() => CreditNotesModule)],
+  imports: [forwardRef(() => CreditNotesModule), LedgerModule, AccountsModule],
   providers: [
     CreateRefundCreditNoteService,
     DeleteRefundCreditNoteService,
@@ -17,8 +21,10 @@ import { GetCreditNoteRefundsService } from './queries/GetCreditNoteRefunds.serv
     RefundSyncCreditNoteBalanceService,
     CreditNotesRefundsApplication,
     GetCreditNoteRefundsService,
+    RefundCreditNoteGLEntries,
+    RefundCreditNoteGLEntriesSubscriber,
   ],
   exports: [RefundSyncCreditNoteBalanceService],
   controllers: [CreditNoteRefundsController],
 })
-export class CreditNoteRefundsModule {}
+export class CreditNoteRefundsModule { }

packages/server/src/modules/CreditNoteRefunds/dto/CreditNoteRefund.dto.ts

@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsOptional, IsPositive, IsString } from 'class-validator';
+import { ToNumber, IsOptional } from '@/common/decorators/Validators';
+import { IsDateString, IsNotEmpty, IsPositive, IsString } from 'class-validator';
 import { IsDate } from 'class-validator';
 import { IsNumber } from 'class-validator';
 
@@ -10,8 +11,13 @@ export class CreditNoteRefundDto {
     description: 'The id of the from account',
     example: 1,
   })
+  @ApiProperty({
+    description: 'The id of the from account',
+    example: 1,
+  })
   fromAccountId: number;
 
+  @ToNumber()
   @IsNumber()
   @IsPositive()
   @IsNotEmpty()
@@ -21,6 +27,7 @@ export class CreditNoteRefundDto {
   })
   amount: number;
 
+  @ToNumber()
   @IsNumber()
   @IsOptional()
   @IsPositive()
@@ -30,23 +37,23 @@ export class CreditNoteRefundDto {
   })
   exchangeRate?: number;
 
+  @IsOptional()
   @IsString()
-  @IsNotEmpty()
   @ApiProperty({
     description: 'The reference number of the credit note refund',
     example: '123456',
   })
   referenceNo: string;
 
+  @IsOptional()
   @IsString()
-  @IsNotEmpty()
   @ApiProperty({
     description: 'The description of the credit note refund',
     example: 'Credit note refund',
   })
   description: string;
 
-  @IsDate()
+  @IsDateString()
   @IsNotEmpty()
   @ApiProperty({
     description: 'The date of the credit note refund',
@@ -54,6 +61,7 @@ export class CreditNoteRefundDto {
   })
   date: Date;
 
+  @ToNumber()
   @IsNumber()
   @IsOptional()
   @ApiProperty({

packages/server/src/modules/CreditNotes/models/CreditNote.meta.ts

@@ -164,73 +164,73 @@ export const CreditNoteMeta = {
   },
   fields2: {
     customerId: {
-      name: 'Customer',
+      name: 'credit_note.field.customer',
       fieldType: 'relation',
       relationModel: 'Contact',
       relationImportMatch: 'displayName',
       required: true,
     },
     exchangeRate: {
-      name: 'Exchange Rate',
+      name: 'credit_note.field.exchange_rate',
       fieldType: 'number',
     },
     creditNoteDate: {
-      name: 'Credit Note Date',
+      name: 'credit_note.field.credit_note_date',
       fieldType: 'date',
       required: true,
     },
     referenceNo: {
-      name: 'Reference No.',
+      name: 'credit_note.field.reference_no',
       fieldType: 'text',
     },
     note: {
-      name: 'Note',
+      name: 'credit_note.field.note',
       fieldType: 'text',
     },
     termsConditions: {
-      name: 'Terms & Conditions',
+      name: 'credit_note.field.terms_conditions',
       fieldType: 'text',
     },
     creditNoteNumber: {
-      name: 'Credit Note Number',
+      name: 'credit_note.field.credit_note_number',
       fieldType: 'text',
     },
     open: {
-      name: 'Open',
+      name: 'credit_note.field.open',
       fieldType: 'boolean',
     },
     entries: {
-      name: 'Entries',
+      name: 'credit_note.field.entries',
       fieldType: 'collection',
       collectionOf: 'object',
       collectionMinLength: 1,
       fields: {
         itemId: {
-          name: 'Item',
+          name: 'credit_note.field.item',
           fieldType: 'relation',
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: 'invoice.field.item_hint',
         },
         rate: {
-          name: 'Rate',
+          name: 'credit_note.field.rate',
           fieldType: 'number',
           required: true,
         },
         quantity: {
-          name: 'Quantity',
+          name: 'credit_note.field.quantity',
           fieldType: 'number',
           required: true,
         },
         description: {
-          name: 'Description',
+          name: 'credit_note.field.description',
           fieldType: 'text',
         },
       },
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -238,7 +238,7 @@ export const CreditNoteMeta = {
       required: true,
     },
     warehouseId: {
-      name: 'Warehouse',
+      name: 'invoice.field.warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/CreditNotes/queries/CreditNoteTransformer.ts

@@ -90,7 +90,7 @@ export class CreditNoteTransformer extends Transformer {
    * @returns {string}
    */
   protected formattedSubtotal = (credit): string => {
-    return this.formatNumber(credit.amount, { money: false });
+    return this.formatNumber(credit.amount);
   };
 
   /**
@@ -130,7 +130,7 @@ export class CreditNoteTransformer extends Transformer {
    * @returns {string}
    */
   protected adjustmentFormatted = (credit): string => {
-    return this.formatMoney(credit.adjustment, {
+    return this.formatNumber(credit.adjustment, {
       currencyCode: credit.currencyCode,
       excerptZero: true,
     });
@@ -156,6 +156,7 @@ export class CreditNoteTransformer extends Transformer {
   protected totalFormatted = (credit): string => {
     return this.formatNumber(credit.total, {
       currencyCode: credit.currencyCode,
+      money: true,
     });
   };
 
@@ -167,6 +168,7 @@ export class CreditNoteTransformer extends Transformer {
   protected totalLocalFormatted = (credit): string => {
     return this.formatNumber(credit.totalLocal, {
       currencyCode: credit.currencyCode,
+      money: true,
     });
   };
 

packages/server/src/modules/CreditNotes/queries/GetCreditNotePdf.serivce.ts

@@ -1,10 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { renderCreditNotePaperTemplateHtml } from '@bigcapital/pdf-templates';
 import { GetCreditNoteService } from './GetCreditNote.service';
 import { CreditNoteBrandingTemplate } from './CreditNoteBrandingTemplate.service';
 import { transformCreditNoteToPdfTemplate } from '../utils';
 import { CreditNote } from '../models/CreditNote';
 import { ChromiumlyTenancy } from '@/modules/ChromiumlyTenancy/ChromiumlyTenancy.service';
-import { TemplateInjectable } from '@/modules/TemplateInjectable/TemplateInjectable.service';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { PdfTemplateModel } from '@/modules/PdfTemplate/models/PdfTemplate';
 import { CreditNotePdfTemplateAttributes } from '../types/CreditNotes.types';
@@ -15,7 +15,6 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 export class GetCreditNotePdf {
   /**
    * @param {ChromiumlyTenancy} chromiumlyTenancy - Chromiumly tenancy service.
-   * @param {TemplateInjectable} templateInjectable - Template injectable service.
    * @param {GetCreditNote} getCreditNoteService - Get credit note service.
    * @param {CreditNoteBrandingTemplate} creditNoteBrandingTemplate - Credit note branding template service.
    * @param {EventEmitter2} eventPublisher - Event publisher service.
@@ -24,7 +23,6 @@ export class GetCreditNotePdf {
    */
   constructor(
     private readonly chromiumlyTenancy: ChromiumlyTenancy,
-    private readonly templateInjectable: TemplateInjectable,
     private readonly getCreditNoteService: GetCreditNoteService,
     private readonly creditNoteBrandingTemplate: CreditNoteBrandingTemplate,
     private readonly eventPublisher: EventEmitter2,
@@ -36,23 +34,40 @@ export class GetCreditNotePdf {
     private readonly pdfTemplateModel: TenantModelProxy<
       typeof PdfTemplateModel
     >,
-  ) {}
+  ) { }
 
   /**
-   * Retrieves sale invoice pdf content.
+   * Retrieves credit note html content.
+   * @param {number} creditNoteId - Credit note id.
+   * @returns {Promise<string>}
+   */
+  public async getCreditNoteHtml(creditNoteId: number): Promise<string> {
+    const brandingAttributes =
+      await this.getCreditNoteBrandingAttributes(creditNoteId);
+
+    // Map attributes to match the React component props
+    // The branding template returns companyLogoUri, but type may have companyLogo
+    const props = {
+      ...brandingAttributes,
+      companyLogoUri:
+        (brandingAttributes as any).companyLogoUri ||
+        (brandingAttributes as any).companyLogo ||
+        '',
+    };
+
+    return renderCreditNotePaperTemplateHtml(props);
+  }
+
+  /**
+   * Retrieves credit note pdf content.
    * @param {number} creditNoteId - Credit note id.
    * @returns {Promise<[Buffer, string]>}
    */
   public async getCreditNotePdf(
     creditNoteId: number,
   ): Promise<[Buffer, string]> {
-    const brandingAttributes =
-      await this.getCreditNoteBrandingAttributes(creditNoteId);
-    const htmlContent = await this.templateInjectable.render(
-      'modules/credit-note-standard',
-      brandingAttributes,
-    );
     const filename = await this.getCreditNoteFilename(creditNoteId);
+    const htmlContent = await this.getCreditNoteHtml(creditNoteId);
 
     const document =
       await this.chromiumlyTenancy.convertHtmlContent(htmlContent);

packages/server/src/modules/Expenses/ExpensesImportable.ts

@@ -5,10 +5,10 @@ import { ExpensesSampleData } from './constants';
 import { CreateExpense } from './commands/CreateExpense.service';
 import { CreateExpenseDto } from './dtos/Expense.dto';
 import { ImportableService } from '../Import/decorators/Import.decorator';
-import { ManualJournal } from '../ManualJournals/models/ManualJournal';
+import { Expense } from './models/Expense.model';
 
 @Injectable()
-@ImportableService({ name: ManualJournal.name })
+@ImportableService({ name: Expense.name })
 export class ExpensesImportable extends Importable {
   constructor(private readonly createExpenseService: CreateExpense) {
     super();

packages/server/src/modules/Expenses/models/Expense.meta.ts

@@ -135,7 +135,7 @@ export const ExpenseMeta = {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'Matches the account name or code.',
+      importHint: 'account.field.account_hint',
     },
     referenceNo: {
       name: 'expense.field.reference_no',
@@ -169,7 +169,7 @@ export const ExpenseMeta = {
           relationModel: 'Account',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the account name or code.',
+          importHint: 'account.field.account_hint',
         },
         amount: {
           name: 'expense.field.amount',
@@ -187,7 +187,7 @@ export const ExpenseMeta = {
       fieldType: 'boolean',
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/Export/ExportPdf.ts

@@ -1,14 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { ChromiumlyTenancy } from '../ChromiumlyTenancy/ChromiumlyTenancy.service';
-import { TemplateInjectable } from '../TemplateInjectable/TemplateInjectable.service';
+import { renderExportResourceTableTemplateHtml } from '@bigcapital/pdf-templates';
 import { mapPdfRows } from './utils';
 
 @Injectable()
 export class ExportPdf {
   constructor(
-    private readonly templateInjectable: TemplateInjectable,
     private readonly chromiumlyTenancy: ChromiumlyTenancy,
-  ) {}
+  ) { }
 
   /**
    * Generates the pdf table sheet for the given data and columns.
@@ -19,21 +18,18 @@ export class ExportPdf {
    * @returns
    */
   public async pdf(
-    columns: { accessor: string },
+    columns: { accessor: string; name?: string; style?: string; group?: string }[],
     data: Record<string, any>,
     sheetTitle: string = '',
     sheetDescription: string = ''
   ) {
     const rows = mapPdfRows(columns, data);
 
-    const htmlContent = await this.templateInjectable.render(
-      'modules/export-resource-table',
-      {
-        table: { rows, columns },
-        sheetTitle,
-        sheetDescription,
-      }
-    );
+    const htmlContent = renderExportResourceTableTemplateHtml({
+      table: { rows, columns },
+      sheetTitle,
+      sheetDescription,
+    });
     // Convert the HTML content to PDF
     return this.chromiumlyTenancy.convertHtmlContent(htmlContent, {
       margins: { top: 0.2, bottom: 0.2, left: 0.2, right: 0.2 },

packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuationSheet.ts

@@ -211,7 +211,7 @@ export class InventoryValuationSheet extends FinancialSheet {
    * Detarmines whether the items post filter is active.
    */
   private isItemsPostFilter = (): boolean => {
-    return isEmpty(this.query.itemsIds);
+    return !isEmpty(this.query.itemsIds);
   };
 
   /**

packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuationSheetService.ts

@@ -18,7 +18,7 @@ export class InventoryValuationSheetService {
     private readonly inventoryValuationMeta: InventoryValuationMetaInjectable,
     private readonly eventPublisher: EventEmitter2,
     private readonly inventoryValuationSheetRepository: InventoryValuationSheetRepository,
-  ) {}
+  ) { }
 
   /**
    * Inventory valuation sheet.

packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.ts

@@ -10,6 +10,7 @@ import {
 import { FinancialSheet } from '../../common/FinancialSheet';
 import { JournalSheetRepository } from './JournalSheetRepository';
 import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
+import { getTransactionTypeLabel } from '@/modules/BankingTransactions/utils';
 
 export class JournalSheet extends FinancialSheet {
   readonly query: IJournalReportQuery;
@@ -97,10 +98,13 @@ export class JournalSheet extends FinancialSheet {
 
       transactionType: groupEntry.transactionType,
       referenceId: groupEntry.transactionId,
-      referenceTypeFormatted: this.i18n.t(groupEntry.transactionType),
-
+      referenceTypeFormatted: this.i18n.t(
+        getTransactionTypeLabel(
+          groupEntry.transactionType,
+          groupEntry.transactionSubType,
+        ),
+      ),
       entries: this.entriesMapper(entriesGroup),
-
       currencyCode: this.baseCurrency,
 
       credit: totalCredit,

packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.ts

@@ -172,7 +172,10 @@ export class TrialBalanceSheet extends FinancialSheet {
   private filterNoneTransactions = (
     accountNode: ITrialBalanceAccount
   ): boolean => {
-    return false === this.repository.totalAccountsLedger.isEmpty();
+    const accountLedger = this.repository.totalAccountsLedger.whereAccountId(
+      accountNode.id,
+    );
+    return !accountLedger.isEmpty();
   };
 
   /**

packages/server/src/modules/Import/ImportFileCommon.ts

@@ -22,7 +22,7 @@ export class ImportFileCommon {
     private readonly importFileValidator: ImportFileDataValidator,
     private readonly resource: ResourceService,
     private readonly importableRegistry: ImportableRegistry,
-  ) {}
+  ) { }
 
   /**
    * Imports the given parsed data to the resource storage through registered importable service.

packages/server/src/modules/Import/ImportFileDataTransformer.ts

@@ -18,7 +18,7 @@ import { CurrencyParsingDTOs } from './_constants';
 export class ImportFileDataTransformer {
   constructor(
     private readonly resource: ResourceService,
-  ) {}
+  ) { }
 
   /**
    * Parses the given sheet data before passing to the service layer.
@@ -55,9 +55,8 @@ export class ImportFileDataTransformer {
 
   /**
    * Aggregates parsed data based on resource metadata configuration.
-   * @param {number} tenantId
-   * @param {string} resourceName
-   * @param {Record<string, any>} parsedData
+   * @param {string} resourceName - The resource name.
+   * @param {Record<string, any>} parsedData - The parsed data to aggregate.
    * @returns {Record<string, any>[]}
    */
   public aggregateParsedValues(
@@ -110,8 +109,11 @@ export class ImportFileDataTransformer {
     valueDTOs: Record<string, any>[],
     trx?: Knex.Transaction
   ): Promise<Record<string, any>[]> {
-    // const tenantModels = this.tenancy.models(tenantId);
-    const _valueParser = valueParser(fields, {}, trx);
+    // Create a model resolver function that uses ResourceService
+    const modelResolver = (modelName: string) => {
+      return this.resource.getResourceModel(modelName)();
+    };
+    const _valueParser = valueParser(fields, modelResolver, trx);
     const _keyParser = parseKey(fields);
 
     const parseAsync = async (valueDTO) => {

packages/server/src/modules/Import/ImportFileDataValidator.ts

@@ -19,7 +19,8 @@ export class ImportFileDataValidator {
 
   /**
    * Validates the given mapped DTOs and returns errors with their index.
-   * @param {Record<string, any>} mappedDTOs
+   * @param {ResourceMetaFieldsMap} importableFields - Already localized fields from ResourceService
+   * @param {Record<string, any>} data
    * @returns {Promise<void | ImportInsertError[]>}
    */
   public async validateData(

packages/server/src/modules/Import/ImportFileUpload.ts

@@ -24,7 +24,7 @@ export class ImportFileUploadService {
 
     @Inject(ImportModel.name)
     private readonly importModel: typeof ImportModel,
-  ) {}
+  ) { }
 
   /**
    * Imports the specified file for the given resource.
@@ -84,7 +84,7 @@ export class ImportFileUploadService {
     } catch (error) {
       throw error;
     }
-    const _params = this.importFileCommon.transformParams(resource, params);
+    const _params = await this.importFileCommon.transformParams(resource, params);
     const paramsStringified = JSON.stringify(_params);
 
     const tenant = await this.tenancyContext.getTenant();

packages/server/src/modules/Import/ImportableRegistry.ts

@@ -6,7 +6,7 @@ import { ContextIdFactory, ModuleRef } from '@nestjs/core';
 
 @Injectable()
 export class ImportableRegistry {
-  constructor(private readonly moduleRef: ModuleRef) {}
+  constructor(private readonly moduleRef: ModuleRef) { }
   /**
    * Retrieves the importable service instance of the given resource name.
    * @param {string} name
@@ -15,6 +15,12 @@ export class ImportableRegistry {
   public async getImportable(name: string) {
     const _name = this.sanitizeResourceName(name);
     const importable = getImportableService(_name);
+
+    if (!importable) {
+      throw new Error(
+        `No importable service found for resource "${_name}". Make sure the resource has an @ImportableService decorator registered.`,
+      );
+    }
     const contextId = ContextIdFactory.create();
 
     const importableInstance = await this.moduleRef.resolve(importable, contextId, {

packages/server/src/modules/Import/_utils.spec.ts

@@ -0,0 +1,287 @@
+import { aggregate } from './_utils';
+
+describe('aggregate', () => {
+  describe('basic aggregation', () => {
+    it('should aggregate entries with matching comparator attribute', () => {
+      const input = [
+        { id: 1, name: 'John', entries: ['entry1'] },
+        { id: 2, name: 'Jane', entries: ['entry2'] },
+        { id: 1, name: 'John', entries: ['entry3'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(2);
+      expect(result[0]).toEqual({
+        id: 1,
+        name: 'John',
+        entries: ['entry1', 'entry3'],
+      });
+      expect(result[1]).toEqual({
+        id: 2,
+        name: 'Jane',
+        entries: ['entry2'],
+      });
+    });
+
+    it('should preserve order of first occurrence', () => {
+      const input = [
+        { id: 2, entries: ['a'] },
+        { id: 1, entries: ['b'] },
+        { id: 2, entries: ['c'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result[0].id).toBe(2);
+      expect(result[1].id).toBe(1);
+    });
+  });
+
+  describe('no matching entries', () => {
+    it('should return all entries unchanged when no comparator matches', () => {
+      const input = [
+        { id: 1, name: 'John', entries: ['entry1'] },
+        { id: 2, name: 'Jane', entries: ['entry2'] },
+        { id: 3, name: 'Bob', entries: ['entry3'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(3);
+      expect(result).toEqual(input);
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should return empty array when input is empty', () => {
+      const result = aggregate([], 'id', 'entries');
+
+      expect(result).toEqual([]);
+      expect(result).toHaveLength(0);
+    });
+
+    it('should return single entry unchanged when input has one item', () => {
+      const input = [{ id: 1, name: 'John', entries: ['entry1'] }];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toEqual({
+        id: 1,
+        name: 'John',
+        entries: ['entry1'],
+      });
+    });
+
+    it('should handle multiple entries with same comparator value', () => {
+      const input = [
+        { id: 1, entries: ['a'] },
+        { id: 1, entries: ['b'] },
+        { id: 1, entries: ['c'] },
+        { id: 1, entries: ['d'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(1);
+      expect(result[0].entries).toEqual(['a', 'b', 'c', 'd']);
+    });
+  });
+
+  describe('different comparator attributes', () => {
+    it('should work with string comparator attribute', () => {
+      const input = [
+        { name: 'Product A', category: 'Electronics', entries: ['item1'] },
+        { name: 'Product B', category: 'Books', entries: ['item2'] },
+        { name: 'Product C', category: 'Electronics', entries: ['item3'] },
+      ];
+
+      const result = aggregate(input, 'category', 'entries');
+
+      expect(result).toHaveLength(2);
+      expect(result[0]).toEqual({
+        name: 'Product A',
+        category: 'Electronics',
+        entries: ['item1', 'item3'],
+      });
+      expect(result[1]).toEqual({
+        name: 'Product B',
+        category: 'Books',
+        entries: ['item2'],
+      });
+    });
+
+    it('should not aggregate items with undefined comparator values', () => {
+      const input = [
+        { id: undefined, entries: ['a'] },
+        { id: 1, entries: ['b'] },
+        { id: undefined, entries: ['c'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(3);
+      // Items with undefined id are NOT aggregated - each remains separate
+      expect(result[0].entries).toEqual(['a']);
+      expect(result[1].entries).toEqual(['b']);
+      expect(result[2].entries).toEqual(['c']);
+    });
+
+    it('should handle null comparator values separately', () => {
+      const input = [
+        { id: null, entries: ['a'] },
+        { id: 1, entries: ['b'] },
+        { id: null, entries: ['c'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(3);
+      expect(result[0].entries).toEqual(['a']);
+      expect(result[1].entries).toEqual(['b']);
+      expect(result[2].entries).toEqual(['c']);
+    });
+
+    it('should not aggregate items missing the comparatorAttr property', () => {
+      const input = [
+        { id: 1, entries: ['a'] },
+        { name: 'No ID', entries: ['b'] }, // missing 'id' property
+        { id: 1, entries: ['c'] },
+        { entries: ['d'] }, // also missing 'id' property
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      // 3 entries: aggregated id:1, and two separate items without 'id' property
+      expect(result).toHaveLength(3);
+      // Items with id: 1 are aggregated
+      expect(result[0]).toEqual({ id: 1, entries: ['a', 'c'] });
+      // Items missing 'id' are NOT aggregated - each remains separate
+      expect(result[1]).toEqual({ name: 'No ID', entries: ['b'] });
+      expect(result[2]).toEqual({ entries: ['d'] });
+    });
+  });
+
+  describe('different group attributes', () => {
+    it('should work with different groupOn attribute name', () => {
+      const input = [
+        { id: 1, items: ['item1'] },
+        { id: 1, items: ['item2'] },
+        { id: 2, items: ['item3'] },
+      ];
+
+      const result = aggregate(input, 'id', 'items');
+
+      expect(result).toHaveLength(2);
+      expect(result[0].items).toEqual(['item1', 'item2']);
+      expect(result[1].items).toEqual(['item3']);
+    });
+  });
+
+  describe('complex entries', () => {
+    it('should aggregate entries containing objects', () => {
+      const input = [
+        { invoiceId: 'INV-001', entries: [{ itemId: 1, quantity: 2 }] },
+        { invoiceId: 'INV-002', entries: [{ itemId: 2, quantity: 1 }] },
+        { invoiceId: 'INV-001', entries: [{ itemId: 3, quantity: 5 }] },
+      ];
+
+      const result = aggregate(input, 'invoiceId', 'entries');
+
+      expect(result).toHaveLength(2);
+      expect(result[0].entries).toEqual([
+        { itemId: 1, quantity: 2 },
+        { itemId: 3, quantity: 5 },
+      ]);
+      expect(result[1].entries).toEqual([{ itemId: 2, quantity: 1 }]);
+    });
+
+    it('should aggregate entries with multiple items in each entry', () => {
+      const input = [
+        { id: 1, entries: ['a', 'b'] },
+        { id: 1, entries: ['c', 'd'] },
+        { id: 2, entries: ['e'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(2);
+      expect(result[0].entries).toEqual(['a', 'b', 'c', 'd']);
+      expect(result[1].entries).toEqual(['e']);
+    });
+  });
+
+  describe('numeric comparator values', () => {
+    it('should correctly compare numeric values', () => {
+      const input = [
+        { id: 1, entries: ['a'] },
+        { id: 2, entries: ['b'] },
+        { id: 1, entries: ['c'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(2);
+      expect(result.find((r) => r.id === 1).entries).toEqual(['a', 'c']);
+      expect(result.find((r) => r.id === 2).entries).toEqual(['b']);
+    });
+
+    it('should treat 0 as a valid comparator value', () => {
+      const input = [
+        { id: 0, entries: ['a'] },
+        { id: 1, entries: ['b'] },
+        { id: 0, entries: ['c'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(2);
+      expect(result[0].entries).toEqual(['a', 'c']);
+      expect(result[1].entries).toEqual(['b']);
+    });
+  });
+
+  describe('preserving other properties', () => {
+    it('should preserve all properties from the first matching entry', () => {
+      const input = [
+        { id: 1, name: 'First', extra: 'data1', entries: ['a'] },
+        { id: 1, name: 'Second', extra: 'data2', entries: ['b'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(1);
+      expect(result[0].name).toBe('First');
+      expect(result[0].extra).toBe('data1');
+      expect(result[0].entries).toEqual(['a', 'b']);
+    });
+  });
+
+  describe('empty entries arrays', () => {
+    it('should handle empty entries arrays', () => {
+      const input = [
+        { id: 1, entries: [] },
+        { id: 1, entries: ['a'] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(1);
+      expect(result[0].entries).toEqual(['a']);
+    });
+
+    it('should handle all empty entries arrays', () => {
+      const input = [
+        { id: 1, entries: [] },
+        { id: 1, entries: [] },
+      ];
+
+      const result = aggregate(input, 'id', 'entries');
+
+      expect(result).toHaveLength(1);
+      expect(result[0].entries).toEqual([]);
+    });
+  });
+});
+

packages/server/src/modules/Import/_utils.ts

@@ -253,28 +253,28 @@ export const getResourceColumns = (resourceColumns: {
 }) => {
   const mapColumn =
     (group: string) =>
-    ([fieldKey, { name, importHint, required, order, ...field }]: [
-      string,
-      IModelMetaField2,
-    ]) => {
-      const extra: Record<string, any> = {};
-      const key = fieldKey;
+      ([fieldKey, { name, importHint, required, order, ...field }]: [
+        string,
+        IModelMetaField2,
+      ]) => {
+        const extra: Record<string, any> = {};
+        const key = fieldKey;
 
-      if (group) {
-        extra.group = group;
-      }
-      if (field.fieldType === 'collection') {
-        extra.fields = mapColumns(field.fields, key);
-      }
-      return {
-        key,
-        name,
-        required,
-        hint: importHint,
-        order,
-        ...extra,
+        if (group) {
+          extra.group = group;
+        }
+        if (field.fieldType === 'collection') {
+          extra.fields = mapColumns(field.fields, key);
+        }
+        return {
+          key,
+          name,
+          required,
+          hint: importHint,
+          order,
+          ...extra,
+        };
       };
-    };
   const sortColumn = (a, b) =>
     a.order && b.order ? a.order - b.order : a.order ? -1 : b.order ? 1 : 0;
 
@@ -284,52 +284,54 @@ export const getResourceColumns = (resourceColumns: {
   return R.compose(transformInputToGroupedFields, mapColumns)(resourceColumns);
 };
 
+export type ModelResolver = (modelName: string) => any;
+
 // Prases the given object value based on the field key type.
 export const valueParser =
-  (fields: ResourceMetaFieldsMap, tenantModels: any, trx?: Knex.Transaction) =>
-  async (value: any, key: string, group = '') => {
-    let _value = value;
+  (fields: ResourceMetaFieldsMap, modelResolver: ModelResolver, trx?: Knex.Transaction) =>
+    async (value: any, key: string, group = '') => {
+      let _value = value;
 
-    const fieldKey = key.includes('.') ? key.split('.')[0] : key;
-    const field = group ? fields[group]?.fields[fieldKey] : fields[fieldKey];
+      const fieldKey = key.includes('.') ? key.split('.')[0] : key;
+      const field = group ? fields[group]?.fields[fieldKey] : fields[fieldKey];
 
-    // Parses the boolean value.
-    if (field.fieldType === 'boolean') {
-      _value = parseBoolean(value);
+      // Parses the boolean value.
+      if (field.fieldType === 'boolean') {
+        _value = parseBoolean(value);
 
-      // Parses the enumeration value.
-    } else if (field.fieldType === 'enumeration') {
-      const option = get(field, 'options', []).find(
-        (option) => option.label?.toLowerCase() === value?.toLowerCase(),
-      );
-      _value = get(option, 'key');
-      // Parses the numeric value.
-    } else if (field.fieldType === 'number') {
-      _value = multiNumberParse(value);
-      // Parses the relation value.
-    } else if (field.fieldType === 'relation') {
-      const RelationModel = tenantModels[field.relationModel];
+        // Parses the enumeration value.
+      } else if (field.fieldType === 'enumeration') {
+        const option = get(field, 'options', []).find(
+          (option) => option.label?.toLowerCase() === value?.toLowerCase(),
+        );
+        _value = get(option, 'key');
+        // Parses the numeric value.
+      } else if (field.fieldType === 'number') {
+        _value = multiNumberParse(value);
+        // Parses the relation value.
+      } else if (field.fieldType === 'relation') {
+        const RelationModel = modelResolver(field.relationModel);
 
-      if (!RelationModel) {
-        throw new Error(`The relation model of ${key} field is not exist.`);
-      }
-      const relationQuery = RelationModel.query(trx);
-      const relationKeys = castArray(field?.relationImportMatch);
+        if (!RelationModel) {
+          throw new Error(`The relation model of ${key} field is not exist.`);
+        }
+        const relationQuery = RelationModel.query(trx);
+        const relationKeys = castArray(field?.relationImportMatch);
 
-      relationQuery.where(function () {
-        relationKeys.forEach((relationKey: string) => {
-          this.orWhereRaw('LOWER(??) = LOWER(?)', [relationKey, value]);
+        relationQuery.where(function () {
+          relationKeys.forEach((relationKey: string) => {
+            this.orWhereRaw('LOWER(??) = LOWER(?)', [relationKey, value]);
+          });
         });
-      });
-      const result = await relationQuery.first();
-      _value = get(result, 'id');
-    } else if (field.fieldType === 'collection') {
-      const ObjectFieldKey = key.includes('.') ? key.split('.')[1] : key;
-      const _valueParser = valueParser(fields, tenantModels);
-      _value = await _valueParser(value, ObjectFieldKey, fieldKey);
-    }
-    return _value;
-  };
+        const result = await relationQuery.first();
+        _value = get(result, 'id');
+      } else if (field.fieldType === 'collection') {
+        const ObjectFieldKey = key.includes('.') ? key.split('.')[1] : key;
+        const _valueParser = valueParser(fields, modelResolver);
+        _value = await _valueParser(value, ObjectFieldKey, fieldKey);
+      }
+      return _value;
+    };
 
 /**
  * Parses the field key and detarmines the key path.
@@ -402,12 +404,17 @@ export function aggregate(
   groupOn: string,
 ): Array<Record<string, any>> {
   return input.reduce((acc, curr) => {
+    // Skip aggregation if the current item doesn't have the comparator attribute
+    if (curr[comparatorAttr] === undefined || curr[comparatorAttr] === null) {
+      acc.push({ ...curr });
+      return acc;
+    }
     const existingEntry = acc.find(
       (entry) => entry[comparatorAttr] === curr[comparatorAttr],
     );
 
     if (existingEntry) {
-      existingEntry[groupOn].push(...curr.entries);
+      existingEntry[groupOn].push(...curr[groupOn]);
     } else {
       acc.push({ ...curr });
     }

packages/server/src/modules/InventoryCost/commands/InventoryComputeCost.service.ts

@@ -93,7 +93,7 @@ export class InventoryComputeCostService {
    */
   async scheduleComputeItemCost(itemId: number, startingDate: Date | string) {
     const debounceKey = `inventory-cost-compute-debounce:${itemId}`;
-    const debounceTime = 1000 * 60; // 1 minute
+    const debounceTime = 1000 * 10; // 10 seconds
 
     // Generate a unique job ID or use a custom identifier
     const jobId = `task-${Date.now()}-${Math.random().toString(36).substring(2)}`;

packages/server/src/modules/InventoryCost/models/InventoryCostLotTracker.ts

@@ -6,6 +6,7 @@ import { SaleInvoice } from '@/modules/SaleInvoices/models/SaleInvoice';
 import { SaleReceipt } from '@/modules/SaleReceipts/models/SaleReceipt';
 import { Item } from '@/modules/Items/models/Item';
 import { BaseModel } from '@/models/Model';
+import { ItemEntry } from '@/modules/TransactionItemEntry/models/ItemEntry';
 
 export class InventoryCostLotTracker extends BaseModel {
   date: Date;
@@ -27,6 +28,7 @@ export class InventoryCostLotTracker extends BaseModel {
   warehouseId: number;
 
   item?: Item;
+  itemEntry?: ItemEntry;
   invoice?: SaleInvoice;
   receipt?: SaleReceipt;
 

packages/server/src/modules/InventoryCost/processors/ComputeItemCost.processor.ts

@@ -2,7 +2,8 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
-import { ClsService } from 'nestjs-cls';
+import { ClsService, UseCls } from 'nestjs-cls';
+import * as moment from 'moment';
 import { TenantJobPayload } from '@/interfaces/Tenant';
 import { InventoryComputeCostService } from '../commands/InventoryComputeCost.service';
 import { events } from '@/common/events/events';
@@ -14,7 +15,7 @@ import { Process } from '@nestjs/bull';
 
 interface ComputeItemCostJobPayload extends TenantJobPayload {
   itemId: number;
-  startingDate: Date;
+  startingDate: Date | string;
 }
 @Processor({
   name: ComputeItemCostQueue,
@@ -39,28 +40,34 @@ export class ComputeItemCostProcessor extends WorkerHost {
    * @param {Job<ComputeItemCostJobPayload>} job - The job to process
    */
   @Process(ComputeItemCostQueueJob)
+  @UseCls()
   async process(job: Job<ComputeItemCostJobPayload>) {
     const { itemId, startingDate, organizationId, userId } = job.data;
 
-    console.log(`Compute item cost for item ${itemId} started`);
+    // Parse startingDate using moment to handle both Date and string formats
+    const startingDateObj = moment(startingDate).toDate();
 
+    console.log(`[info] Compute item cost for item ${itemId} started`, {
+      payload: job.data,
+      jobId: job.id
+    });
     this.clsService.set('organizationId', organizationId);
     this.clsService.set('userId', userId);
 
     try {
       await this.inventoryComputeCostService.computeItemCost(
-        startingDate,
+        startingDateObj,
         itemId,
       );
       // Emit job completed event
       await this.eventEmitter.emitAsync(
         events.inventory.onComputeItemCostJobCompleted,
-        { startingDate, itemId, organizationId, userId },
+        { startingDate: startingDateObj, itemId, organizationId, userId },
       );
-
-      console.log(`Compute item cost for item ${itemId} completed`);
+      console.log(`[info] Compute item cost for item ${itemId} completed successfully`);
     } catch (error) {
-      console.error('Error computing item cost:', error);
+      console.error(`[error] Error computing item cost for item ${itemId}:`, error);
+      console.error('Error stack:', error instanceof Error ? error.stack : 'No stack trace');
       throw error;
     }
   }

packages/server/src/modules/InventoryCost/subscribers/InventoryCost.subscriber.ts

@@ -20,7 +20,7 @@ export class InventoryCostSubscriber {
     private readonly itemsQuantitySync: InventoryItemsQuantitySyncService,
     private readonly inventoryService: InventoryComputeCostService,
     private readonly importAls: ImportAls,
-  ) {}
+  ) { }
 
   /**
    * Sync inventory items quantity once inventory transactions created.
@@ -60,7 +60,7 @@ export class InventoryCostSubscriber {
    * Marks items cost compute running state.
    */
   @OnEvent(events.inventory.onInventoryTransactionsCreated)
-  async markGlobalSettingsComputeItems({}) {
+  async markGlobalSettingsComputeItems({ }) {
     await this.inventoryService.markItemsCostComputeRunning(true);
   }
 
@@ -68,7 +68,7 @@ export class InventoryCostSubscriber {
    * Marks items cost compute as completed.
    */
   @OnEvent(events.inventory.onInventoryCostEntriesWritten)
-  async markGlobalSettingsComputeItemsCompeted({}) {
+  async markGlobalSettingsComputeItemsCompeted({ }) {
     await this.inventoryService.markItemsCostComputeRunning(false);
   }
 
@@ -80,15 +80,13 @@ export class InventoryCostSubscriber {
     itemId,
     startingDate,
   }: IComputeItemCostJobCompletedPayload) {
-    // const dependsComputeJobs = await this.agenda.jobs({
-    //   name: 'compute-item-cost',
-    //   nextRunAt: { $ne: null },
-    //   'data.tenantId': tenantId,
-    // });
-    // // There is no scheduled compute jobs waiting.
-    // if (dependsComputeJobs.length === 0) {
-      // await this.saleInvoicesCost.scheduleWriteJournalEntries(startingDate);
-    // }
+    // Convert startingDate to Date if it's a string
+    const startingDateObj = startingDate instanceof Date
+      ? startingDate
+      : new Date(startingDate);
+
+    // Write GL entries for inventory cost lots after cost computation completes
+    await this.saleInvoicesCost.writeCostLotsGLEntries(startingDateObj);
   }
 
   /**

packages/server/src/modules/Items/models/Item.meta.ts

@@ -267,28 +267,28 @@ export const ItemMeta = {
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
-      importHint: 'Matches the account name or code.',
+      importHint: 'account.field.account_hint',
     },
     sellAccountId: {
       name: 'item.field.sell_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
-      importHint: 'Matches the account name or code.',
+      importHint: 'account.field.account_hint',
     },
     inventoryAccountId: {
       name: 'item.field.inventory_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
-      importHint: 'Matches the account name or code.',
+      importHint: 'account.field.account_hint',
     },
     sellDescription: {
-      name: 'Sell Description',
+      name: 'item.field.sell_description',
       fieldType: 'text',
     },
     purchaseDescription: {
-      name: 'Purchase Description',
+      name: 'item.field.purchase_description',
       fieldType: 'text',
     },
     note: {
@@ -300,7 +300,7 @@ export const ItemMeta = {
       fieldType: 'relation',
       relationModel: 'ItemCategory',
       relationImportMatch: ['name'],
-      importHint: 'Matches the category name.',
+      importHint: 'item.field.category_hint',
     },
     active: {
       name: 'item.field.active',

packages/server/src/modules/PaymentReceived/dtos/PaymentReceivedResponse.dto.ts

@@ -74,6 +74,9 @@ export class PaymentReceivedResponseDto {
   @ApiProperty({ description: 'The formatted amount', example: '100.00' })
   formattedAmount: string;
 
+  @ApiProperty({ description: 'The formatted total', example: '100.00 USD' })
+  formattedTotal: string;
+
   @ApiProperty({ description: 'The currency code', example: 'USD' })
   currencyCode: string;
 

packages/server/src/modules/PaymentReceived/models/PaymentReceived.meta.ts

@@ -165,12 +165,12 @@ export const PaymentReceivedMeta = {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'Matches the account name or code.',
+      importHint: 'account.field.account_hint',
     },
     paymentReceiveNo: {
       name: 'payment_receive.field.payment_receive_no',
       fieldType: 'text',
-      importHint: 'The payment number should be unique.',
+      importHint: 'payment_receive.field.payment_no_hint',
     },
     statement: {
       name: 'payment_receive.field.statement',
@@ -189,7 +189,7 @@ export const PaymentReceivedMeta = {
           relationModel: 'SaleInvoice',
           relationImportMatch: 'invoiceNo',
           required: true,
-          importHint: 'Matches the invoice number.',
+          importHint: 'payment_receive.field.invoice_hint',
         },
         paymentAmount: {
           name: 'payment_receive.field.entries.payment_amount',
@@ -199,7 +199,7 @@ export const PaymentReceivedMeta = {
       },
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/PaymentReceived/queries/PaymentReceivedTransformer.ts

@@ -11,6 +11,7 @@ export class PaymentReceiveTransfromer extends Transformer {
   public includeAttributes = (): string[] => {
     return [
       'subtotalFormatted',
+      'formatttedTotal',
       'formattedPaymentDate',
       'formattedCreatedAt',
       'formattedAmount',
@@ -45,7 +46,18 @@ export class PaymentReceiveTransfromer extends Transformer {
   protected subtotalFormatted = (payment: PaymentReceived): string => {
     return this.formatNumber(payment.amount, {
       currencyCode: payment.currencyCode,
-      money: false,
+    });
+  };
+
+  /**
+   * Retrieves the formatted total.
+   * @param {PaymentReceived} payment
+   * @returns {string}
+   */
+  protected formatttedTotal = (payment: PaymentReceived): string => {
+    return this.formatNumber(payment.amount, {
+      currencyCode: payment.currencyCode,
+      money: true,
     });
   };
 
@@ -66,7 +78,7 @@ export class PaymentReceiveTransfromer extends Transformer {
    * @returns {string}
    */
   protected formattedExchangeRate = (payment: PaymentReceived): string => {
-    return this.formatNumber(payment.exchangeRate, { money: false });
+    return this.formatNumber(payment.exchangeRate);
   };
 
   /**

packages/server/src/modules/Resource/ResourceService.ts

@@ -1,5 +1,6 @@
 import { ModuleRef } from '@nestjs/core';
-import { pickBy } from 'lodash';
+import { pickBy, mapValues } from 'lodash';
+import { I18nService } from 'nestjs-i18n';
 import { WarehousesSettings } from '../Warehouses/WarehousesSettings';
 import { Injectable } from '@nestjs/common';
 import { BranchesSettingsService } from '../Branches/BranchesSettings';
@@ -20,7 +21,8 @@ export class ResourceService {
     private readonly branchesSettings: BranchesSettingsService,
     private readonly warehousesSettings: WarehousesSettings,
     private readonly moduleRef: ModuleRef,
-  ) {}
+    private readonly i18nService: I18nService,
+  ) { }
 
   /**
    * Retrieve resource model object.
@@ -96,7 +98,45 @@ export class ResourceService {
   };
 
   /**
-   * Retrieve the resource fields.
+   * Localizes a single field by translating its name and importHint.
+   * @param {IModelMetaField2} field - The field to localize.
+   * @returns {IModelMetaField2} - The localized field.
+   */
+  private localizeField(field: IModelMetaField2): IModelMetaField2 {
+    const localizedField = {
+      ...field,
+      name: this.i18nService.t(field.name, { defaultValue: field.name }),
+    } as IModelMetaField2;
+
+    if (field.importHint) {
+      localizedField.importHint = this.i18nService.t(field.importHint, {
+        defaultValue: field.importHint,
+      });
+    }
+
+    // Recursively localize nested fields (for collection types)
+    if (field.fields) {
+      localizedField.fields = this.localizeFields(
+        field.fields as unknown as Record<string, IModelMetaField2>,
+      ) as unknown as typeof field.fields;
+    }
+
+    return localizedField;
+  }
+
+  /**
+   * Localizes all fields in a fields map.
+   * @param {Record<string, IModelMetaField2>} fields - The fields to localize.
+   * @returns {Record<string, IModelMetaField2>} - The localized fields.
+   */
+  private localizeFields(
+    fields: Record<string, IModelMetaField2>,
+  ): Record<string, IModelMetaField2> {
+    return mapValues(fields, (field) => this.localizeField(field));
+  }
+
+  /**
+   * Retrieve the resource fields with localized names and hints.
    * @param {string} modelName
    * @returns {IModelMetaField2}
    */
@@ -104,8 +144,11 @@ export class ResourceService {
     [key: string]: IModelMetaField2;
   } {
     const meta = this.getResourceMeta(modelName);
+    const filteredFields = this.filterSupportFeatures(meta.fields2);
 
-    return this.filterSupportFeatures(meta.fields2);
+    return this.localizeFields(
+      filteredFields as Record<string, IModelMetaField2>,
+    );
   }
 
   /**

packages/server/src/modules/SaleEstimates/models/SaleEstimate.meta.ts

@@ -191,52 +191,52 @@ export const SaleEstimateMeta = {
   },
   fields2: {
     customerId: {
-      name: 'Customer',
+      name: 'estimate.field.customer',
       fieldType: 'relation',
       relationModel: 'Contact',
       relationImportMatch: ['displayName'],
       required: true,
     },
     estimateDate: {
-      name: 'Estimate Date',
+      name: 'estimate.field.estimate_date',
       fieldType: 'date',
       required: true,
     },
     expirationDate: {
-      name: 'Expiration Date',
+      name: 'estimate.field.expiration_date',
       fieldType: 'date',
       required: true,
     },
     estimateNumber: {
-      name: 'Estimate No.',
+      name: 'estimate.field.estimate_number',
       fieldType: 'text',
     },
     reference: {
-      name: 'Reference No.',
+      name: 'estimate.field.reference_no',
       fieldType: 'text',
     },
     exchangeRate: {
-      name: 'Exchange Rate',
+      name: 'estimate.field.exchange_rate',
       fieldType: 'number',
     },
     currencyCode: {
-      name: 'Currency',
+      name: 'estimate.field.currency',
       fieldType: 'text',
     },
     note: {
-      name: 'Note',
+      name: 'estimate.field.note',
       fieldType: 'text',
     },
     termsConditions: {
-      name: 'Terms & Conditions',
+      name: 'estimate.field.terms_conditions',
       fieldType: 'text',
     },
     delivered: {
-      name: 'Delivered',
+      name: 'estimate.field.delivered',
       type: 'boolean',
     },
     entries: {
-      name: 'Entries',
+      name: 'estimate.field.entries',
       fieldType: 'collection',
       collectionOf: 'object',
       collectionMinLength: 1,
@@ -248,7 +248,7 @@ export const SaleEstimateMeta = {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: 'invoice.field.item_hint',
         },
         rate: {
           name: 'invoice.field.rate',
@@ -261,13 +261,13 @@ export const SaleEstimateMeta = {
           required: true,
         },
         description: {
-          name: 'Line Description',
+          name: 'invoice.field.description',
           fieldType: 'text',
         },
       },
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -275,7 +275,7 @@ export const SaleEstimateMeta = {
       required: true,
     },
     warehouseId: {
-      name: 'Warehouse',
+      name: 'invoice.field.warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/SaleEstimates/queries/SaleEstimate.transformer.ts

@@ -17,7 +17,7 @@ export class SaleEstimateTransfromer extends Transformer {
       'formattedDeliveredAtDate',
       'formattedApprovedAtDate',
       'formattedRejectedAtDate',
-      
+
       'discountAmountFormatted',
       'discountPercentageFormatted',
       'adjustmentFormatted',
@@ -135,7 +135,7 @@ export class SaleEstimateTransfromer extends Transformer {
    * @returns {string}
    */
   protected adjustmentFormatted = (estimate: SaleEstimate): string => {
-    return this.formatMoney(estimate.adjustment, {
+    return this.formatNumber(estimate.adjustment, {
       currencyCode: estimate.currencyCode,
       excerptZero: true,
     });

packages/server/src/modules/SaleInvoices/SaleInvoiceCostGLEntries.ts

@@ -19,7 +19,7 @@ export class SaleInvoiceCostGLEntries {
     private readonly inventoryCostLotTracker: TenantModelProxy<
       typeof InventoryCostLotTracker
     >,
-  ) {}
+  ) { }
 
   /**
    * Writes journal entries from sales invoices.
@@ -38,7 +38,8 @@ export class SaleInvoiceCostGLEntries {
       .modify('filterDateRange', startingDate)
       .orderBy('date', 'ASC')
       .withGraphFetched('invoice')
-      .withGraphFetched('item');
+      .withGraphFetched('item')
+      .withGraphFetched('itemEntry');
 
     const ledger = this.getInventoryCostLotsLedger(inventoryCostLotTrans);
 
@@ -79,6 +80,9 @@ export class SaleInvoiceCostGLEntries {
       transactionType: inventoryCostLot.transactionType,
       transactionId: inventoryCostLot.transactionId,
 
+      transactionNumber: inventoryCostLot.invoice.invoiceNo,
+      referenceNumber: inventoryCostLot.invoice.referenceNo,
+
       date: inventoryCostLot.date,
       indexGroup: 20,
       costable: true,
@@ -105,6 +109,9 @@ export class SaleInvoiceCostGLEntries {
       const costAccountId =
         inventoryCostLot.costAccountId || inventoryCostLot.item.costAccountId;
 
+      // Get description from item entry if available
+      const description = inventoryCostLot.itemEntry?.description || null;
+
       // XXX Debit - Cost account.
       const costEntry = {
         ...commonEntry,
@@ -112,6 +119,7 @@ export class SaleInvoiceCostGLEntries {
         accountId: costAccountId,
         accountNormal: AccountNormal.DEBIT,
         itemId: inventoryCostLot.itemId,
+        note: description,
         index: getIndexIncrement(),
       };
       // XXX Credit - Inventory account.
@@ -121,6 +129,7 @@ export class SaleInvoiceCostGLEntries {
         accountId: inventoryCostLot.item.inventoryAccountId,
         accountNormal: AccountNormal.DEBIT,
         itemId: inventoryCostLot.itemId,
+        note: description,
         index: getIndexIncrement(),
       };
       return [costEntry, inventoryEntry];

packages/server/src/modules/SaleInvoices/commands/SaleInvoicesImportable.ts

@@ -5,10 +5,10 @@ import { Importable } from '@/modules/Import/Importable';
 import { CreateSaleInvoiceDto } from '../dtos/SaleInvoice.dto';
 import { SaleInvoicesSampleData } from '../constants';
 import { ImportableService } from '@/modules/Import/decorators/Import.decorator';
-import { ManualJournal } from '@/modules/ManualJournals/models/ManualJournal';
+import { SaleInvoice } from '../models/SaleInvoice';
 
 @Injectable()
-@ImportableService({ name: ManualJournal.name })
+@ImportableService({ name: SaleInvoice.name })
 export class SaleInvoicesImportable extends Importable {
   constructor(private readonly createInvoiceService: CreateSaleInvoice) {
     super();

packages/server/src/modules/SaleInvoices/models/SaleInvoice.meta.ts

@@ -259,7 +259,7 @@ export const SaleInvoiceMeta = {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: 'invoice.field.item_hint',
         },
         rate: {
           name: 'invoice.field.rate',
@@ -283,7 +283,7 @@ export const SaleInvoiceMeta = {
       printable: false,
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -291,7 +291,7 @@ export const SaleInvoiceMeta = {
       required: true,
     },
     warehouseId: {
-      name: 'Warehouse',
+      name: 'invoice.field.warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/SaleInvoices/queries/SaleInvoice.transformer.ts

@@ -70,6 +70,7 @@ export class SaleInvoiceTransformer extends Transformer {
   protected dueAmountFormatted = (invoice: SaleInvoice): string => {
     return this.formatNumber(invoice.dueAmount, {
       currencyCode: invoice.currencyCode,
+      money: true
     });
   };
 
@@ -113,7 +114,6 @@ export class SaleInvoiceTransformer extends Transformer {
   protected subtotalFormatted = (invoice: SaleInvoice): string => {
     return this.formatNumber(invoice.subtotal, {
       currencyCode: this.context.organization.baseCurrency,
-      money: false,
     });
   };
 
@@ -170,6 +170,7 @@ export class SaleInvoiceTransformer extends Transformer {
   protected totalFormatted = (invoice: SaleInvoice): string => {
     return this.formatNumber(invoice.total, {
       currencyCode: invoice.currencyCode,
+      money: true
     });
   };
 
@@ -212,7 +213,7 @@ export class SaleInvoiceTransformer extends Transformer {
    * @returns {string}
    */
   protected adjustmentFormatted = (invoice: SaleInvoice): string => {
-    return this.formatMoney(invoice.adjustment, {
+    return this.formatNumber(invoice.adjustment, {
       currencyCode: invoice.currencyCode,
     })
   }

packages/server/src/modules/SaleInvoices/subscribers/InvoiceCostGLEntriesSubscriber.ts

@@ -1,15 +1,18 @@
 import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+import { events } from '@/common/events/events';
 import { IInventoryCostLotsGLEntriesWriteEvent } from '@/modules/InventoryCost/types/InventoryCost.types';
 import { SaleInvoiceCostGLEntries } from '../SaleInvoiceCostGLEntries';
 
 @Injectable()
 export class InvoiceCostGLEntriesSubscriber {
-  constructor(private readonly invoiceCostEntries: SaleInvoiceCostGLEntries) {}
+  constructor(private readonly invoiceCostEntries: SaleInvoiceCostGLEntries) { }
 
   /**
    * Writes the invoices cost GL entries once the inventory cost lots be written.
    * @param {IInventoryCostLotsGLEntriesWriteEvent}
    */
+  @OnEvent(events.inventory.onCostLotsGLEntriesWrite)
   async writeInvoicesCostEntriesOnCostLotsWritten({
     trx,
     startingDate,

packages/server/src/modules/SaleInvoices/subscribers/InvoiceGLEntriesSubscriber.ts

@@ -10,7 +10,7 @@ import { events } from '@/common/events/events';
 
 @Injectable()
 export class InvoiceGLEntriesSubscriber {
-  constructor(public readonly saleInvoiceGLEntries: SaleInvoiceGLEntries) {}
+  constructor(public readonly saleInvoiceGLEntries: SaleInvoiceGLEntries) { }
 
   /**
    * Records journal entries of the non-inventory invoice.

packages/server/src/modules/SaleReceipts/models/SaleReceipt.meta.ts

@@ -186,42 +186,42 @@ export const SaleReceiptMeta = {
   },
   fields2: {
     receiptDate: {
-      name: 'Receipt Date',
+      name: 'receipt.field.receipt_date',
       fieldType: 'date',
       required: true,
     },
     customerId: {
-      name: 'Customer',
+      name: 'receipt.field.customer',
       fieldType: 'relation',
       relationModel: 'Contact',
       relationImportMatch: 'displayName',
       required: true,
     },
     depositAccountId: {
-      name: 'Deposit Account',
+      name: 'receipt.field.deposit_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
     },
     exchangeRate: {
-      name: 'Exchange Rate',
+      name: 'receipt.field.exchange_rate',
       fieldType: 'number',
     },
     receiptNumber: {
-      name: 'Receipt Number',
+      name: 'receipt.field.receipt_number',
       fieldType: 'text',
     },
     referenceNo: {
-      name: 'Reference No.',
+      name: 'receipt.field.reference_no',
       fieldType: 'text',
     },
     closed: {
-      name: 'Closed',
+      name: 'receipt.field.closed',
       fieldType: 'boolean',
     },
     entries: {
-      name: 'Entries',
+      name: 'receipt.field.entries',
       fieldType: 'collection',
       collectionOf: 'object',
       collectionMinLength: 1,
@@ -233,7 +233,7 @@ export const SaleReceiptMeta = {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: 'invoice.field.item_hint',
         },
         rate: {
           name: 'invoice.field.rate',
@@ -252,15 +252,15 @@ export const SaleReceiptMeta = {
       },
     },
     statement: {
-      name: 'Statement',
+      name: 'receipt.field.statement',
       fieldType: 'text',
     },
     receiptMessage: {
-      name: 'Receipt Message',
+      name: 'receipt.field.receipt_message',
       fieldType: 'text',
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -268,7 +268,7 @@ export const SaleReceiptMeta = {
       required: true,
     },
     warehouseId: {
-      name: 'Warehouse',
+      name: 'invoice.field.warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/Tenancy/TenancyModels/Tenancy.module.ts

@@ -107,4 +107,4 @@ const modelProviders = models.map((model) => RegisterTenancyModel(model));
   imports: [...modelProviders],
   exports: [...modelProviders],
 })
-export class TenancyModelsModule {}
+export class TenancyModelsModule { }

packages/server/src/modules/TransactionsLocking/commands/CommandTransactionsLockingService.ts

@@ -26,7 +26,7 @@ export class TransactionsLockingService {
   constructor(
     private readonly transactionsLockingRepo: TransactionsLockingRepository,
     private readonly eventPublisher: EventEmitter2,
-  ) {}
+  ) { }
 
   /**
    * Enable/disable all transacations locking.

packages/server/src/modules/Transformer/Transformer.ts

@@ -203,6 +203,7 @@ export class Transformer<T = {}, ExtraContext = {}> {
   protected formatMoney(money, options?) {
     return formatNumber(money, {
       currencyCode: this.context.organization.baseCurrency,
+      money: true,
       ...options,
     });
   }

packages/server/src/modules/VendorCredit/models/VendorCredit.meta.ts

@@ -177,70 +177,70 @@ export const VendorCreditMeta = {
   },
   fields2: {
     vendorId: {
-      name: 'Vendor',
+      name: 'vendor_credit.field.vendor',
       fieldType: 'relation',
       relationModel: 'Contact',
       relationImportMatch: 'displayName',
       required: true,
     },
     exchangeRate: {
-      name: 'Echange Rate',
+      name: 'vendor_credit.field.exchange_rate',
       fieldType: 'text',
     },
     vendorCreditNumber: {
-      name: 'Vendor Credit No.',
+      name: 'vendor_credit.field.vendor_credit_number',
       fieldType: 'text',
     },
     referenceNo: {
-      name: 'Refernece No.',
+      name: 'vendor_credit.field.reference_no',
       fieldType: 'text',
     },
     vendorCreditDate: {
-      name: 'Vendor Credit Date',
+      name: 'vendor_credit.field.vendor_credit_date',
       fieldType: 'date',
       required: true,
     },
     note: {
-      name: 'Note',
+      name: 'vendor_credit.field.note',
       fieldType: 'text',
     },
     open: {
-      name: 'Open',
+      name: 'vendor_credit.field.open',
       fieldType: 'boolean',
     },
     entries: {
-      name: 'Entries',
+      name: 'vendor_credit.field.entries',
       fieldType: 'collection',
       collectionOf: 'object',
       collectionMinLength: 1,
       required: true,
       fields: {
         itemId: {
-          name: 'Item Name',
+          name: 'vendor_credit.field.item',
           fieldType: 'relation',
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: 'invoice.field.item_hint',
         },
         rate: {
-          name: 'Rate',
+          name: 'vendor_credit.field.rate',
           fieldType: 'number',
           required: true,
         },
         quantity: {
-          name: 'Quantity',
+          name: 'vendor_credit.field.quantity',
           fieldType: 'number',
           required: true,
         },
         description: {
-          name: 'Description',
+          name: 'vendor_credit.field.description',
           fieldType: 'text',
         },
       },
     },
     branchId: {
-      name: 'Branch',
+      name: 'invoice.field.branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -248,7 +248,7 @@ export const VendorCreditMeta = {
       required: true
     },
     warehouseId: {
-      name: 'Warehouse',
+      name: 'invoice.field.warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/VendorCreditsRefund/VendorCreditsRefund.application.ts

@@ -2,19 +2,35 @@ import { Injectable } from '@nestjs/common';
 import { DeleteRefundVendorCreditService } from './commands/DeleteRefundVendorCredit.service';
 import { RefundVendorCredit } from './models/RefundVendorCredit';
 import { CreateRefundVendorCredit } from './commands/CreateRefundVendorCredit.service';
-import { IRefundVendorCreditDTO } from './types/VendorCreditRefund.types';
 import { RefundVendorCreditDto } from './dtos/RefundVendorCredit.dto';
+import { GetRefundVendorCreditsService } from './queries/GetRefundVendorCredits.service';
+import { IRefundVendorCreditPOJO } from './types/VendorCreditRefund.types';
 
 @Injectable()
 export class VendorCreditsRefundApplication {
   /**
    * @param {CreateRefundVendorCredit} createRefundVendorCreditService
    * @param {DeleteRefundVendorCreditService} deleteRefundVendorCreditService
+   * @param {GetRefundVendorCreditsService} getRefundVendorCreditsService
    */
   constructor(
     private readonly createRefundVendorCreditService: CreateRefundVendorCredit,
     private readonly deleteRefundVendorCreditService: DeleteRefundVendorCreditService,
-  ) {}
+    private readonly getRefundVendorCreditsService: GetRefundVendorCreditsService,
+  ) { }
+
+  /**
+   * Retrieve the vendor credit refunds graph.
+   * @param {number} vendorCreditId - Vendor credit id.
+   * @returns {Promise<IRefundVendorCreditPOJO[]>}
+   */
+  public getVendorCreditRefunds(
+    vendorCreditId: number,
+  ): Promise<IRefundVendorCreditPOJO[]> {
+    return this.getRefundVendorCreditsService.getVendorCreditRefunds(
+      vendorCreditId,
+    );
+  }
 
   /**
    * Creates a refund vendor credit.

packages/server/src/modules/VendorCreditsRefund/VendorCreditsRefund.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Param, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post } from '@nestjs/common';
 import { VendorCreditsRefundApplication } from './VendorCreditsRefund.application';
 import { RefundVendorCredit } from './models/RefundVendorCredit';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
@@ -9,7 +9,22 @@ import { RefundVendorCreditDto } from './dtos/RefundVendorCredit.dto';
 export class VendorCreditsRefundController {
   constructor(
     private readonly vendorCreditsRefundApplication: VendorCreditsRefundApplication,
-  ) {}
+  ) { }
+
+  /**
+   * Retrieve the vendor credit refunds graph.
+   * @param {number} vendorCreditId - Vendor credit id.
+   * @returns {Promise<IRefundVendorCreditPOJO[]>}
+   */
+  @Get(':vendorCreditId/refund')
+  @ApiOperation({ summary: 'Retrieve the vendor credit refunds graph.' })
+  public getVendorCreditRefunds(
+    @Param('vendorCreditId') vendorCreditId: string,
+  ) {
+    return this.vendorCreditsRefundApplication.getVendorCreditRefunds(
+      Number(vendorCreditId),
+    );
+  }
 
   /**
    * Creates a refund vendor credit.
@@ -17,7 +32,7 @@ export class VendorCreditsRefundController {
    * @param {IRefundVendorCreditDTO} refundVendorCreditDTO
    * @returns {Promise<RefundVendorCredit>}
    */
-  @Post(':vendorCreditId/refunds')
+  @Post(':vendorCreditId/refund')
   @ApiOperation({ summary: 'Create a refund for the given vendor credit.' })
   public async createRefundVendorCredit(
     @Param('vendorCreditId') vendorCreditId: string,

packages/server/src/modules/VendorCreditsRefund/VendorCreditsRefund.module.ts

@@ -6,15 +6,21 @@ import { VendorCreditsRefundApplication } from './VendorCreditsRefund.applicatio
 import { CreateRefundVendorCredit } from './commands/CreateRefundVendorCredit.service';
 import { WarehousesModule } from '../Warehouses/Warehouses.module';
 import { BranchesModule } from '../Branches/Branches.module';
+import { RefundVendorCreditGLEntries } from './commands/RefundVendorCreditGLEntries';
+import { RefundVendorCreditGLEntriesSubscriber } from './subscribers/RefundVendorCreditGLEntriesSubscriber';
+import { LedgerModule } from '../Ledger/Ledger.module';
+import { AccountsModule } from '../Accounts/Accounts.module';
 
 @Module({
-  imports: [WarehousesModule, BranchesModule],
+  imports: [WarehousesModule, BranchesModule, LedgerModule, AccountsModule],
   providers: [
     GetRefundVendorCreditsService,
     DeleteRefundVendorCreditService,
     CreateRefundVendorCredit,
-    VendorCreditsRefundApplication
+    VendorCreditsRefundApplication,
+    RefundVendorCreditGLEntries,
+    RefundVendorCreditGLEntriesSubscriber,
   ],
   controllers: [VendorCreditsRefundController],
 })
-export class VendorCreditsRefundModule {}
+export class VendorCreditsRefundModule { }

packages/server/src/modules/VendorCreditsRefund/commands/RefundVendorCreditGLEntries.ts

@@ -1,159 +1,172 @@
-// import { Inject, Service } from 'typedi';
-// import { Knex } from 'knex';
-// import { AccountNormal, ILedgerEntry } from '@/interfaces';
-// import { IRefundVendorCredit } from '@/interfaces';
-// import JournalPosterService from '@/services/Sales/JournalPosterService';
-// import LedgerRepository from '@/services/Ledger/LedgerRepository';
-// import HasTenancyService from '@/services/Tenancy/TenancyService';
+import { LedgerStorageService } from '@/modules/Ledger/LedgerStorage.service';
+import { Inject, Injectable } from '@nestjs/common';
+import { RefundVendorCredit } from '../models/RefundVendorCredit';
+import { Ledger } from '@/modules/Ledger/Ledger';
+import { Knex } from 'knex';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
+import { Account } from '@/modules/Accounts/models/Account.model';
+import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
+import { AccountNormal } from '@/interfaces/Account';
+import { AccountRepository } from '@/modules/Accounts/repositories/Account.repository';
 
-// @Service()
-// export default class RefundVendorCreditGLEntries {
-//   @Inject()
-//   private journalService: JournalPosterService;
+@Injectable()
+export class RefundVendorCreditGLEntries {
+  constructor(
+    private readonly ledgerStorage: LedgerStorageService,
+    private readonly accountRepository: AccountRepository,
 
-//   @Inject()
-//   private ledgerRepository: LedgerRepository;
+    @Inject(Account.name)
+    private readonly accountModel: TenantModelProxy<typeof Account>,
 
-//   @Inject()
-//   private tenancy: HasTenancyService;
+    @Inject(RefundVendorCredit.name)
+    private readonly refundVendorCreditModel: TenantModelProxy<
+      typeof RefundVendorCredit
+    >,
+  ) { }
 
-//   /**
-//    * Retrieves the refund credit common GL entry.
-//    * @param   {IRefundVendorCredit} refundCredit
-//    */
-//   private getRefundCreditGLCommonEntry = (
-//     refundCredit: IRefundVendorCredit
-//   ) => {
-//     return {
-//       exchangeRate: refundCredit.exchangeRate,
-//       currencyCode: refundCredit.currencyCode,
+  /**
+   * Retrieves the refund vendor credit common GL entry.
+   * @param {RefundVendorCredit} refundVendorCredit
+   * @returns
+   */
+  private getRefundVendorCreditCommonGLEntry = (
+    refundVendorCredit: RefundVendorCredit,
+  ) => {
+    const model = refundVendorCredit as any;
+    return {
+      currencyCode: refundVendorCredit.currencyCode,
+      exchangeRate: refundVendorCredit.exchangeRate,
 
-//       transactionType: 'RefundVendorCredit',
-//       transactionId: refundCredit.id,
+      transactionType: 'RefundVendorCredit',
+      transactionId: refundVendorCredit.id,
+      date: refundVendorCredit.date,
+      userId: refundVendorCredit.vendorCredit?.userId,
 
-//       date: refundCredit.date,
-//       userId: refundCredit.userId,
-//       referenceNumber: refundCredit.referenceNo,
-//       createdAt: refundCredit.createdAt,
-//       indexGroup: 10,
+      referenceNumber: refundVendorCredit.referenceNo,
 
-//       credit: 0,
-//       debit: 0,
+      createdAt: model.createdAt,
+      indexGroup: 10,
 
-//       note: refundCredit.description,
-//       branchId: refundCredit.branchId,
-//     };
-//   };
+      credit: 0,
+      debit: 0,
 
-//   /**
-//    * Retrieves the refund credit payable GL entry.
-//    * @param   {IRefundVendorCredit} refundCredit
-//    * @param   {number} APAccountId
-//    * @returns {ILedgerEntry}
-//    */
-//   private getRefundCreditGLPayableEntry = (
-//     refundCredit: IRefundVendorCredit,
-//     APAccountId: number
-//   ): ILedgerEntry => {
-//     const commonEntry = this.getRefundCreditGLCommonEntry(refundCredit);
+      note: refundVendorCredit.description,
+      branchId: refundVendorCredit.branchId,
+    };
+  };
 
-//     return {
-//       ...commonEntry,
-//       credit: refundCredit.amount,
-//       accountId: APAccountId,
-//       contactId: refundCredit.vendorCredit.vendorId,
-//       index: 1,
-//       accountNormal: AccountNormal.CREDIT,
-//     };
-//   };
+  /**
+   * Retrieves the refund vendor credit payable GL entry.
+   * @param   {RefundVendorCredit} refundVendorCredit
+   * @param   {number} APAccountId
+   * @returns {ILedgerEntry}
+   */
+  private getRefundVendorCreditGLPayableEntry = (
+    refundVendorCredit: RefundVendorCredit,
+    APAccountId: number,
+  ): ILedgerEntry => {
+    const commonEntry = this.getRefundVendorCreditCommonGLEntry(
+      refundVendorCredit,
+    );
 
-//   /**
-//    * Retrieves the refund credit deposit GL entry.
-//    * @param   {IRefundVendorCredit} refundCredit
-//    * @returns {ILedgerEntry}
-//    */
-//   private getRefundCreditGLDepositEntry = (
-//     refundCredit: IRefundVendorCredit
-//   ): ILedgerEntry => {
-//     const commonEntry = this.getRefundCreditGLCommonEntry(refundCredit);
+    return {
+      ...commonEntry,
+      credit: refundVendorCredit.amount,
+      accountId: APAccountId,
+      contactId: refundVendorCredit.vendorCredit.vendorId,
+      index: 1,
+      accountNormal: AccountNormal.CREDIT,
+    };
+  };
 
-//     return {
-//       ...commonEntry,
-//       debit: refundCredit.amount,
-//       accountId: refundCredit.depositAccountId,
-//       index: 2,
-//       accountNormal: AccountNormal.DEBIT,
-//     };
-//   };
+  /**
+   * Retrieves the refund vendor credit deposit GL entry.
+   * @param   {RefundVendorCredit} refundVendorCredit
+   * @returns {ILedgerEntry}
+   */
+  private getRefundVendorCreditGLDepositEntry = (
+    refundVendorCredit: RefundVendorCredit,
+  ): ILedgerEntry => {
+    const commonEntry = this.getRefundVendorCreditCommonGLEntry(
+      refundVendorCredit,
+    );
 
-//   /**
-//    * Retrieve refund vendor credit GL entries.
-//    * @param {IRefundVendorCredit} refundCredit
-//    * @param {number} APAccountId
-//    * @returns {ILedgerEntry[]}
-//    */
-//   public getRefundCreditGLEntries = (
-//     refundCredit: IRefundVendorCredit,
-//     APAccountId: number
-//   ): ILedgerEntry[] => {
-//     const payableEntry = this.getRefundCreditGLPayableEntry(
-//       refundCredit,
-//       APAccountId
-//     );
-//     const depositEntry = this.getRefundCreditGLDepositEntry(refundCredit);
+    return {
+      ...commonEntry,
+      debit: refundVendorCredit.amount,
+      accountId: refundVendorCredit.depositAccountId,
+      index: 2,
+      accountNormal: AccountNormal.DEBIT,
+    };
+  };
 
-//     return [payableEntry, depositEntry];
-//   };
+  /**
+   * Retrieve refund vendor credit GL entries.
+   * @param {RefundVendorCredit} refundVendorCredit
+   * @param {number} APAccountId
+   * @returns {ILedgerEntry[]}
+   */
+  public getRefundVendorCreditGLEntries(
+    refundVendorCredit: RefundVendorCredit,
+    APAccountId: number,
+  ): ILedgerEntry[] {
+    const payableEntry = this.getRefundVendorCreditGLPayableEntry(
+      refundVendorCredit,
+      APAccountId,
+    );
+    const depositEntry = this.getRefundVendorCreditGLDepositEntry(
+      refundVendorCredit,
+    );
 
-//   /**
-//    * Saves refund credit note GL entries.
-//    * @param {number} tenantId
-//    * @param {IRefundVendorCredit} refundCredit -
-//    * @param {Knex.Transaction} trx -
-//    * @return {Promise<void>}
-//    */
-//   public saveRefundCreditGLEntries = async (
-//     tenantId: number,
-//     refundCreditId: number,
-//     trx?: Knex.Transaction
-//   ): Promise<void> => {
-//     const { Account, RefundVendorCredit } = this.tenancy.models(tenantId);
+    return [payableEntry, depositEntry];
+  }
 
-//     // Retireve refund with associated vendor credit entity.
-//     const refundCredit = await RefundVendorCredit.query()
-//       .findById(refundCreditId)
-//       .withGraphFetched('vendorCredit');
+  /**
+   * Creates refund vendor credit GL entries.
+   * @param {number} refundVendorCreditId
+   * @param {Knex.Transaction} trx
+   */
+  public createRefundVendorCreditGLEntries = async (
+    refundVendorCreditId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    // Retrieve the refund with associated vendor credit.
+    const refundVendorCredit = await this.refundVendorCreditModel()
+      .query(trx)
+      .findById(refundVendorCreditId)
+      .withGraphFetched('vendorCredit');
 
-//     const payableAccount = await Account.query().findOne(
-//       'slug',
-//       'accounts-payable'
-//     );
-//     // Generates the GL entries of the given refund credit.
-//     const entries = this.getRefundCreditGLEntries(
-//       refundCredit,
-//       payableAccount.id
-//     );
-//     // Saves the ledegr to the storage.
-//     await this.ledgerRepository.saveLedgerEntries(tenantId, entries, trx);
-//   };
+    // Retrieve the payable account (A/P) account based on the given currency.
+    const APAccount = await this.accountRepository.findOrCreateAccountsPayable(
+      refundVendorCredit.currencyCode,
+      {},
+      trx,
+    );
 
-//   /**
-//    * Reverts refund credit note GL entries.
-//    * @param {number} tenantId
-//    * @param {number} refundCreditId
-//    * @param {Knex.Transaction} trx
-//    * @return {Promise<void>}
-//    */
-//   public revertRefundCreditGLEntries = async (
-//     tenantId: number,
-//     refundCreditId: number,
-//     trx?: Knex.Transaction
-//   ) => {
-//     await this.journalService.revertJournalTransactions(
-//       tenantId,
-//       refundCreditId,
-//       'RefundVendorCredit',
-//       trx
-//     );
-//   };
-// }
+    // Retrieve refund vendor credit GL entries.
+    const refundGLEntries = this.getRefundVendorCreditGLEntries(
+      refundVendorCredit,
+      APAccount.id,
+    );
+    const ledger = new Ledger(refundGLEntries);
+
+    // Saves refund ledger entries.
+    await this.ledgerStorage.commit(ledger, trx);
+  };
+
+  /**
+   * Reverts refund vendor credit GL entries.
+   * @param {number} refundVendorCreditId
+   * @param {Knex.Transaction} trx
+   */
+  public revertRefundVendorCreditGLEntries = async (
+    refundVendorCreditId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    await this.ledgerStorage.deleteByReference(
+      refundVendorCreditId,
+      'RefundVendorCredit',
+      trx,
+    );
+  };
+}

packages/server/src/modules/VendorCreditsRefund/dtos/RefundVendorCredit.dto.ts

@@ -1,10 +1,12 @@
+import { IsOptional, ToNumber } from '@/common/decorators/Validators';
 import { ApiProperty } from '@nestjs/swagger';
-import { Min } from 'class-validator';
+import { IsDateString, Min } from 'class-validator';
 import { IsString } from 'class-validator';
 import { IsDate } from 'class-validator';
-import { IsNotEmpty, IsNumber, IsOptional, IsPositive } from 'class-validator';
+import { IsNotEmpty, IsNumber, IsPositive } from 'class-validator';
 
 export class RefundVendorCreditDto {
+  @ToNumber()
   @IsNumber()
   @IsNotEmpty()
   @Min(0)
@@ -32,6 +34,7 @@ export class RefundVendorCreditDto {
   })
   depositAccountId: number;
 
+  @IsOptional()
   @IsString()
   @IsNotEmpty()
   @ApiProperty({
@@ -40,7 +43,7 @@ export class RefundVendorCreditDto {
   })
   description: string;
 
-  @IsDate()
+  @IsDateString()
   @IsNotEmpty()
   @ApiProperty({
     description: 'The date of the refund',

packages/server/src/modules/VendorCreditsRefund/subscribers/RefundVendorCreditGLEntriesSubscriber.ts

@@ -0,0 +1,48 @@
+import { events } from '@/common/events/events';
+import { RefundVendorCreditGLEntries } from '../commands/RefundVendorCreditGLEntries';
+import {
+  IRefundVendorCreditCreatedPayload,
+  IRefundVendorCreditDeletedPayload,
+} from '../types/VendorCreditRefund.types';
+import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+@Injectable()
+export class RefundVendorCreditGLEntriesSubscriber {
+  constructor(
+    private readonly refundVendorCreditGLEntries: RefundVendorCreditGLEntries,
+  ) { }
+
+  /**
+   * Writes refund vendor credit GL entries once the transaction created.
+   * @param {IRefundVendorCreditCreatedPayload} payload -
+   */
+  @OnEvent(events.vendorCredit.onRefundCreated)
+  async writeRefundVendorCreditGLEntriesOnceCreated({
+    trx,
+    refundVendorCredit,
+    vendorCredit,
+  }: IRefundVendorCreditCreatedPayload) {
+    await this.refundVendorCreditGLEntries.createRefundVendorCreditGLEntries(
+      refundVendorCredit.id,
+      trx,
+    );
+  }
+
+  /**
+   * Reverts refund vendor credit GL entries once the transaction deleted.
+   * @param {IRefundVendorCreditDeletedPayload} payload -
+   */
+  @OnEvent(events.vendorCredit.onRefundDeleted)
+  async revertRefundVendorCreditGLEntriesOnceDeleted({
+    trx,
+    refundCreditId,
+    oldRefundCredit,
+  }: IRefundVendorCreditDeletedPayload) {
+    await this.refundVendorCreditGLEntries.revertRefundVendorCreditGLEntries(
+      refundCreditId,
+      trx,
+    );
+  }
+}
+

packages/server/src/modules/Warehouses/WarehouseItems.controller.ts

@@ -0,0 +1,37 @@
+import { Controller, Get, Param } from '@nestjs/common';
+import { WarehousesApplication } from './WarehousesApplication.service';
+import {
+  ApiOperation,
+  ApiParam,
+  ApiResponse,
+  ApiTags,
+} from '@nestjs/swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
+
+@Controller('items')
+@ApiTags('Warehouses')
+@ApiCommonHeaders()
+export class WarehouseItemsController {
+  constructor(private warehousesApplication: WarehousesApplication) { }
+
+  @Get(':id/warehouses')
+  @ApiOperation({
+    summary: 'Retrieves the item associated warehouses.',
+  })
+  @ApiResponse({
+    status: 200,
+    description:
+      'The item associated warehouses have been successfully retrieved.',
+  })
+  @ApiResponse({ status: 404, description: 'The item not found.' })
+  @ApiParam({
+    name: 'id',
+    required: true,
+    type: Number,
+    description: 'The item id',
+  })
+  getItemWarehouses(@Param('id') itemId: string) {
+    return this.warehousesApplication.getItemWarehouses(Number(itemId));
+  }
+}
+

packages/server/src/modules/Warehouses/Warehouses.controller.ts

@@ -85,10 +85,4 @@ export class WarehousesController {
   markWarehousePrimary(@Param('id') warehouseId: string) {
     return this.warehousesApplication.markWarehousePrimary(Number(warehouseId));
   }
-
-  @Get('items/:itemId')
-  @ApiOperation({ summary: 'Get item warehouses' })
-  getItemWarehouses(@Param('itemId') itemId: string) {
-    return this.warehousesApplication.getItemWarehouses(Number(itemId));
-  }
 }

packages/server/src/modules/Warehouses/Warehouses.module.ts

@@ -7,6 +7,7 @@ import { CreateWarehouse } from './commands/CreateWarehouse.service';
 import { EditWarehouse } from './commands/EditWarehouse.service';
 import { DeleteWarehouseService } from './commands/DeleteWarehouse.service';
 import { WarehousesController } from './Warehouses.controller';
+import { WarehouseItemsController } from './WarehouseItems.controller';
 import { GetWarehouse } from './queries/GetWarehouse';
 import { WarehouseMarkPrimary } from './commands/WarehouseMarkPrimary.service';
 import { GetWarehouses } from './queries/GetWarehouses';
@@ -47,7 +48,7 @@ const models = [RegisterTenancyModel(Warehouse)];
 
 @Module({
   imports: [TenancyDatabaseModule, ...models],
-  controllers: [WarehousesController],
+  controllers: [WarehousesController, WarehouseItemsController],
   providers: [
     CreateWarehouse,
     EditWarehouse,
@@ -90,6 +91,6 @@ const models = [RegisterTenancyModel(Warehouse)];
     InventoryTransactionsWarehouses,
     ValidateWarehouseExistance
   ],
-  exports: [WarehousesSettings, WarehouseTransactionDTOTransform, ...models],
+  exports: [WarehousesSettings, WarehouseTransactionDTOTransform, WarehousesApplication, ...models],
 })
 export class WarehousesModule {}

packages/webapp/package.json

@@ -8,7 +8,7 @@
     "@bigcapital/utils": "*",
     "@blueprintjs-formik/core": "^0.3.7",
     "@blueprintjs-formik/datetime": "^0.4.0",
-    "@blueprintjs-formik/select": "^0.3.5",
+    "@blueprintjs-formik/select": "^0.4.5",
     "@blueprintjs/colors": "4.1.19",
     "@blueprintjs/core": "^4.20.2",
     "@blueprintjs/datetime": "^4.4.37",

packages/webapp/src/components/Accounts/AccountsMultiSelect.tsx

@@ -96,7 +96,7 @@ export function AccountsMultiSelect({
   };
 
   return (
-    <FMultiSelect<AccountSelect>
+    <FMultiSelect
       {...rest}
       items={filteredAccounts}
       valueAccessor={'id'}

packages/webapp/src/components/Accounts/AccountsSelect.tsx

@@ -6,7 +6,7 @@ import { MenuItem } from '@blueprintjs/core';
 import { MenuItemNestedText, FSelect } from '@/components';
 import { accountPredicate } from './_components';
 import { DialogsName } from '@/constants/dialogs';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
+import { withDialogActions } from '@/containers/Dialog/withDialogActions';
 import { usePreprocessingAccounts } from './_hooks';
 
 // Create new account renderer.

packages/webapp/src/components/Accounts/AccountsSuggestField.tsx

@@ -1,23 +1,34 @@
-// @ts-nocheck
-import React, { useCallback, useMemo } from 'react';
-import * as R from 'ramda';
+import React, { useCallback, ComponentType } from 'react';
 import intl from 'react-intl-universal';
-import classNames from 'classnames';
 import { MenuItem } from '@blueprintjs/core';
-
-import { CLASSES } from '@/constants/classes';
+import { ItemRenderer, ItemPredicate } from '@blueprintjs/select';
 import { DialogsName } from '@/constants/dialogs';
+import { FSuggest, Suggest, FormattedMessage as T } from '@/components';
+import { withDialogActions } from '@/containers/Dialog/withDialogActions';
+import { usePreprocessingAccounts } from './_hooks';
 
-import {
-  FSuggest,
-  MenuItemNestedText,
-  FormattedMessage as T,
-} from '@/components';
-import { nestedArrayToflatten, filterAccountsByQuery } from '@/utils';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
+// Account interface
+interface Account {
+  id: number;
+  name: string;
+  code: string;
+  account_level?: number;
+  account_type?: string;
+  account_parent_type?: string;
+  account_root_type?: string;
+  account_normal?: string;
+}
+
+// Types for renderers and predicates
+type AccountItemRenderer = ItemRenderer<Account>;
+type AccountItemPredicate = ItemPredicate<Account>;
 
 // Create new account renderer.
-const createNewItemRenderer = (query, active, handleClick) => {
+const createNewItemRenderer = (
+  query: string,
+  active: boolean,
+  handleClick: (event: React.MouseEvent<HTMLElement>) => void,
+): React.ReactElement => {
   return (
     <MenuItem
       icon="add"
@@ -29,12 +40,17 @@ const createNewItemRenderer = (query, active, handleClick) => {
 };
 
 // Create new item from the given query string.
-const createNewItemFromQuery = (name) => {
+const createNewItemFromQuery = (name: string): Partial<Account> => {
   return { name };
 };
 
 // Filters accounts items.
-const filterAccountsPredicater = (query, account, _index, exactMatch) => {
+const filterAccountsPredicater: AccountItemPredicate = (
+  query: string,
+  account: Account,
+  _index?: number,
+  exactMatch?: boolean,
+): boolean => {
   const normalizedTitle = account.name.toLowerCase();
   const normalizedQuery = query.toLowerCase();
 
@@ -45,77 +61,139 @@ const filterAccountsPredicater = (query, account, _index, exactMatch) => {
   }
 };
 
-/**
- * Accounts suggest field.
- */
-function AccountsSuggestFieldRoot({
-  // #withDialogActions
-  openDialog,
-
-  // #ownProps
-  accounts,
-  defaultSelectText = intl.formatMessage({ id: 'select_account' }),
-
-  filterByParentTypes = [],
-  filterByTypes = [],
-  filterByNormal,
-  filterByRootTypes = [],
-
-  allowCreate,
-
-  ...suggestProps
-}) {
-  const flattenAccounts = useMemo(
-    () => nestedArrayToflatten(accounts),
-    [accounts],
-  );
-  const filteredAccounts = useMemo(
-    () =>
-      filterAccountsByQuery(flattenAccounts, {
-        filterByParentTypes,
-        filterByTypes,
-        filterByNormal,
-        filterByRootTypes,
-      }),
-    [
-      flattenAccounts,
-      filterByParentTypes,
-      filterByTypes,
-      filterByNormal,
-      filterByRootTypes,
-    ],
-  );
-  const handleCreateItemSelect = useCallback(
-    (item) => {
-      if (!item.id) {
-        openDialog(DialogsName.AccountForm);
-      }
-    },
-    [openDialog],
-  );
-  // Maybe inject new item props to select component.
-  const maybeCreateNewItemRenderer = allowCreate ? createNewItemRenderer : null;
-  const maybeCreateNewItemFromQuery = allowCreate
-    ? createNewItemFromQuery
-    : null;
-
+// Account item renderer for Suggest (non-Formik)
+const accountItemRenderer: AccountItemRenderer = (
+  item: Account,
+  { handleClick, modifiers },
+): React.ReactElement | null => {
+  if (!modifiers.matchesPredicate) {
+    return null;
+  }
   return (
-    <FSuggest
-      items={filteredAccounts}
-      onCreateItemSelect={handleCreateItemSelect}
-      valueAccessor="id"
-      textAccessor="name"
-      labelAccessor="code"
-      inputProps={{ placeholder: defaultSelectText }}
-      resetOnClose
-      popoverProps={{ minimal: true, boundary: 'window' }}
-      createNewItemRenderer={maybeCreateNewItemRenderer}
-      createNewItemFromQuery={maybeCreateNewItemFromQuery}
-      {...suggestProps}
+    <MenuItem
+      active={modifiers.active}
+      disabled={modifiers.disabled}
+      label={item.code}
+      key={item.id}
+      text={item.name}
+      onClick={handleClick}
     />
   );
+};
+
+// Input value renderer for Suggest (non-Formik)
+const inputValueRenderer = (item: Account | null): string => {
+  if (item) {
+    return item.name || '';
+  }
+  return '';
+};
+
+// Props specific to the HOC (excluding component's own props)
+interface AccountsSuggestFieldOwnProps {
+  // #withDialogActions
+  openDialog: (name: string, payload?: any) => void;
+
+  // #ownProps
+  items: Account[];
+  defaultSelectText?: string;
+  filterByParentTypes?: string[];
+  filterByTypes?: string[];
+  filterByNormal?: string;
+  filterByRootTypes?: string[];
+  allowCreate?: boolean;
 }
 
-export const AccountsSuggestField = R.compose(withDialogActions)(
-  AccountsSuggestFieldRoot,
+// Props that the HOC provides to the wrapped component (should be omitted from external props)
+type ProvidedSuggestProps =
+  | 'items'
+  | 'itemPredicate'
+  | 'onCreateItemSelect'
+  | 'valueAccessor'
+  | 'textAccessor'
+  | 'labelAccessor'
+  | 'resetOnClose'
+  | 'createNewItemRenderer'
+  | 'createNewItemFromQuery';
+
+// Utility type to extract props from a component
+type ComponentProps<C> = C extends ComponentType<infer P> ? P : never;
+
+/**
+ * HOC for Accounts Suggest Field logic.
+ * Returns a component that accepts the wrapped component's props minus the ones provided by the HOC.
+ */
+function withAccountsSuggestFieldLogic<C extends ComponentType<any>>(
+  Component: C,
+): ComponentType<
+  AccountsSuggestFieldOwnProps & Omit<ComponentProps<C>, ProvidedSuggestProps>
+> {
+  return function AccountsSuggestFieldLogic({
+    // #withDialogActions
+    openDialog,
+
+    // #ownProps
+    items,
+    defaultSelectText = intl.formatMessage({ id: 'select_account' }),
+
+    filterByParentTypes = [],
+    filterByTypes = [],
+    filterByNormal,
+    filterByRootTypes = [],
+
+    allowCreate,
+
+    // SuggestProps - props that will be passed to Suggest/FSuggest
+    ...suggestProps
+  }: AccountsSuggestFieldOwnProps &
+    Omit<ComponentProps<C>, ProvidedSuggestProps>) {
+    const filteredAccounts = usePreprocessingAccounts(items, {
+      filterByParentTypes,
+      filterByTypes,
+      filterByNormal: filterByNormal ? [filterByNormal] : [],
+      filterByRootTypes,
+    });
+    const handleCreateItemSelect = useCallback(
+      (item: Account | Partial<Account>) => {
+        if (!('id' in item) || !item.id) {
+          openDialog(DialogsName.AccountForm);
+        }
+      },
+      [openDialog],
+    );
+    // Maybe inject new item props to select component.
+    const maybeCreateNewItemRenderer = allowCreate
+      ? createNewItemRenderer
+      : undefined;
+    const maybeCreateNewItemFromQuery = allowCreate
+      ? createNewItemFromQuery
+      : undefined;
+
+    // Build the SuggestProps to pass to the component
+    const processedSuggestProps = {
+      items: filteredAccounts,
+      itemPredicate: filterAccountsPredicater,
+      onCreateItemSelect: handleCreateItemSelect,
+      valueAccessor: 'id' as const,
+      textAccessor: 'name' as const,
+      labelAccessor: 'code' as const,
+      inputProps: { placeholder: defaultSelectText },
+      resetOnClose: true,
+      popoverProps: { minimal: true, boundary: 'window' as const },
+      createNewItemRenderer: maybeCreateNewItemRenderer,
+      createNewItemFromQuery: maybeCreateNewItemFromQuery,
+      ...suggestProps,
+    } as ComponentProps<C>;
+
+    return <Component {...processedSuggestProps} />;
+  };
+}
+const AccountsSuggestFieldWithLogic = withAccountsSuggestFieldLogic(Suggest);
+const FAccountsSuggestFieldWithLogic = withAccountsSuggestFieldLogic(FSuggest);
+
+export const AccountsSuggestField = withDialogActions(
+  AccountsSuggestFieldWithLogic,
+);
+export const FAccountsSuggestField = withDialogActions(
+  FAccountsSuggestFieldWithLogic,
 );

packages/webapp/src/components/AdvancedFilter/AdvancedFilterValueField.tsx

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Position, Checkbox, InputGroup } from '@blueprintjs/core';
 import { DateInput } from '@blueprintjs/datetime';
 import moment from 'moment';
@@ -7,23 +7,29 @@ import intl from 'react-intl-universal';
 import { isUndefined } from 'lodash';
 
 import { useAutofocus } from '@/hooks';
-import { T, Choose, ListSelect } from '@/components';
+import { T, Choose } from '@/components';
+import { Select } from '@/components/Forms';
 import { momentFormatter } from '@/utils';
 
 function AdvancedFilterEnumerationField({ options, value, ...rest }) {
+  const selectedItem = useMemo(
+    () => options.find((opt) => opt.key === value) || null,
+    [options, value],
+  );
+
   return (
-    <ListSelect
+    <Select
       items={options}
-      selectedItem={value}
+      selectedItem={selectedItem}
       popoverProps={{
         fill: true,
         inline: true,
         minimal: true,
         captureDismiss: true,
       }}
-      defaultText={<T id={'filter.select_option'} />}
-      textProp={'label'}
-      selectedItemProp={'key'}
+      placeholder={<T id={'filter.select_option'} />}
+      textAccessor={'label'}
+      valueAccessor={'key'}
       {...rest}
     />
   );

packages/webapp/src/components/AppIntlLoader.tsx

@@ -11,7 +11,7 @@ import { AppIntlProvider } from './AppIntlProvider';
 import { useSplashLoading } from '@/hooks/state';
 
 import { useWatchImmediate } from '../hooks';
-import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
+import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions';
 
 const SUPPORTED_LOCALES = [
   { name: 'English', value: 'en' },

packages/webapp/src/components/Branches/BranchSelect.tsx

@@ -20,12 +20,3 @@ export function BranchSelect({ branches, ...rest }) {
     />
   );
 }
-
-/**
- *
- * @param {*} param0
- * @returns
- */
-export function BranchSelectButton({ label, ...rest }) {
-  return <Button text={label} {...rest} />;
-}

packages/webapp/src/components/Contacts/ContactsMultiSelect.tsx

@@ -2,7 +2,7 @@
 import React, { useCallback } from 'react';
 import * as R from 'ramda';
 import { FMultiSelect } from '../Forms';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
+import { withDrawerActions } from '@/containers/Drawer/withDrawerActions';
 import { DRAWERS } from '@/constants/drawers';
 
 /**

packages/webapp/src/components/Customers/CustomerDrawerLink.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import * as R from 'ramda';
 
 import { ButtonLink } from '../Button';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
+import { withDrawerActions } from '@/containers/Drawer/withDrawerActions';
 import { DRAWERS } from '@/constants/drawers';
 
 function CustomerDrawerLinkComponent({

packages/webapp/src/components/Customers/CustomersSelect.tsx

@@ -4,7 +4,7 @@ import * as R from 'ramda';
 import { useFormikContext } from 'formik';
 import { createNewItemFromQuery, createNewItemRenderer } from './utils';
 import { FSelect } from '../Forms';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
+import { withDrawerActions } from '@/containers/Drawer/withDrawerActions';
 import { useCreateAutofillListener } from '@/hooks/state/autofill';
 import { DRAWERS } from '@/constants/drawers';
 

packages/webapp/src/components/Dashboard/DashboardBackLink.tsx

@@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom';
 
 import { If, Icon } from '@/components';
 import { FormattedMessage as T } from '@/components';
-import withDashboard from '@/containers/Dashboard/withDashboard';
+import { withDashboard } from '@/containers/Dashboard/withDashboard';
 import { compose } from '@/utils';
 
 function DashboardBackLink({ dashboardBackLink, breadcrumbs }) {

packages/webapp/src/components/Dashboard/DashboardPage.tsx

@@ -1,11 +1,11 @@
 // @ts-nocheck
 import React, { useEffect, Suspense } from 'react';
 import { CLASSES } from '@/constants/classes';
-import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
+import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions';
 import { compose } from '@/utils';
 import { Spinner } from '@blueprintjs/core';
 
-import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions';
+import { withUniversalSearchActions } from '@/containers/UniversalSearch/withUniversalSearchActions';
 
 /**
  * Dashboard pages wrapper.

packages/webapp/src/components/Dashboard/DashboardSplitePane.tsx

@@ -3,7 +3,7 @@ import React, { useState, useRef } from 'react';
 import SplitPane from 'react-split-pane';
 import { debounce } from 'lodash';
 
-import withDashboard from '@/containers/Dashboard/withDashboard';
+import { withDashboard } from '@/containers/Dashboard/withDashboard';
 import { compose } from '@/utils';
 
 function DashboardSplitPane({

packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx

@@ -21,10 +21,10 @@ import DashboardTopbarUser from '@/components/Dashboard/TopbarUser';
 import DashboardBreadcrumbs from '@/components/Dashboard/DashboardBreadcrumbs';
 import DashboardBackLink from '@/components/Dashboard/DashboardBackLink';
 
-import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions';
-import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
-import withDashboard from '@/containers/Dashboard/withDashboard';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
+import { withUniversalSearchActions } from '@/containers/UniversalSearch/withUniversalSearchActions';
+import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions';
+import { withDashboard } from '@/containers/Dashboard/withDashboard';
+import { withDialogActions } from '@/containers/Dialog/withDialogActions';
 
 import QuickNewDropdown from '@/containers/QuickNewDropdown/QuickNewDropdown';
 import {

packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx

@@ -3,9 +3,9 @@ import React from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useHistory } from 'react-router-dom';
 import { getDashboardRoutes } from '@/routes/dashboard';
-import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
-import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions';
+import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions';
+import { withDialogActions } from '@/containers/Dialog/withDialogActions';
+import { withUniversalSearchActions } from '@/containers/UniversalSearch/withUniversalSearchActions';
 
 import { compose } from '@/utils';
 

packages/webapp/src/components/Dashboard/SplashScreen.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import * as R from 'ramda';
 import BigcapitalLoading from './BigcapitalLoading';
-import withDashboard from '@/containers/Dashboard/withDashboard';
+import { withDashboard } from '@/containers/Dashboard/withDashboard';
 
 function SplashScreenComponent({ splashScreenLoading }) {
   return splashScreenLoading ? <BigcapitalLoading /> : null;

packages/webapp/src/components/Dashboard/TopbarUser.tsx

@@ -13,7 +13,7 @@ import { FormattedMessage as T } from '@/components';
 
 import { useAuthActions } from '@/hooks/state';
 
-import withDialogActions from '@/containers/Dialog/withDialogActions';
+import { withDialogActions } from '@/containers/Dialog/withDialogActions';
 
 import { useAuthenticatedAccount } from '@/hooks/query';
 import { firstLettersArgs, compose } from '@/utils';

packages/webapp/src/components/DataTableCells/AccountsListFieldCell.tsx

@@ -58,9 +58,9 @@ export default function AccountCellRenderer({
       {...formGroupProps}
     >
       <AccountsSuggestField
-        accounts={accounts}
-        onAccountSelected={handleAccountSelected}
-        selectedAccountId={initialValue}
+        items={accounts}
+        onItemSelect={handleAccountSelected}
+        selectedValue={initialValue}
         filterByRootTypes={filterAccountsByRootTypes}
         filterByTypes={filterAccountsByTypes}
         inputProps={{