Shariq Ansari
|
f091899da7
|
Merge pull request #1032 from frappe/mergify/bp/main-hotfix/pr-1029
|
2025-07-14 17:58:51 +05:30 |
|
frappe-pr-bot
|
6da91d67f3
|
chore: update POT file
(cherry picked from commit bb08f3d377d0a28a4e7c102923e93bff4e62d65d)
|
2025-07-13 09:52:19 +00:00 |
|
Shariq Ansari
|
eaf61005cd
|
Merge pull request #1031 from frappe/mergify/bp/main-hotfix/pr-1030
|
2025-07-13 15:20:59 +05:30 |
|
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
|
da5192bee3
|
fix: store deal status type in status log
(cherry picked from commit e59547da30ad1dc783787e7d0760f94ea3b95272)
|
2025-07-13 09:46:21 +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
|
a6c60ffecb
|
fix: added closed_date removed closed_on & added expected_deal_value & expected_closure_date field
(cherry picked from commit dcb1e475646e0f0c7096241fcb5bbeb997685230)
|
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
|
d52ee6653c
|
fix: show lost reason modal if status of type Lost is set
(cherry picked from commit 51530b760830002e9ba3f8bc8cce69d94fd51d9c)
|
2025-07-13 09:46:19 +00:00 |
|
Shariq Ansari
|
f7bcc4b910
|
patch: added patch to update deal status type
(cherry picked from commit 4e6d4a1d77b062c531b8c84634c312b6cb3537fe)
|
2025-07-13 09:46:19 +00:00 |
|
Shariq Ansari
|
c5193f3105
|
fix: added type in default deak status while installing
(cherry picked from commit efc5dd93e91760aa73a4d8a360d642c4031df8ee)
|
2025-07-13 09:46:19 +00:00 |
|
Shariq Ansari
|
5bd01ca7d9
|
fix: added type of deal status field
(cherry picked from commit 210a9d8d0635f296a72e65e1ce2899d274b5a6fa)
|
2025-07-13 09:46:18 +00:00 |
|
Shariq Ansari
|
1f445b49cf
|
Merge pull request #1025 from frappe/mergify/bp/main-hotfix/pr-1024
fix: cannot save data fields in lead page (backport #1024)
|
2025-07-10 18:47:01 +05:30 |
|
Shariq Ansari
|
742fd750cf
|
fix: cannot save data fields in lead page
(cherry picked from commit 970c215f40f3bbecc21253ca7e05a5ec68508fd0)
|
2025-07-10 13:04:33 +00:00 |
|
Shariq Ansari
|
3a88910711
|
Merge pull request #1023 from frappe/mergify/bp/main-hotfix/pr-1022
fix: apply user filter if sales user (backport #1022)
|
2025-07-10 17:40:46 +05:30 |
|
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
|
3a27fb91c1
|
Merge pull request #1021 from frappe/mergify/bp/main-hotfix/pr-979
|
2025-07-10 17:33:15 +05:30 |
|
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
|
40f74b4316
|
fix: make autocomplete non clickable if disabled
(cherry picked from commit d91d4765b5502b5fa7970d51e499ee9cf15f67ae)
|
2025-07-10 11:53:09 +00:00 |
|
Shariq Ansari
|
c1983e8241
|
style: better spacing
(cherry picked from commit 328959cc394b7fd7b27403507bce91b855f87d2e)
|
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
|
95773bec71
|
chore: minor fix
(cherry picked from commit faeacb9a7d87d5bcf6f0bbd904cb619b3fe84145)
|
2025-07-10 11:53:08 +00:00 |
|
Shariq Ansari
|
d75cde4bb0
|
fix: added forecasting & currency setting in general settings
(cherry picked from commit 5dcd416007e5f9e0515f2525deaa88323cedc11b)
|
2025-07-10 11:53:08 +00:00 |
|
Shariq Ansari
|
59030f8d44
|
fix: added disabled & placement prop in Link component
(cherry picked from commit 33e4072430d4fa117bcc95553a6f31593282a18d)
|
2025-07-10 11:53:08 +00:00 |
|
Shariq Ansari
|
f733ef2fe7
|
refactor: general settings
(cherry picked from commit c7fbd6f8f15b73fa2d69065eac32a014fef2596c)
|
2025-07-10 11:53:08 +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
|
e91ebc7eb9
|
fix: show dashboard to manager only
(cherry picked from commit b3075416e2d0df8549e920d837cbe532b47d6f8b)
|
2025-07-10 11:53:07 +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
|
02a60b01cb
|
chore: cleanup
(cherry picked from commit 9d4106cd81b8dac21bf4c248b65b2d411d1d476d)
|
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 |
|