fix: payment account

models/baseModels/Invoice/Invoice.ts

@@ -26,6 +26,7 @@ import { Payment } from '../Payment/Payment';
 import { Tax } from '../Tax/Tax';
 import { TaxSummary } from '../TaxSummary/TaxSummary';
 import { isPesa } from 'fyo/utils';
+import { AccountFieldEnum, PaymentTypeEnum } from '../Payment/types';
 
 export abstract class Invoice extends Transactional {
   _taxes: Record<string, Tax> = {};
@@ -732,18 +733,28 @@ export abstract class Invoice extends Transactional {
       return null;
     }
 
-    const accountField =
-      this.isSales && !this.outstandingAmount?.isNegative()
-        ? 'account'
-        : 'paymentAccount';
+    let accountField: AccountFieldEnum = AccountFieldEnum.Account;
+    let paymentType: PaymentTypeEnum = PaymentTypeEnum.Receive;
+
+    if (this.isSales && this.isItemsReturned) {
+      accountField = AccountFieldEnum.PaymentAccount;
+      paymentType = PaymentTypeEnum.Pay;
+    }
+
+    if (!this.isSales) {
+      accountField = AccountFieldEnum.PaymentAccount;
+      paymentType = PaymentTypeEnum.Pay;
+
+      if (this.isItemsReturned) {
+        accountField = AccountFieldEnum.Account;
+        paymentType = PaymentTypeEnum.Receive;
+      }
+    }
 
     const data = {
       party: this.party,
       date: new Date().toISOString().slice(0, 10),
-      paymentType:
-        this.isSales && !this.outstandingAmount?.isNegative()
-          ? 'Receive'
-          : 'Pay',
+      paymentType,
       amount: this.outstandingAmount?.abs(),
       [accountField]: this.account,
       for: [

models/baseModels/Payment/Payment.ts

@@ -439,6 +439,15 @@ export class Payment extends Transactional {
       'referenceName'
     )) as Invoice | null;
 
+    if (
+      refDoc &&
+      refDoc.schema.name === ModelNameEnum.SalesInvoice &&
+      refDoc.isItemsReturned
+    ) {
+      const accountsMap = await this._getAccountsMap();
+      return accountsMap[AccountTypeEnum.Cash]?.[0];
+    }
+
     return refDoc?.account ?? null;
   }
 

models/baseModels/Payment/types.ts

@@ -1,2 +1,12 @@
 export type PaymentType = 'Receive' | 'Pay';
 export type PaymentMethod = 'Cash' | 'Cheque' | 'Transfer';
+
+export enum PaymentTypeEnum{
+    Receive = 'Receive', 
+    Pay = 'Pay'
+}
+
+export enum AccountFieldEnum{
+    Account = 'account',
+    PaymentAccount = 'paymentAccount'
+}