1
0
forked from test/crm

2868 Commits

Author SHA1 Message Date
Shariq Ansari
dd4f5c6f80 fix: renamed invite members to invite agent
(cherry picked from commit 5c7f835e4c2d6400302c3466ab0b8c9d655bf274)
2025-06-23 07:54:18 +00:00
Shariq Ansari
f7344cde43 fix: show and allow changing role from agents settings page
(cherry picked from commit 346849631eb2ac886b6bf796d355f3891217ff9f)
2025-06-23 07:54:17 +00:00
Shariq Ansari
b0341aebde fix: added get user role in users store
(cherry picked from commit bf166bdaad6c775be2dd83c7097265ee3c29b3ef)
2025-06-23 07:54:17 +00:00
Shariq Ansari
909670d234 fix: removed x button from settings modal
(cherry picked from commit 123f183f68edd93fdae02ca35c2ca40f540a764a)
2025-06-23 07:54:17 +00:00
Shariq Ansari
5deef03fd7 fix: added Agents page in settings
(cherry picked from commit bea1505c63603309fd1eb2d0b59f804ea6b6b65c)
2025-06-23 07:54:16 +00:00
Shariq Ansari
f835acae57 feat: added crm agent doctype
(cherry picked from commit fac5ed5579c45868e442bd68dca8007f0553d617)
2025-06-23 07:54:16 +00:00
Shariq Ansari
88e5e5e7cc
Merge pull request #938 from frappe/mergify/bp/main-hotfix/pr-937
fix: Forecasting Fixes (backport #937)
2025-06-16 17:49:48 +05:30
Shariq Ansari
6f2638a3d9 build(deps): bump frappeui to 0.1.156
(cherry picked from commit 548018997e5d5a26a92535c580622ad6518bb961)
2025-06-16 12:19:05 +00:00
Shariq Ansari
46ed866de6 fix: updated button with icon
(cherry picked from commit 9f3477e1cd43c7aa8144b661e7bed7ee7e8dd53b)
2025-06-16 12:19:05 +00:00
Shariq Ansari
95cd3f256e fix: fixed breaking button with icon and open email box
(cherry picked from commit baa03246e647a3abb02e1dd7281da18a0a362fef)
2025-06-16 12:19:04 +00:00
Shariq Ansari
4368590a12 fix: added mandatory field error toast
(cherry picked from commit a17b1cd0e25f1c8e1d867fafdd091ca932e9964b)
2025-06-16 12:19:04 +00:00
Shariq Ansari
7d14118334 fix: hide calendar icon in side panel date fields
(cherry picked from commit 49d82870c467af89d5c0db18990f892f78d56d78)
2025-06-16 12:19:04 +00:00
Shariq Ansari
0df87ef5c4 build(deps): bump frappeui to 0.1.154
(cherry picked from commit 6a72a4467a2db66cf019614ad68a8fd5ab8ff344)
2025-06-16 12:19:04 +00:00
Shariq Ansari
a482a81aec fix: renamed Expected Closure Date to Close Date
(cherry picked from commit efbed6e0b63742d8be08a8df9e66b06b4e77bf45)
2025-06-16 12:19:03 +00:00
Shariq Ansari
f9d3b5362a
Merge pull request #934 from frappe/mergify/bp/main-hotfix/pr-933 2025-06-16 12:22:46 +05:30
frappe-pr-bot
97aa21bd66 chore: update POT file
(cherry picked from commit b82f4ca02b6194365478ff18983bd1a69c789235)
2025-06-16 06:10:31 +00:00
Pratik Badhe
cb1b74f93b
Merge pull request #931 from frappe/mergify/bp/main-hotfix/pr-930
fix: git command error (backport #930)
2025-06-13 18:32:13 +05:30
Pratik
742b4b7a18 fix: git command error
(cherry picked from commit 824dc8dcdde6ad80684685e41b477ed48087b845)
2025-06-13 12:57:38 +00:00
Shariq Ansari
3879e892fd
Merge pull request #929 from frappe/mergify/bp/main-hotfix/pr-920 2025-06-13 15:06:55 +05:30
Shariq Ansari
575be65956 fix: asterisk is not visible if label is big enough
(cherry picked from commit 4edfa951dcd30501d5608dac0eee20712781c9e1)
2025-06-13 09:36:03 +00:00
Shariq Ansari
2c92612cce fix: circular import
(cherry picked from commit 029c16d1d0b71b83e108b479e077fbd168392870)
2025-06-13 09:36:03 +00:00
Shariq Ansari
232f982786 fix: create standard forecasting script on install and added in patch
(cherry picked from commit b3acff8cba6fd30e15ce2d579287cbd02d9c8282)
2025-06-13 09:36:03 +00:00
Shariq Ansari
e9362a50eb fix: set close date to now if status is Won
(cherry picked from commit a98b0e3a009f028c86ebb87385136ad0ab711a81)
2025-06-13 09:36:03 +00:00
Shariq Ansari
d06f749544 fix: set close date reqd as 1 or 0 based on enabled_forecasting
(cherry picked from commit 2e27c0459c183bd5c4363337d23de26f5ed72d37)
2025-06-13 09:36:02 +00:00
Shariq Ansari
6c2ffaf8b7 feat: added enable forecasting settings
(cherry picked from commit d87a237789b55f6024f56cfd55376a2cc36b2e63)
2025-06-13 09:36:02 +00:00
Shariq Ansari
87a38250f6 fix: trigger on change on status change
(cherry picked from commit e9e0aa357b1b1596f57d8bda0037f36514972169)
2025-06-13 09:36:02 +00:00
Shariq Ansari
5fff00338a fix: added throwError global method
(cherry picked from commit 9af300bba8a59cb49ecce26fe5e790fdb646cd99)
2025-06-13 09:36:01 +00:00
Shariq Ansari
b0474e8764 fix: update and reset value in triggerOnChange method
(cherry picked from commit 7d79cbf5bdd664e76fb90b994d0d4f5c257c0ed0)
2025-06-13 09:36:01 +00:00
Shariq Ansari
1c7ea0b44b fix: added probability field in deal status
(cherry picked from commit fdca27bb81533b45eac0ba9d45c2ca1d094d2fae)
2025-06-13 09:36:01 +00:00
Shariq Ansari
2c3a660b99 fix: added deal value field
(cherry picked from commit 01f0213693d0885228b852bbf852fff254df988f)
2025-06-13 09:36:01 +00:00
Shariq Ansari
df4522ca78
Merge pull request #924 from frappe/mergify/bp/main-hotfix/pr-923
fix: removed leads organization logo (backport #923)
2025-06-12 18:15:56 +05:30
Shariq Ansari
6c6c6bf872 fix: removed leads organization logo
(cherry picked from commit e079980598ecb2e2a2728e6bf213dc5b42e643f3)
2025-06-12 12:40:40 +00:00
Shariq Ansari
901eb381d8
Merge pull request #919 from frappe/mergify/bp/main-hotfix/pr-916
fix: add context for Integrations (backport #916)
2025-06-11 11:14:32 +05:30
mahsem
fb330c26d2 fix: add context for Integrations
(cherry picked from commit 33e6b80d5aa72b6b52fa4991f537e4fa4200e300)
2025-06-11 05:43:57 +00:00
Shariq Ansari
fa0085e2dd
Merge pull request #914 from frappe/mergify/bp/main-hotfix/pr-913
fix: future date is not captured in pretty date (backport #913)
2025-06-09 16:52:44 +05:30
Shariq Ansari
7de7f6ac59 fix: future date is not captured in pretty date
(cherry picked from commit dba6dd19836501e595da5d7efe91bf78134de532)
2025-06-09 11:21:50 +00:00
Shariq Ansari
8343b87526
Merge pull request #910 from frappe/mergify/bp/main-hotfix/pr-907 2025-06-09 14:54:26 +05:30
Shariq Ansari
cc96972213
chore: resolved conflict 2025-06-09 14:53:45 +05:30
Shariq Ansari
65e6da00d5
Merge pull request #909 from shariquerik/backport-issue 2025-06-09 14:11:45 +05:30
frappe-pr-bot
750519d05d chore: update POT file
(cherry picked from commit ed79bf55eb53ddc7a40776a4743adfdb8184099d)

# Conflicts:
#	crm/locale/main.pot
2025-06-09 08:40:57 +00:00
Shariq Ansari
2a4a83ea6d fix: backport unbackport code 2025-06-09 14:03:30 +05:30
Shariq Ansari
c98beaee9c fix: resolved conflicts 2025-06-09 14:03:07 +05:30
Md Hussain Nagaria
8bb84552e0
Merge pull request #906 from frappe/mergify/bp/main-hotfix/pr-905 2025-06-08 12:50:42 +05:30
Hussain Nagaria
37df5d6254 fix: yet another unused import due to merge conflict
(cherry picked from commit ab409dfd2c01d63952ed863496dc69ea1968e246)

# Conflicts:
#	frontend/src/pages/MobileContact.vue
2025-06-08 07:19:55 +00:00
Hussain Nagaria
f44e12b0ff fix: unused import due to merge conflict
(cherry picked from commit 42285dd9110f74494314bd090f4df08794a1c8f0)

# Conflicts:
#	frontend/src/pages/Contact.vue
2025-06-08 07:19:55 +00:00
Hussain Nagaria
6224c3eadc refactor: DRY up validate image file
* Also, allows more types of image files

(cherry picked from commit c6ad10857a3241fc2b9741d0298db034b01b789c)

# Conflicts:
#	frontend/src/pages/Contact.vue
#	frontend/src/pages/Lead.vue
#	frontend/src/pages/MobileContact.vue
2025-06-08 07:19:55 +00:00
Shariq Ansari
1df3d051d6
Merge pull request #903 from frappe/mergify/bp/main-hotfix/pr-902 2025-06-06 21:17:44 +05:30
Shariq Ansari
165ed1155d fix: only load assignee if docname is passed
(cherry picked from commit 2a817e5861ae040fd8abd8823aad5d6e97fd0fd7)
2025-06-06 15:46:53 +00:00
Shariq Ansari
1f8f62ad3a refactor: statusOptions code
(cherry picked from commit 5e616f1a50d1a6b6e4d6190f554edd704cb9b25f)
2025-06-06 15:46:53 +00:00
Shariq Ansari
314c770236 fix: allow snake & camel case for on load, on save, convert to deal, on create lead
(cherry picked from commit c6e9d71e1f5178e7318be294ee3d29acbf562dc2)
2025-06-06 15:46:53 +00:00