Merge pull request #360 from 18alantom/item-segregation

feat: Item segregation by purpose
frappe · Mar 10, 2022 · 500c2bb · 500c2bb
2 parents b4397a9 + 17663b2
commit 500c2bb
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 22 deletions.
diff --git a/models/doctype/Item/Item.js b/models/doctype/Item/Item.js
@@ -1,5 +1,11 @@
 import frappe, { t } from 'frappe';
 
+const itemForMap = {
+  purchases: t`Purchases`,
+  sales: t`Sales`,
+  both: t`Both`,
+};
+
 export default {
   name: 'Item',
   label: t`Item`,
@@ -42,6 +48,14 @@ export default {
       default: 'Product',
       options: ['Product', 'Service'],
     },
+    {
+      fieldname: 'for',
+      label: t`For`,
+      fieldtype: 'Select',
+      options: Object.keys(itemForMap),
+      map: itemForMap,
+      default: 'both',
+    },
     {
       fieldname: 'incomeAccount',
       label: t`Income`,
@@ -115,6 +129,7 @@ export default {
     'rate',
     'unit',
     'itemType',
+    'for',
     'tax',
     'description',
     'incomeAccount',

diff --git a/models/doctype/Payment/Payment.js b/models/doctype/Payment/Payment.js
@@ -2,6 +2,11 @@ import frappe, { t } from 'frappe';
 import utils from '../../../accounting/utils';
 import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
 
+const paymentTypeMap = {
+  Receive: t`Receive`,
+  Pay: t`Pay`,
+};
+
 export default {
   name: 'Payment',
   label: t`Payment`,
@@ -57,7 +62,8 @@ export default {
       label: t`Payment Type`,
       fieldtype: 'Select',
       placeholder: 'Payment Type',
-      options: ['Receive', 'Pay'],
+      options: Object.keys(paymentTypeMap),
+      map: paymentTypeMap,
       required: 1,
     },
     {

diff --git a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
@@ -14,11 +14,16 @@ export default {
       required: 1,
       getFilters(_, doc) {
         let items = doc.parentdoc.items.map((d) => d.item).filter(Boolean);
-        if (items.length > 0) {
-          return {
-            name: ['not in', items],
-          };
+
+        const baseFilter = { for: ['not in', ['sales']] };
+        if (items.length <= 0) {
+          return baseFilter;
         }
+
+        return {
+          name: ['not in', items],
+          ...baseFilter,
+        };
       },
     },
     {

diff --git a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
@@ -15,11 +15,16 @@ export default {
       required: 1,
       getFilters(_, doc) {
         let items = doc.parentdoc.items.map((d) => d.item).filter(Boolean);
-        if (items.length > 0) {
-          return {
-            name: ['not in', items],
-          };
+
+        const baseFilter = { for: ['not in', ['purchases']] };
+        if (items.length <= 0) {
+          return baseFilter;
         }
+
+        return {
+          name: ['not in', items],
+          ...baseFilter,
+        };
       },
     },
     {

diff --git a/src/router.js b/src/router.js
@@ -54,15 +54,19 @@ const routes = [
     },
   },
   {
-    path: '/list/:doctype',
+    path: '/list/:doctype/:fieldname?/:value?',
     name: 'ListView',
     components: {
       default: ListView,
       edit: QuickEditForm,
     },
     props: {
       default: (route) => {
-        const { doctype, filters } = route.params;
+        let { doctype, filters, fieldname, value } = route.params;
+        if (filters === undefined && fieldname && value) {
+          filters = { [fieldname]: value };
+        }
+
         return {
           doctype,
           filters,

diff --git a/src/sidebarConfig.js b/src/sidebarConfig.js
@@ -28,11 +28,21 @@ const config = {
           route: '/list/SalesInvoice',
           doctype: 'SalesInvoice',
         },
+        {
+          label: t`Payments`,
+          route: '/list/Payment/paymentType/Receive',
+          doctype: 'Payment',
+        },
         {
           label: t`Customers`,
           route: '/list/Customer',
           doctype: 'Customer',
         },
+        {
+          label: t`Sales Items`,
+          route: '/list/Item/for/sales',
+          doctype: 'Item',
+        },
       ],
     },
     {
@@ -45,33 +55,38 @@ const config = {
           route: '/list/PurchaseInvoice',
           doctype: 'PurchaseInvoice',
         },
+        {
+          label: t`Payments`,
+          route: '/list/Payment/paymentType/Pay',
+          doctype: 'Payment',
+        },
         {
           label: t`Suppliers`,
           route: '/list/Supplier',
           doctype: 'Supplier',
         },
+        {
+          label: t`Purchase Items`,
+          route: '/list/Item/for/purchases',
+          doctype: 'Item',
+        },
       ],
     },
     {
       icon: 'common-entries',
       title: t`Common`,
-      route: '/list/Item',
+      route: '/list/JournalEntry',
       items: [
-        {
-          label: t`Items`,
-          route: '/list/Item',
-          doctype: 'Item',
-        },
-        {
-          label: t`Payments`,
-          route: '/list/Payment',
-          doctype: 'Payment',
-        },
         {
           label: t`Journal Entry`,
           route: '/list/JournalEntry',
           doctype: 'JournalEntry',
         },
+        {
+          label: t`Common Items`,
+          route: '/list/Item/for/both',
+          doctype: 'Item',
+        },
       ],
     },
     {