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
6d114f7cb6
Merge pull request #950 from frappe/mergify/bp/main-hotfix/pr-946
...
fix(WhatsApp): prevent TypeError when concatenating first and last name (backport #946 )
2025-06-23 13:26:04 +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
de7cf372e7
fix: only show users to manager
...
(cherry picked from commit 22856351fd9613f654df319f1714aafc5c4f626f)
2025-06-23 07:54:25 +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
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
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
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
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
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
97aa21bd66
chore: update POT file
...
(cherry picked from commit b82f4ca02b6194365478ff18983bd1a69c789235)
2025-06-16 06:10:31 +00:00
Pratik
742b4b7a18
fix: git command error
...
(cherry picked from commit 824dc8dcdde6ad80684685e41b477ed48087b845)
2025-06-13 12:57:38 +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
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
cc96972213
chore: resolved conflict
2025-06-09 14:53: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
408714083d
fix: removed setuAssignees code
...
(cherry picked from commit 44df09fac28866c67b3d234dcaa100481841a602)
2025-06-06 09:29:56 +00:00
Shariq Ansari
90c2832f44
fix: remove multiple assignees not working
...
(cherry picked from commit 58f09331b0076d9faf46deba694c934b8ac72821)
2025-06-06 09:29:55 +00:00
Pratik
20fc1d0ae1
fix: add mandatory fields
...
(cherry picked from commit 7a6efb900e190069a3d49c8c92068cb93c0c011c)
2025-06-05 08:41:10 +00:00
frappe-pr-bot
a0cb49ef3a
chore: update POT file
...
(cherry picked from commit 165509f5a08b7e38ed84c73ce4896b95a6eb4caf)
2025-06-02 07:07:57 +00:00
frappe-pr-bot
8718fff7fd
chore: update POT file
...
(cherry picked from commit e0166a08e2591983f37e1533242982269a9b8720)
2025-05-26 06:39:15 +00:00
Shariq Ansari
9a6ca31858
feat: intercept create lead from call log via form script
...
(cherry picked from commit 8af4e9b5e82a5a3460053fa0fc7b93a704a97084)
2025-05-26 06:29:30 +00:00
Shariq Ansari
64f356e795
fix: show communication date instead of creation
...
(cherry picked from commit b291f82e4de3036032fc2891aece932bde8c9cc1)
2025-05-22 13:24:32 +00:00
Shariq Ansari
998d7857af
fix: added about link in standard_dropdown_items in hook.py
...
(cherry picked from commit dc3ccdddd439d272ed002dc05f17bc3007972afc)
2025-05-21 12:30:55 +00:00
Shariq Ansari
cc88d66de4
fix: removed doc & telegram link from user dropdown
...
(cherry picked from commit 807eb4a7d999729693ab79af2fab09efabf1c80e)
2025-05-21 12:30:55 +00:00
Shariq Ansari
0c598b2be9
feat: show about details in about modal
...
(cherry picked from commit fd7116b2e18630cf54b3521d43e40f1aa608680e)
2025-05-21 12:30:55 +00:00
Shariq Ansari
d15f232060
fix: use toast.create api instead of createToast
...
(cherry picked from commit 6064ca5a4fd51b188df85394963ea73bea4b97a5)
2025-05-20 09:09:01 +00:00
Shariq Ansari
620839cb2f
fix: do not show contacts in dropdown in invite member page
...
(cherry picked from commit 4cfa0f512b0b28378cbb6dc0c4f4d5e6267812a0)
2025-05-20 08:40:51 +00:00
Shariq Ansari
8bb78a2caf
fix: only set FCRM module if user is Sales User
...
(cherry picked from commit 64b4f6b759bc5b308dc86ca59f7777a9cda507a4)
2025-05-20 08:40:50 +00:00
Shariq Ansari
975a96ff45
fix: allow read permission for form script
...
(cherry picked from commit 2d421e60527c6d056b2f4a268862f986bf773600)
2025-05-20 08:40:50 +00:00
Shariq Ansari
af5bef08ca
fix: change heading to paragraph in invitation email template
...
(cherry picked from commit ddc5810c715b1e4cd5ca2bce59f09ff7f9a6a8a8)
2025-05-19 11:22:52 +00:00
Shariq Ansari
8003abd58f
chore: resolved conflict
2025-05-19 16:20:33 +05:30
frappe-pr-bot
cd796ef996
chore: update POT file
...
(cherry picked from commit 0cc69d90f014fea7a5be00541dc709c9de665832)
# Conflicts:
# crm/locale/main.pot
2025-05-19 10:43:43 +00:00
Shariq Ansari
0225e098c6
fix: pass doctype argument to get_product_details_script in create_product_details_script
...
(cherry picked from commit adbb9f57650f6a863d25eff3688b06c24a250ef4)
2025-05-14 18:13:52 +00:00