@tomei/finance 0.3.93 → 0.3.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.3.93",
+  "version": "0.3.95",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {

package/src/customer/customer.ts

@@ -132,11 +132,6 @@ export default abstract class FinanceCustomerBase
       if (this._AccountReceivable) {
         resolve(this._AccountReceivable);
       } else {
-        // FinanceDb.getConnection()
-        //   .transaction()
-        // transaction
-        //   .then((t) => {
-        //     transaction = t;
         return (
           FinanceCustomerBase._AccountRepository
             .findOne({
@@ -183,11 +178,6 @@ export default abstract class FinanceCustomerBase
       if (this._AccountPayable) {
         resolve(this._AccountPayable);
       } else {
-        // FinanceDb.getConnection()
-        //   .transaction()
-        // transaction
-        //   .then((t) => {
-        //     transaction = t;
         return (
           FinanceCustomerBase._AccountRepository
             .findOne({
@@ -269,6 +259,7 @@ export default abstract class FinanceCustomerBase
     custSystemRefId: string,
     custSystemCode: string,
     sFinanceCompanyId: string,
+    dbTransaction?: any,
   ): Promise<boolean> {
     const data = await FinanceCustomerBase._FinanceCustomerRepository.findAll({
       where: {
@@ -276,6 +267,7 @@ export default abstract class FinanceCustomerBase
         CustSystemCode: custSystemCode,
         CompanyId: sFinanceCompanyId,
       },
+      transaction: dbTransaction,
     });
 
     if (data.length > 0) {

package/src/finance-company/finance-company.ts

@@ -638,20 +638,17 @@ export default class FinanceCompany extends ObjectBase {
 
       const savedItems = htCreditAccountAmount.list();
 
-      for (let i = 0; i < savedItems.length; i++) {
+      for (const item of savedItems) {
         const journalEntry = new JournalEntry(dbTransaction);
         //Temporary fix to successfully save journal entry in PostJournal
         journalEntry.init({
           CompanyId: this.CompanyId,
           Name: 'Issue Invoice ' + invoice.DocNo,
         });
-        const account = await Account.initAccount(
-          dbTransaction,
-          savedItems[i].value[0],
-        );
-        const creditAmount = savedItems[i].value[1];
-        const currency = htCreditAccountCurrency.get(savedItems[i].value[0]);
-        const purpose = htCreditAccountPurpose.get(savedItems[i].value[0]);
+        const account = await Account.initAccount(dbTransaction, item.value[0]);
+        const creditAmount = item.value[1];
+        const currency = htCreditAccountCurrency.get(item.value[0]);
+        const purpose = htCreditAccountPurpose.get(item.value[0]);
 
         const dt = await journalEntry.newLedgerTransaction(
           TransactionTypeOptions.DEBIT,
@@ -668,14 +665,14 @@ export default class FinanceCompany extends ObjectBase {
         dt.Currency = currency ? currency : 'MYR';
         dt.DebitAmount = creditAmount ? creditAmount : 0.0;
         dt.Date = transactionDate;
-        dt.Description = `Transaction for ${purpose} - ${savedItems[i].value[0]}`;
+        dt.Description = `Transaction for ${purpose}`;
         dt.Name = `Transaction for ${purpose}`;
         dt.RelatedDocNo = invoice.DocNo;
 
         const ct = await journalEntry.newLedgerTransaction(
           TransactionTypeOptions.CREDIT,
         );
-        ct.AccountNo = savedItems[i].value[0];
+        ct.AccountNo = item.value[0];
         ct.Currency = currency ? currency : 'MYR';
         ct.CreditAmount = creditAmount ? creditAmount : 0.0;
         ct.Date = transactionDate;