From d86cd90d6fca5ee26a1c54eb07e74efd0d05ab97 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 25 Aug 2023 12:37:02 +0530
Subject: [PATCH] fix(ux): rename party to context based - move country before
 state - rename track item to track inventory

---
 schemas/app/Address.json         | 14 +++++++-------
 schemas/app/Invoice.json         |  6 +-----
 schemas/app/Item.json            |  2 +-
 schemas/app/PurchaseInvoice.json |  9 +++++++++
 schemas/app/SalesInvoice.json    |  9 +++++++++
 src/components/Toast.vue         |  3 +--
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/schemas/app/Address.json b/schemas/app/Address.json
index 6589b110..e0b3ecda 100644
--- a/schemas/app/Address.json
+++ b/schemas/app/Address.json
@@ -30,13 +30,6 @@
       "fieldtype": "Data",
       "required": true
     },
-    {
-      "fieldname": "state",
-      "label": "State",
-      "placeholder": "State",
-      "options": [],
-      "fieldtype": "AutoComplete"
-    },
     {
       "fieldname": "country",
       "label": "Country",
@@ -45,6 +38,13 @@
       "options": [],
       "required": true
     },
+    {
+      "fieldname": "state",
+      "label": "State",
+      "placeholder": "State",
+      "options": [],
+      "fieldtype": "AutoComplete"
+    },
     {
       "fieldname": "postalCode",
       "label": "Postal Code",
diff --git a/schemas/app/Invoice.json b/schemas/app/Invoice.json
index 9cd26bf5..af213ec3 100644
--- a/schemas/app/Invoice.json
+++ b/schemas/app/Invoice.json
@@ -20,12 +20,8 @@
       "section": "Default"
     },
     {
+      "abstract": true,
       "fieldname": "party",
-      "label": "Party",
-      "fieldtype": "Link",
-      "target": "Party",
-      "create": true,
-      "required": true,
       "section": "Default"
     },
     {
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index 3adaed2c..72ca62f8 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -126,7 +126,7 @@
     },
     {
       "fieldname": "trackItem",
-      "label": "Track Item",
+      "label": "Track Inventory",
       "fieldtype": "Check",
       "section": "Inventory",
       "default": false
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 4cfa1f86..708ae1ef 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -15,6 +15,15 @@
       "default": "PINV-",
       "section": "Default"
     },
+    {
+      "fieldname": "party",
+      "label": "Supplier",
+      "fieldtype": "Link",
+      "target": "Party",
+      "create": true,
+      "required": true,
+      "section": "Default"
+    },
     {
       "fieldname": "backReference",
       "label": "Back Reference",
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 6125e1ae..73100e93 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -15,6 +15,15 @@
       "default": "SINV-",
       "section": "Default"
     },
+    {
+      "fieldname": "party",
+      "label": "Customer",
+      "fieldtype": "Link",
+      "target": "Party",
+      "create": true,
+      "required": true,
+      "section": "Default"
+    },
     {
       "fieldname": "backReference",
       "label": "Back Reference",
diff --git a/src/components/Toast.vue b/src/components/Toast.vue
index b0d0c4c7..ae7b9821 100644
--- a/src/components/Toast.vue
+++ b/src/components/Toast.vue
@@ -52,11 +52,10 @@
   </Teleport>
 </template>
 <script lang="ts">
-import { getColorClass } from 'src/utils/colors';
 import { getIconConfig } from 'src/utils/interactive';
 import { ToastDuration, ToastType } from 'src/utils/types';
 import { toastDurationMap } from 'src/utils/ui';
-import { defineComponent, nextTick, PropType } from 'vue';
+import { PropType, defineComponent, nextTick } from 'vue';
 import FeatherIcon from './FeatherIcon.vue';
 
 export default defineComponent({