fix: filter Item Visibility

Author: Gadha2311

models/baseModels/InvoiceItem/InvoiceItem.ts

@@ -19,11 +19,7 @@ import { Item } from '../Item/Item';
 import { StockTransfer } from 'models/inventory/StockTransfer';
 import { isPesa } from 'fyo/utils';
 import { PricingRule } from '../PricingRule/PricingRule';
-import {
-  getItemRateFromPriceList,
-  getItemVisibility,
-  getPricingRule,
-} from 'models/helpers';
+import { getItemRateFromPriceList, getPricingRule } from 'models/helpers';
 import { SalesInvoice } from '../SalesInvoice/SalesInvoice';
 import { QueryFilter } from 'utils/db/types';
 
@@ -635,7 +631,7 @@ export abstract class InvoiceItem extends Doc {
   };
 
   static filters: FiltersMap = {
-    item: async (doc: Doc) => {
+    item: (doc: Doc) => {
       let itemNotFor = 'Sales';
       if (doc.isSales) {
         itemNotFor = 'Purchases';
@@ -645,13 +641,32 @@ export abstract class InvoiceItem extends Doc {
         for: ['not in', [itemNotFor]],
       };
 
-      const itemVisibility = await getItemVisibility(doc.fyo);
+      const accountingSettings = doc.fyo.singles?.AccountingSettings;
+      const inventorySettings = doc.fyo.singles?.InventorySettings;
+
+      if (accountingSettings?.enablePointOfSaleWithOutInventory) {
+        const posSettings = doc.fyo.singles?.POSSettings;
+
+        const posItemVisibility = posSettings?.itemVisibility;
+
+        if (posItemVisibility === 'Inventory Items') {
+          return { ...baseFilter, trackItem: true };
+        }
+
+        if (posItemVisibility === 'Non-Inventory Items') {
+          return { ...baseFilter, trackItem: false };
+        }
+
+        return baseFilter;
+      }
+
+      const invItemVisibility = inventorySettings?.itemVisibility;
 
-      if (itemVisibility === 'Inventory Items') {
+      if (invItemVisibility === 'Inventory Items') {
         return { ...baseFilter, trackItem: true };
       }
 
-      if (itemVisibility === 'Non-Inventory Items') {
+      if (invItemVisibility === 'Non-Inventory Items') {
         return { ...baseFilter, trackItem: false };
       }
 

schemas/app/inventory/InventorySettings.json

@@ -12,6 +12,24 @@
       "create": true,
       "section": "Default"
     },
+    {
+      "fieldname": "itemVisibility",
+      "label": "Item Visibility",
+      "fieldtype": "Select",
+      "options": [
+        {
+          "value": "Inventory Items",
+          "label": "Inventory Items"
+        },
+        {
+          "value": "Non-Inventory Items",
+          "label": "Non-Inventory Items"
+        }
+      ],
+      "default": "Non-Inventory Items",
+      "required": true,
+      "section": "Default"
+    },
     {
       "fieldname": "stockInHand",
       "label": "Stock In Hand Acc.",

src/utils/ui.ts

@@ -292,9 +292,15 @@ function getDuplicateAction(doc: Doc): Action {
 }
 
 function getNewAction(doc: Doc): Action {
+  const isSubmittable = !!doc.schema.isSubmittable;
   return {
     label: t`New Entry`,
     group: t`Create`,
+    condition: (doc: Doc) =>
+      !!(
+        ((isSubmittable && doc.submitted) || !isSubmittable) &&
+        !doc.notInserted
+      ),
     async action() {
       try {
         const newDoc = fyo.doc.getNewDoc(doc.schemaName);