Merge pull request #563 from frappe/develop

Author: shariquerik

frontend/src/components/ColumnSettings.vue

@@ -210,16 +210,16 @@ const fields = computed(() => {
   if (!allFields) return []
 
   return allFields.filter((field) => {
-    return !columns.value.find((column) => column.key === field.value)
+    return !columns.value.find((column) => column.key === field.fieldname)
   })
 })
 
 function addColumn(c) {
   let align = ['Float', 'Int', 'Percent', 'Currency'].includes(c.type) ? 'right' : 'left'
   let _column = {
     label: c.label,
-    type: c.type,
-    key: c.value,
+    type: c.fieldtype,
+    key: c.fieldname,
     width: '10rem',
     align,
   }

frontend/src/components/Modals/DealModal.vue

@@ -197,8 +197,9 @@ function createDeal() {
     validate() {
       error.value = null
       if (deal.annual_revenue) {
-        deal.annual_revenue = deal.annual_revenue.replace(/,/g, '')
-        if (isNaN(deal.annual_revenue)) {
+        if (typeof deal.annual_revenue === 'string') {
+          deal.annual_revenue = deal.annual_revenue.replace(/,/g, '')
+        } else if (isNaN(deal.annual_revenue)) {
           error.value = __('Annual Revenue should be a number')
           return error.value
         }

frontend/src/components/Modals/LeadModal.vue

@@ -140,8 +140,9 @@ function createNewLead() {
         return error.value
       }
       if (lead.annual_revenue) {
-        lead.annual_revenue = lead.annual_revenue.replace(/,/g, '')
-        if (isNaN(lead.annual_revenue)) {
+        if (typeof lead.annual_revenue === 'string') {
+          lead.annual_revenue = lead.annual_revenue.replace(/,/g, '')
+        } else if (isNaN(lead.annual_revenue)) {
           error.value = __('Annual Revenue should be a number')
           return error.value
         }