test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

Merge pull request #563 from frappe/develop

Browse Source
This commit is contained in:
Shariq Ansari 2025-02-03 13:12:56 +05:30 committed by GitHub
commit d9421af90e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/ColumnSettings.vue
View File

@ -210,7 +210,7 @@ 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)
})
})
@ -218,8 +218,8 @@ 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,
}

5
frontend/src/components/Modals/DealModal.vue
View File

@ -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
}

5
frontend/src/components/Modals/LeadModal.vue
View File

@ -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
}