fix: Advance Wallet changes - should not add company account to payme…

…nt mode when advance wallet id is present (#3073)
fylein · Jun 13, 2024 · f7f4f03 · f7f4f03
1 parent c7bfdb7
commit f7f4f03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/app/core/services/accounts.service.ts b/src/app/core/services/accounts.service.ts
@@ -290,7 +290,7 @@ export class AccountsService {
     }
 
     //Add current expense account to allowedPaymentModes if it is not present
-    if (etxn?.source?.account_id) {
+    if (etxn?.source?.account_id && !etxn?.tx?.advance_wallet_id) {
       let paymentModeOfExpense = etxn.source.account_type;
       if (etxn.source.account_type === AccountType.PERSONAL && etxn.tx.skip_reimbursement) {
         paymentModeOfExpense = AccountType.COMPANY;

diff --git a/src/app/core/services/org-settings.service.ts b/src/app/core/services/org-settings.service.ts
@@ -142,6 +142,7 @@ export class OrgSettingsService {
         advance_wallets_enabled:
           incoming.advances_settings &&
           incoming.advances_settings.allowed &&
+          incoming.advances_settings.enabled &&
           incoming.advances_settings.advance_wallets_enabled,
       },
       projects: {