add the option to turn off item account filtering

So that items can be assets
frappe · Nov 29, 2023 · 0386b08 · 0386b08
1 parent 814845f
commit 0386b08
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
@@ -58,16 +58,28 @@ export class Item extends Doc {
   };
 
   static filters: FiltersMap = {
-    incomeAccount: () => ({
-      isGroup: false,
-      rootType: AccountRootTypeEnum.Income,
-    }),
-    expenseAccount: (doc) => ({
-      isGroup: false,
-      rootType: doc.trackItem
-        ? AccountRootTypeEnum.Liability
-        : AccountRootTypeEnum.Expense,
-    }),
+    incomeAccount: (doc) => {
+      if (doc.fyo.singles.AccountingSettings?.itemAccountFiltering) {
+        return {
+          isGroup: false,
+          rootType: AccountRootTypeEnum.Income
+        }
+      } else {
+        return {isGroup: false}
+      }
+    },
+    expenseAccount: (doc) => {
+      if (doc.fyo.singles.AccountingSettings?.itemAccountFiltering) {
+        return {
+          isGroup: false,
+          rootType: doc.trackItem
+            ? AccountRootTypeEnum.Liability
+            : AccountRootTypeEnum.Expense
+        }
+      } else {
+        return {isGroup: false}
+      }
+    },
   };
 
   validations: ValidationMap = {

diff --git a/schemas/app/AccountingSettings.json b/schemas/app/AccountingSettings.json
@@ -100,6 +100,13 @@
       "default": false,
       "section": "Features"
     },
+    {
+      "fieldname": "itemAccountFiltering",
+      "label": "Filter out non expense accounts for items",
+      "fieldtype": "Check",
+      "default": true,
+      "section": "Features"
+    },
     {
       "fieldname": "fiscalYearStart",
       "label": "Fiscal Year Start Date",