3056 Commits

Author SHA1 Message Date
Shariq Ansari
a7bc3abcdd fix: show lost reason modal if status changed to lost
(cherry picked from commit d89c304b134a7ec1f7a16bc667f2ee13858daac9)

# Conflicts:
#	frontend/components.d.ts
2025-07-02 10:34:37 +00:00
Shariq Ansari
9b315c2e0c refactor: statusOptions code
(cherry picked from commit 881126c7f1145fb2db1143b63c1e0f2f81ebb2ea)
2025-07-02 10:34:36 +00:00
Shariq Ansari
6647a83485 fix: renamed other_lost_reason to lost_notes
(cherry picked from commit 5bbec00803e299c3d997bd5d3335ef2a4ab78028)
2025-07-02 10:34:36 +00:00
Shariq Ansari
040692c13c fix: removed unused triggerOnChange
(cherry picked from commit 7730e46cfc2c0886c9bb1237d1558c31a05be712)
2025-07-02 10:34:36 +00:00
Shariq Ansari
e0cdeea2f9 fix: made lost notes as text and non mandatory if lost reason is not Other
(cherry picked from commit 97b2253e9d464e5a25dd1de8ffadd9d513cb3fda)
2025-07-02 10:34:35 +00:00
Shariq Ansari
6aa4a03b0f chore: resolved conflict
(cherry picked from commit 92d728072843b1449cb2e2e626cde7a218e68530)
2025-07-02 10:34:35 +00:00
Shariq Ansari
252fe05edc feat: created lost reason doctype
(cherry picked from commit 5d01b88a1e949f8388d8ca9f3e6ef62fe30a977a)
2025-07-02 10:34:35 +00:00
Shariq Ansari
b027ff0e73
Merge pull request #999 from frappe/mergify/bp/main-hotfix/pr-998
fix: show absolute day count not in decimals (backport #998)
2025-07-01 19:24:56 +05:30
Shariq Ansari
59e762d658 fix: show absolute day count not in decimels
(cherry picked from commit a7dc5e05b3b5dff845b8c5cf32b3dc540e85e9ad)
2025-07-01 13:54:13 +00:00
Shariq Ansari
5e0bc3c448
Merge pull request #995 from frappe/mergify/bp/main-hotfix/pr-994
fix: Forecasting fixes (backport #994)
2025-07-01 16:55:57 +05:30
Shariq Ansari
4cfe106144 fix: show forcasted sales section in sidepanel if forecasting is enabled
(cherry picked from commit 485360f29194a95749b1a6fd27108bec03b37b50)
2025-07-01 11:20:53 +00:00
Shariq Ansari
b1ea3edceb fix: add mandatory fields in convert to deal modal if not added
(cherry picked from commit 17fdbb05cedad890631465d1ad64fbc502dd00c9)
2025-07-01 11:20:53 +00:00
Shariq Ansari
57fb8b3abe fix: show error message on convert to deal modal
(cherry picked from commit adc22efcb1e20eda3c0c3b897e5c5456ccf67b98)
2025-07-01 11:20:52 +00:00
Shariq Ansari
08243530e7 fix: mandatory error
(cherry picked from commit 4c70b1a06bff81aac6baacffe34d624c7e3c4b86)
2025-07-01 11:20:52 +00:00
Shariq Ansari
47002deed6 fix: made deal value mandatory if forecasting is enabled
(cherry picked from commit 4f58aa110a39b431e58d1fd86c2dfe8e41d0034c)
2025-07-01 11:20:52 +00:00
Shariq Ansari
e3510b0e9c fix: added default probability to Lost status
(cherry picked from commit 4d3fe722e86a1e91e056418a173ad30f1a1b6c63)
2025-07-01 11:20:52 +00:00
Shariq Ansari
2cd08bebb9 refactor: moved convert to deal modal into separate component
(cherry picked from commit 6320e580ae556df683d50b5145e39039968ad9ad)
2025-07-01 11:20:51 +00:00
Shariq Ansari
336ac2ad34 fix: prettyDate is not accurate
(cherry picked from commit 611f4cde70d7d4d14f823b1875c57bc75fa66c0f)
2025-07-01 11:20:51 +00:00
Shariq Ansari
29132f6f23 fix: add default probabilities in deal status
(cherry picked from commit 6d3268a61ecd96710f2c7d1cede33a5cc6f939d6)
2025-07-01 11:20:51 +00:00
Shariq Ansari
76b5a2d7bb
Merge pull request #992 from frappe/mergify/bp/main-hotfix/pr-991
fix: show edit call log button in call log details modal (backport #991)
2025-07-01 11:53:47 +05:30
Shariq Ansari
c8c7a95ac0 fix: show edit call log button in call log details modal
(cherry picked from commit 693c0869302de05ae2b956542e51caf5ce732b57)
2025-07-01 06:23:08 +00:00
Shariq Ansari
c1203d465a
Merge branch 'main' into main-hotfix 2025-06-30 20:15:43 +05:30
Shariq Ansari
c8f7f9552b
Merge pull request #989 from frappe/mergify/bp/main-hotfix/pr-988
fix: get reference doc in onBeforeCreate hook of call log modal (backport #988)
2025-06-30 20:09:38 +05:30
Shariq Ansari
a04b9f5a5e fix: pass reference doc to call log modal to get reference doc in on before create
(cherry picked from commit aae7e0e36cf86f7be76fc9e6fcc22f57fd5b56e3)
2025-06-30 14:36:45 +00:00
Shariq Ansari
01b43747b8
Merge pull request #987 from frappe/mergify/bp/main-hotfix/pr-985 2025-06-30 19:47:15 +05:30
Shariq Ansari
f6af8d562e fix: added on before create hook in all modals
(cherry picked from commit 2e5c1bc3b564a9c7e1dd49f521cd4ec36b202102)
2025-06-30 14:12:26 +00:00
Shariq Ansari
d8f990ac8e fix: added on before create hook in call log modal
(cherry picked from commit ac13b7a3bd58021a91793817f07b4703bd8f42b4)
2025-06-30 14:12:26 +00:00
Shariq Ansari
bca6ef575a feat: added on before create hook in document.js
(cherry picked from commit 6b7bdf5afbbd40e6799abdf5de7fc3aa2301abb7)
2025-06-30 14:12:26 +00:00
Shariq Ansari
093994353d
Merge pull request #983 from frappe/mergify/bp/main-hotfix/pr-980 2025-06-30 12:55:11 +05:30
Shariq Ansari
0e87e33ab2
chore: resolved conflict 2025-06-30 12:53:15 +05:30
frappe-pr-bot
11bc742f74 chore: update POT file
(cherry picked from commit cc411f036d7321cc436d7e70f6c7e84ffabae209)

# Conflicts:
#	crm/locale/main.pot
2025-06-30 07:13:55 +00:00
Shariq Ansari
6cbfaf56a3
Merge pull request #976 from frappe/mergify/bp/main-hotfix/pr-971 2025-06-30 12:41:51 +05:30
Shariq Ansari
aff26a5ea2
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-971 2025-06-30 12:36:10 +05:30
Pratik
5c41df0ad6 Merge branch 'main-hotfix' of https://github.com/frappe/crm into main-hotfix 2025-06-30 06:58:27 +00:00
Shariq Ansari
743e0ad522
Merge pull request #982 from frappe/mergify/bp/main-hotfix/pr-978 2025-06-30 12:01:40 +05:30
Shariq Ansari
c1b3a201a2 feat: create dynamic alias to use components from frontend vue apps
(cherry picked from commit f4f799f636410ac535ba119449b8bfbb81ffc562)
2025-06-30 06:30:34 +00:00
Pratik
1aaafc41d2 style: switch button position 2025-06-29 12:37:00 +00:00
Pratik
6292824f41 refactor: remove unnecessary functions & components 2025-06-29 12:36:50 +00:00
Pratik
2ef3ccafc7 refactor: change labels & function names 2025-06-29 12:36:40 +00:00
Pratik
369292f523 refactor: internationalization & code clean up 2025-06-29 12:36:33 +00:00
Pratik
acc746bd15 refactor: move delete button 2025-06-29 12:36:27 +00:00
Pratik
71f9b8e79f style: fix dark mode styles 2025-06-29 12:36:21 +00:00
Pratik
0bc1ee4c4e feat: add list view & handle bulk delete, unlink - cherry-picked 2025-06-29 12:36:11 +00:00
Pratik
f66de4cc72 feat: handle bulk delete 2025-06-29 12:35:36 +00:00
Pratik
2b27a21316 feat: handle linked docs while deleting - cherry-picked 2025-06-29 12:35:25 +00:00
Shariq Ansari
547ffc5f65 fix: delete icon issue & more cleanup
(cherry picked from commit 65435cf2b52157d15a00371c75d431d352cf6443)

# Conflicts:
#	frontend/src/components/BulkDeleteLinkedDocModal.vue
#	frontend/src/components/DeleteLinkedDocModal.vue
#	frontend/src/components/ListViews/LinkedDocsListView.vue
#	frontend/src/pages/Deal.vue
#	frontend/src/pages/Lead.vue
2025-06-26 12:24:37 +00:00
Shariq Ansari
516b8e09a1 build(deps): bump frappeui to 0.1.162
(cherry picked from commit af4c64e63345498bd8ba9a351e05b65dca464c08)
2025-06-26 12:24:36 +00:00
Shariq Ansari
1a036a8b1c fix: cannot change role of user with Admin access
(cherry picked from commit 41b913debe153798def9d355e81a6a3e3fddf7fd)
2025-06-26 12:24:36 +00:00
Shariq Ansari
275e887dc2 fix: give Sales Manager & Sales User role if System Manager access is given
(cherry picked from commit a3b9368953eefce422f9ee563328422d23b76085)
2025-06-26 12:24:36 +00:00
Shariq Ansari
4f1348b08c style: better spacing
(cherry picked from commit 28ece820ed38dde603102ee5efe711bbc3fc058b)
2025-06-26 12:24:35 +00:00