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

1082 Commits

Author SHA1 Message Date
Shariq Ansari
b95565a70c
chore: resolved conflict 2025-07-10 17:26:27 +05:30
Shariq Ansari
b369211965 fix: better description 
(cherry picked from commit cbc127e9470462a79ae5ef1c85590493eaf225a5)
 2025-07-10 11:53:09 +00:00
Shariq Ansari
61c2180498 fix: remove mandatory from currency field in crm settings 
(cherry picked from commit 36320f61aba9b7e1365f3c1ceccfbe53d181fd94)
 2025-07-10 11:53:09 +00:00
Shariq Ansari
69780ecbd9 refactor: get exchange rate api 
(cherry picked from commit a5d3694386bbeff789a8feea76323f5d41509198)
 2025-07-10 11:53:08 +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
6e3737403d fix: store current day exchange rate when currency is updated in deal & organization 
(cherry picked from commit d7ba5a5f629d5fe7cf3a00fddd8df7818e7b874d)

# Conflicts:
#	crm/fcrm/doctype/crm_deal/crm_deal.json
 2025-07-10 11:53:07 +00:00
Shariq Ansari
910c1e0c78 fix: remove crm currency exchange doctype 
(cherry picked from commit a00bba35f872816895711ca04599b23012897aa7)
 2025-07-10 11:53:06 +00:00
Shariq Ansari
016af283ca fix: make currency read only once set 
(cherry picked from commit 71db65d21c47db6098ff7e0a9ad3cfc8a966106b)
 2025-07-10 11:53:06 +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
e81c49ee7b fix: added date field in currency exchange doctype 
(cherry picked from commit f4b81b376189dd1668a2391bff42e813c99af9e6)
 2025-07-10 11:53:06 +00:00
Shariq Ansari
37c931c9c2 fix: store currency exchange in deal & organization 
(cherry picked from commit 0be737914a7aaf70a55415419e31c0356b402d96)

# Conflicts:
#	crm/fcrm/doctype/crm_deal/crm_deal.json
 2025-07-10 11:53:06 +00:00
Shariq Ansari
a59afeb327 fix: created currency exchange doctype 
(cherry picked from commit 1b0d966db02dd53962abf61233e61e6eac37d7fc)
 2025-07-10 11:53:05 +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
63542f79c7 fix: capture closed on datetime when deal marked as Won 
(cherry picked from commit 6450b69ae72ef2b7d57e30dacd314b27400e32ba)

# Conflicts:
#	crm/fcrm/doctype/crm_deal/crm_deal.json
 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
frappe-pr-bot
ae9ffed017 chore: update POT file 
(cherry picked from commit 223187c7ea84df336bd624dabf1c0ea4dc2a0cbe)
 2025-07-07 08:52:30 +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
ca52a29b6e fix: made mobile_no, email & phone readonly since it captures primary contacts data 
(cherry picked from commit bcfe4b6a4991c731f40f1a17fbf3454b1879ffc8)
 2025-07-05 09:03:53 +00:00
Shariq Ansari
48006552ee fix: check reason.reason not reason 
(cherry picked from commit cab80edf60c0453823e352577ebfa6b3b04cfe2f)
 2025-07-02 11:57:21 +00:00
Shariq Ansari
4d162cd0dd fix: add default lost reason on install 
(cherry picked from commit 96cbdea8201301fd5b5c117742c7ecab83fff902)
 2025-07-02 11:29:52 +00:00
Shariq Ansari
d0d67bf2ad fix: update default probability from deal status 
(cherry picked from commit c96e5ff6c58ca991aca8f705114317e96beb5d42)
 2025-07-02 10:34:38 +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
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
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
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
29132f6f23 fix: add default probabilities in deal status 
(cherry picked from commit 6d3268a61ecd96710f2c7d1cede33a5cc6f939d6)
 2025-07-01 11:20:51 +00:00
Shariq Ansari
c1203d465a
Merge branch 'main' into main-hotfix 2025-06-30 20:15:43 +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
aff26a5ea2
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-971 2025-06-30 12:36:10 +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
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
Frappe PR Bot
52bf09f27e chore(release): Bumped to Version 1.48.2 2025-06-24 06:44:46 +00:00
Frappe PR Bot
a542ecc5c8 chore(release): Bumped to Version 1.48.1 2025-06-24 06:29:06 +00:00
Frappe PR Bot
9c90f29281 chore(release): Bumped to Version 1.48.0 2025-06-24 05:05:39 +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