Skip to content

fix: surface deal value instead of annual revenue #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
longnguyen-osg wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: surface deal value instead of annual revenue #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crm/fcrm/doctype/crm_deal/crm_deal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ def default_list_data():
"width": "11rem",
},
{
"label": "Annual Revenue",
"label": "Deal Value",
"type": "Currency",
"key": "annual_revenue",
"key": "deal_value",
"align": "right",
"width": "9rem",
},
Expand Down Expand Up @@ -303,7 +303,7 @@ def default_list_data():
rows = [
"name",
"organization",
"annual_revenue",
"deal_value",
"status",
"email",
"currency",
Expand Down
3 changes: 0 additions & 3 deletions frontend/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ declare module 'vue' {
DurationIcon: typeof import('./src/components/Icons/DurationIcon.vue')['default']
EditEmailTemplate: typeof import('./src/components/Settings/EmailTemplate/EditEmailTemplate.vue')['default']
EditIcon: typeof import('./src/components/Icons/EditIcon.vue')['default']
EditLeadSyncSource: typeof import('./src/components/Settings/LeadSyncing/EditLeadSyncSource.vue')['default']
EditValueModal: typeof import('./src/components/Modals/EditValueModal.vue')['default']
Email2Icon: typeof import('./src/components/Icons/Email2Icon.vue')['default']
EmailAccountCard: typeof import('./src/components/Settings/EmailAccountCard.vue')['default']
Expand Down Expand Up @@ -181,7 +180,6 @@ declare module 'vue' {
LeadModal: typeof import('./src/components/Modals/LeadModal.vue')['default']
LeadsIcon: typeof import('./src/components/Icons/LeadsIcon.vue')['default']
LeadsListView: typeof import('./src/components/ListViews/LeadsListView.vue')['default']
LeadSyncSettings: typeof import('./src/components/Settings/LeadSyncing/LeadSyncSettings.vue')['default']
LeadSyncSourceForm: typeof import('./src/components/Settings/LeadSyncing/LeadSyncSourceForm.vue')['default']
LeadSyncSourcePage: typeof import('./src/components/Settings/LeadSyncing/LeadSyncSourcePage.vue')['default']
LeadSyncSources: typeof import('./src/components/Settings/LeadSyncing/LeadSyncSources.vue')['default']
Expand Down Expand Up @@ -212,7 +210,6 @@ declare module 'vue' {
MultipleAvatar: typeof import('./src/components/MultipleAvatar.vue')['default']
MuteIcon: typeof import('./src/components/Icons/MuteIcon.vue')['default']
NewEmailTemplate: typeof import('./src/components/Settings/EmailTemplate/NewEmailTemplate.vue')['default']
NewLeadSyncSource: typeof import('./src/components/Settings/LeadSyncing/NewLeadSyncSource.vue')['default']
NoteArea: typeof import('./src/components/Activities/NoteArea.vue')['default']
NoteIcon: typeof import('./src/components/Icons/NoteIcon.vue')['default']
NoteModal: typeof import('./src/components/Modals/NoteModal.vue')['default']
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/pages/MobileOrganization.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ const deals = createListResource({
'name',
'organization',
'currency',
'annual_revenue',
'deal_value',
'status',
'email',
'mobile_no',
Expand Down Expand Up @@ -414,7 +414,7 @@ function getDealRowObject(deal) {
label: deal.organization,
logo: organization.doc?.organization_logo,
},
annual_revenue: getFormattedCurrency('annual_revenue', deal),
deal_value: getFormattedCurrency('deal_value', deal),
status: {
label: deal.status,
color: getDealStatus(deal.status)?.color,
Expand Down Expand Up @@ -460,8 +460,8 @@ const dealColumns = [
width: '11rem',
},
{
label: __('Amount'),
key: 'annual_revenue',
label: __('Deal Value'),
key: 'deal_value',
align: 'right',
width: '9rem',
},
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/pages/Organization.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ const deals = createListResource({
'name',
'organization',
'currency',
'annual_revenue',
'deal_value',
'status',
'email',
'mobile_no',
Expand Down Expand Up @@ -446,7 +446,7 @@ function getDealRowObject(deal) {
label: deal.organization,
logo: organization.doc?.organization_logo,
},
annual_revenue: getFormattedCurrency('annual_revenue', deal),
deal_value: getFormattedCurrency('deal_value', deal),
status: {
label: deal.status,
color: getDealStatus(deal.status)?.color,
Expand Down Expand Up @@ -492,8 +492,8 @@ const dealColumns = [
width: '11rem',
},
{
label: __('Amount'),
key: 'annual_revenue',
label: __('Deal Value'),
key: 'deal_value',
align: 'right',
width: '9rem',
},
Expand Down