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

298 Commits

Author SHA1 Message Date
Pratik Badhe
d985a44291 feat: add assignment rule 
(cherry picked from commit 0c5684905f44af211189bf674735b046858a5b86)

# Conflicts:
#	frontend/components.d.ts
#	yarn.lock
 2025-09-18 09:19:54 +00:00
Shariq Ansari
8be5535a2b chore: removed comment 
(cherry picked from commit 8d0d234ac131b52266bdebb248b232b4923f97c0)
 2025-09-03 06:40:30 +00:00
Shariq Ansari
c0050dda71 chore: removed comment 
(cherry picked from commit 7fda0db51b75f3d4b2b79db47640bb8fdfac26df)
 2025-09-03 06:40:30 +00:00
anup-dh
56eecdd260 Added support for outgoing whatsapp messages from other apps 
made changes so that:
1. whatsapp message is created (app: frappe_whatsapp) even if no phone number match is found in CRM Deal & CRM Lead.
2. Also assigns reference doctype and name for Outgoing whatsappe messages which are not sent via CRM app.
3. added a "if doctype and" check to make sure notify_agent does not fail whatsapp message creation if whatsapp message is being created as per step 1.

(cherry picked from commit 486a06baf0d77cf27c75b9303750969c12c47743)
 2025-09-03 06:40:30 +00:00
Shariq Ansari
2bbd0206c6 refactor: do not update modified field 
(cherry picked from commit 3ed2c4812a98f6a08f21276e27d09070987af048)
 2025-08-04 07:03:52 +00:00
Shariq Ansari
8c3733a212 refactor: replace json.loads with frappe.parse_json for assignees in remove_assignments function 
(cherry picked from commit 5010cccc7158dca670530c564a4a4b01067e090f)
 2025-08-04 07:03:52 +00:00
Shariq Ansari
51d39a1dbb fix: reset to default 
(cherry picked from commit 7826565ce77a6d75b2e16011571f46512e7cb486)
 2025-07-15 09:41:53 +00:00
Shariq Ansari
78dc0f6af6 fix: forecasting chart is breaking if no data 
(cherry picked from commit b344f412c9cf84fff35284b396788160e9852e31)
 2025-07-15 08:00:12 +00:00
Shariq Ansari
859d93404d fix: minor fixes 
(cherry picked from commit 2584cca128628b3cb7afa8b2307bfe6e61c303c5)
 2025-07-15 08:00:10 +00:00
Shariq Ansari
6f71d738b3 fix: create default manager dashboard if not exists 
(cherry picked from commit 05b8cea2066e27a8dbcf14aa5a8ae402f13e2130)
 2025-07-15 08:00:09 +00:00
Shariq Ansari
55c4ad9533 feat: allow adding existing charts 
(cherry picked from commit 37c2d3a2b07ae8a1836dfb80fe098810f0b69f74)
 2025-07-15 08:00:08 +00:00
Shariq Ansari
ecccc6340f fix: use tooltip from data 
(cherry picked from commit 0f06715d0cdf967240783aa97d996becc92dcd4c)
 2025-07-15 08:00:07 +00:00
Shariq Ansari
1b7e337176 fix: show edit button to manager 
(cherry picked from commit 4a783fcba8241ec73f0def366830144a8e2c870d)
 2025-07-15 08:00:07 +00:00
Shariq Ansari
1be736cb6f fix: load dashboard layout from CRM Dashboard doctype and render 
(cherry picked from commit fd38f0ac985360eae2e370e86b3e8dd5a8baa587)
 2025-07-15 08:00:06 +00:00
Shariq Ansari
c879fa57cf fix: use GridLayout from frappe-ui to display dashboard 
(cherry picked from commit 160649bf9750ef9ca6e5bee8e759a51ad4fd243a)
 2025-07-15 08:00:05 +00:00
Shariq Ansari
65a8ba139d fix: updated funnel query to get status change count 
(cherry picked from commit 5232da6ec3f7e0bdb4ca55e8f6a3e42ff62ff05c)
 2025-07-13 09:46:22 +00:00
Shariq Ansari
72dc3904c0 fix: added deals by ongoing & won stages bar 
(cherry picked from commit de85ccfc51fdf7ac5c87084baccd602930102504)
 2025-07-13 09:46:21 +00:00
Shariq Ansari
107eeae116 fix: used closed_date instead of closed_on and set closed_date if status type is Won 
(cherry picked from commit f82019e510612bd9803f9947240d155479d5d665)
 2025-07-13 09:46:21 +00:00
Shariq Ansari
209da0f84e fix: used expected closed date & deal value for forecasting 
(cherry picked from commit 7fc26a5202b89476ec5e277601243cf8299ed10f)
 2025-07-13 09:46:21 +00:00
Shariq Ansari
e6033dfb9a fix: avg time to close a deal number card 
(cherry picked from commit 61259f3d2e843f851b7d08e9089de55e01496e6b)
 2025-07-13 09:46:20 +00:00
Shariq Ansari
55ad85dda8 fix: added two more number cards 
(cherry picked from commit 2dd2608c094226efe17d5bbdf1520afc667151ca)
 2025-07-13 09:46:20 +00:00
