test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity
3,298 Commits 1 Branch 169 Tags
Commit Graph

3298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shariq Ansari
bce5eef2c9 refactor: profile page 
(cherry picked from commit fad7c5985c05a87386b9d1ea1286398a3ea642e5)

# Conflicts:
#	frontend/components.d.ts
#	frontend/src/components/Settings/ProfileImageEditor.vue
 2025-06-23 07:54:25 +00:00
Shariq Ansari
b047dab16d fix: capture onboarding step event of setting up password 
(cherry picked from commit 3234102e55356b85aff619557e8f53a614df045b)
 2025-06-23 07:54:24 +00:00
Shariq Ansari
54b3802061 feat: update password modal 
(cherry picked from commit fb2f105520827e2fb439da230b43ed90892ed329)
 2025-06-23 07:54:24 +00:00
Shariq Ansari
eb7ded961a fix: create crm user on accepting invite 
(cherry picked from commit 03abe0b5cd24e3a9e7bcdfdb17f701b53026db4f)

# Conflicts:
#	crm/api/__init__.py
 2025-06-23 07:54:23 +00:00
Shariq Ansari
f1935156ec feat: add existing users 
(cherry picked from commit 6873c6db4e100e7225ebd7c461c31eb9f35356da)
 2025-06-23 07:54:22 +00:00
Shariq Ansari
512970cad1 fix: filter out existing emails 
(cherry picked from commit 08bab927a2ad5fa06f3d1a000262e11a35f943fd)
 2025-06-23 07:54:21 +00:00
Shariq Ansari
f4c033fd52 fix: open invite user page from users add new agent dropdown option 
(cherry picked from commit d244567b3067f2281ec7e5e9b95c035cc87ecad9)
 2025-06-23 07:54:21 +00:00
Shariq Ansari
aac50e1d10 fix: show role options based on logged in user's role 
(cherry picked from commit 2b1b21d2e20435a1306f03322d050b286e77cc65)
 2025-06-23 07:54:20 +00:00
Shariq Ansari
142a94e042 fix: show role options based on logged in user's role 
(cherry picked from commit 12213de4780926a16ac07a06eb3ce36aa858047d)
 2025-06-23 07:54:20 +00:00
Shariq Ansari
d0cbad0ab1 fix: updated roles in Invite user page 
(cherry picked from commit 2a2c832e0bf4ca6b366fd6f98c99a2081f1d09bf)
 2025-06-23 07:54:20 +00:00
Shariq Ansari
4ed8a54a98 fix: renamed component names from Agent to User 
(cherry picked from commit b534aae70bc6304c818ef33e05c8a0a50146a4cf)
 2025-06-23 07:54:20 +00:00
Shariq Ansari
c918a76635 fix: renamed & added role with filter 
(cherry picked from commit 6d3e4406ae52dd4d6a6966fc03a42e300b53469d)
 2025-06-23 07:54:19 +00:00
Shariq Ansari
58c500df1f fix: renamed Agent to User in Settings 
(cherry picked from commit 463d60b650e6f3071c421998df43fa801ca60c41)
 2025-06-23 07:54:19 +00:00
Shariq Ansari
37e86b4610 fix: update agent fields based on user 
(cherry picked from commit e9812495e940131504f9cbbb4a7a4892a4a234c3)
 2025-06-23 07:54:18 +00:00
Shariq Ansari
a86884e40e fix: activate/deactivate agent 
(cherry picked from commit 0a836c78bb45a5e0eaa27142ea07fc7b063b5b09)
 2025-06-23 07:54:18 +00:00
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
Abraham Kalungi
2f5d5293d0 fix: prevent TypeError when concatenating first and last name in WhatsApp messages 
The last name on CRM Leads can be empty. In cases where it is, an error occurs: can only concatenate str (not "NoneType") to str. This prevents retrieving messages until a last name is added.

(cherry picked from commit a31795056742daf91d94223bd93f2e7aa13bcea3)
 2025-06-23 07:53:13 +00:00
frappe-pr-bot
9fa7443720 chore: update POT file 
(cherry picked from commit 4b4a1542619afb877937072bc7e46fa2079f721f)
 2025-06-23 07:50:12 +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
Frappe PR Bot
89b89eeafc chore(release): Bumped to Version 1.47.6 v1.47.6 2025-06-16 07:14:01 +00:00
Shariq Ansari
2e1da1a627
Merge pull request #935 from frappe/mergify/bp/main/pr-930 
fix: git command error (backport #930)
 2025-06-16 12:43:07 +05:30
Pratik
0eef9b485f fix: git command error 
(cherry picked from commit 824dc8dcdde6ad80684685e41b477ed48087b845)
 2025-06-16 07:12:00 +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