Shariq Ansari
697ed4eb98 fix: get ongoing deals and won deals based on closed_on date 
(cherry picked from commit 81dc4e1138c86a5ab4a80ab57d1a521bc65ecc1b)
 2025-07-13 09:46:20 +00:00
Shariq Ansari
64dfa77022 fix: use status.type instead of status in all query 
(cherry picked from commit cb1f9f760cbcda42654e99ff5e98583591ae6874)
 2025-07-13 09:46:20 +00:00
Shariq Ansari
7d695a13cf fix: apply user filter if sales user 
(cherry picked from commit 1ae7018f792c4956c7db352fa18e94f562776693)
 2025-07-10 12:10:03 +00:00
Shariq Ansari
b369211965 fix: better description 
(cherry picked from commit cbc127e9470462a79ae5ef1c85590493eaf225a5)
 2025-07-10 11:53:09 +00:00
Shariq Ansari
756fdd212a fix: use exchange rate in deal to calculate the deal value 
(cherry picked from commit 2cb09dde4bddd28584b8c35c86efb091a5e94d0b)
 2025-07-10 11:53:07 +00:00
Shariq Ansari
da04edccb2 chore: updated/added number card tooltip 
(cherry picked from commit 37d820a67c901e030b2034570cadddacf6d4a961)
 2025-07-10 11:53:06 +00:00
Shariq Ansari
6e71321e7d fix: convert to system currency and show deal value 
(cherry picked from commit 4f02f0a4d7c3b947028b193a935eadc7d1c3462f)
 2025-07-10 11:53:06 +00:00
Shariq Ansari
39a419889f fix: only show sales user filter to manager 
(cherry picked from commit f747e076ab6b1bc58eb4aa14fe01628317c0b2eb)
 2025-07-10 11:53:05 +00:00
Shariq Ansari
6caff5cd59 fix: added filters and translated titles 
(cherry picked from commit 4b12918ba5941ca34fc4149bb43354f8344513f8)
 2025-07-10 11:53:05 +00:00
Shariq Ansari
10cf868df5 fix: show avg time number card based on closed_on date 
(cherry picked from commit eddf8c9295d39a8c41db7ad67ef4fc2dd5ad671b)
 2025-07-10 11:53:04 +00:00
Shariq Ansari
6ae7787811 fix: added avg time to close number card 
(cherry picked from commit 4d2f054e4005c1f6c169994eac3daf99c2c0827a)
 2025-07-10 11:53:04 +00:00
Shariq Ansari
d5aefb3c98 fix: added more charts for dashboard 
(cherry picked from commit 3b34f73cb3c302aeb5f92cbddda0257da5b4a726)
 2025-07-10 11:53:03 +00:00
Shariq Ansari
1b3709c8a0 fix: added first cut queries for some charts and number cards 
(cherry picked from commit 1fa6b5bb51f532db0eefeec1b66ef06fa8a0f536)
 2025-07-10 11:53:03 +00:00
Shariq Ansari
69277c5fb0 fix: useDocument in contact page 
(cherry picked from commit 42ea1ad16e45cffab59c0bd6885be1312674e38f)

# Conflicts:
#	frontend/src/pages/Contact.vue
#	frontend/src/pages/MobileContact.vue
 2025-07-05 09:03:53 +00:00
Shariq Ansari
be7154506f fix: update primary mobile_no & email in deal if contact is updated 
(cherry picked from commit 96200aebe607ecfdabfcb0a4f0ea7dfa4beab213)
 2025-07-05 09:03:53 +00:00
Shariq Ansari
c1203d465a
Merge branch 'main' into main-hotfix 2025-06-30 20:15:43 +05:30
Pratik
2ef3ccafc7 refactor: change labels & function names 2025-06-29 12:36:40 +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
300a996ce5
Merge pull request #939 from frappe/main-hotfix 2025-06-24 10:34:34 +05:30
Shariq Ansari
9639c21ff2
Merge pull request #951 from frappe/mergify/bp/main-hotfix/pr-845 2025-06-23 13:41:41 +05:30
Shariq Ansari
d9555f62f8
chore: resolved conflict 2025-06-23 13:27:15 +05:30
Shariq Ansari
f0b295a907 fix: renaming fix and removed CRM User code 
(cherry picked from commit cf1fce3dc0334ec728798f47cc2537726f4dc6ea)
 2025-06-23 07:54:32 +00:00
Shariq Ansari
df605f1a9a fix: add user is actually add role 
(cherry picked from commit ad1aee9c9e03f37e1deabc5b3941032e165f60a8)
 2025-06-23 07:54:31 +00:00
Shariq Ansari
bae37529e5 fix: if role is set to sales user then remove modules and set FCRM 
(cherry picked from commit bd7451e86f1b41483ffc92c51ab51457c4d31490)
 2025-06-23 07:54:31 +00:00
Shariq Ansari
e3cd126304 fix: removed CRM User doctype and moved api's to user.py 
(cherry picked from commit 901bcb84602eb2a0a1ac7bcdf1743107cbeb301f)
 2025-06-23 07:54:29 +00:00
Shariq Ansari
c3a89c564b fix: get users and crm users 
(cherry picked from commit 001a3231e1342dabf9a611ecc2e79e4a25182943)
 2025-06-23 07:54:28 +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