2770 Commits

Author SHA1 Message Date
Shariq Ansari
b3c1ebb24d
Merge pull request #864 from frappe/mergify/bp/main-hotfix/pr-863 2025-05-26 15:51:58 +05:30
Shariq Ansari
bcb8b4f75a feat: intercept convert to deal via form script
(cherry picked from commit bfdd3273feed3dc89daa18ec227075ba4beaef7d)
2025-05-26 10:11:18 +00:00
Shariq Ansari
6809629f4c
Merge pull request #848 from frappe/mergify/bp/main-hotfix/pr-847
fix: hide selected filters from filter list (backport #847)
2025-05-26 12:16:29 +05:30
Shariq Ansari
03759680da
Merge pull request #861 from frappe/mergify/bp/main-hotfix/pr-859 2025-05-26 12:14:35 +05:30
frappe-pr-bot
8718fff7fd chore: update POT file
(cherry picked from commit e0166a08e2591983f37e1533242982269a9b8720)
2025-05-26 06:39:15 +00:00
Shariq Ansari
e33bcd0459
Merge pull request #860 from frappe/mergify/bp/main-hotfix/pr-858 2025-05-26 12:04:07 +05:30
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
fc5223f258
Merge pull request #857 from frappe/mergify/bp/main-hotfix/pr-856
fix: set default value as empty array (backport #856)
2025-05-23 21:31:44 +05:30
Shariq Ansari
b820e34548 fix: set default value as empty array
(cherry picked from commit b95a17a4e0454268e76f70039a2171bc3f51ba59)
2025-05-23 15:10:49 +00:00
Shariq Ansari
d6397114b3
Merge pull request #850 from frappe/mergify/bp/main-hotfix/pr-849
fix: show communication date instead of creation (backport #849)
2025-05-22 18:56:08 +05:30
Shariq Ansari
64f356e795 fix: show communication date instead of creation
(cherry picked from commit b291f82e4de3036032fc2891aece932bde8c9cc1)
2025-05-22 13:24:32 +00:00
Pratik
ffa8c16255 fix: hide selected filters from filter list
(cherry picked from commit 7a12b80dd20f7cd0581d830f4f91a7c809f10f45)
2025-05-22 11:12:40 +00:00
Shariq Ansari
83a26605ea
Merge pull request #844 from frappe/mergify/bp/main-hotfix/pr-843 2025-05-21 18:48:40 +05:30
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
50c69c173f feat: added action to open about modal in user dropdown
(cherry picked from commit a24283eb5e2441ad30893fd447f203924c60a731)
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
a70bed99b8
Merge pull request #842 from frappe/mergify/bp/main-hotfix/pr-841
fix: use toast.create api instead of createToast (backport #841)
2025-05-20 14:39:17 +05:30
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
17b81aee64 chore: update frappe-ui 2025-05-20 14:23:18 +05:30
Shariq Ansari
0eafd44d8f
Merge pull request #839 from frappe/mergify/bp/main-hotfix/pr-838
fix: Invite Member Page (backport #838)
2025-05-20 14:17:06 +05:30
Shariq Ansari
8b3cac75fb fix: added update your password step in onboarding
(cherry picked from commit dd1db8f78249f1d06889387b67e6d38c7acae208)
2025-05-20 08:40:52 +00:00
Shariq Ansari
3ea056d3df feat: added password control
(cherry picked from commit fe8e309399d7f8f61e6a1388cf1820f07efc571f)
2025-05-20 08:40:51 +00:00
Shariq Ansari
09717541f6 fix: set default value as 0 in int field
(cherry picked from commit e7a20374c78851d74ba4a97072c3ee8250b18204)
2025-05-20 08:40:51 +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
d18e4a1a18
Merge pull request #832 from frappe/mergify/bp/main-hotfix/pr-831
fix: Onboarding fixes (backport #831)
2025-05-19 17:17:26 +05:30
Shariq Ansari
a514a99a75 fix: store firstLead & firstDeal per user
(cherry picked from commit 44523a0392daae4a1b31f86dd0508be0339cca75)
2025-05-19 11:22:52 +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
d9e731be3c fix: added dependsOn value on dependent step to gray out
(cherry picked from commit 21c349e1d784cd16f5a35ed7a71fd5d0bf610f7e)
2025-05-19 11:22:52 +00:00
Shariq Ansari
3a89f62965 fix: get filtered steps based on condition
(cherry picked from commit a7784c298534dcedf4fc93ca2b63f717dfb338f6)
2025-05-19 11:22:51 +00:00
Shariq Ansari
beb5ebe165
Merge pull request #830 from frappe/mergify/bp/main-hotfix/pr-828 2025-05-19 16:45:02 +05:30
Shariq Ansari
39219987bc
chore: resolved conflict 2025-05-19 16:29:21 +05:30
Shariq Ansari
80d762cc35
chore: resolved conflict 2025-05-19 16:27:44 +05:30
Shariq Ansari
51b7d8c9b0
Merge pull request #829 from frappe/mergify/bp/main-hotfix/pr-826 2025-05-19 16:26:45 +05:30
Shariq Ansari
3e7e1baf5f fix: update Vue compiler options for custom lucide elements
(cherry picked from commit 740c21532aae9f81ba777544057758c31a74614f)
2025-05-19 10:52:00 +00:00
Shariq Ansari
ddea5fbc53 fix: add @tiptap/extension-paragraph dependency version 2.12.0
(cherry picked from commit 9fdd8bbc17fbdb35a1cd9562962688b2818031c0)
2025-05-19 10:52:00 +00:00
Shariq Ansari
1a9a661c1c fix: wrap layout and dialogs in FrappeUIProvider
(cherry picked from commit 0978fa58a29d6af52f1b1fe4b3e025f4f82ca889)
2025-05-19 10:51:59 +00:00
Shariq Ansari
d2984e3618 build(deps): bump frappeui to 0.1.145
(cherry picked from commit 1395a12d32c79260952447d652195f362b61ca69)

# Conflicts:
#	frontend/package.json
#	yarn.lock
2025-05-19 10:51:59 +00:00
Shariq Ansari
020e28ad5a fix: update package.json and config files to use ES module syntax
(cherry picked from commit 9aab0e74174405ddbfa3a375e5ff332870bbf977)
2025-05-19 10:51:59 +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
90990b62b6
Merge pull request #822 from frappe/mergify/bp/main-hotfix/pr-821
fix: cannot make call (backport #821)
2025-05-15 11:26:14 +05:30
Shariq Ansari
3839a4cb43 fix: cannot make call
(cherry picked from commit 18aef2376a966b91c89f25fbd5706ab09630c336)
2025-05-15 05:55:53 +00:00
Shariq Ansari
1f2eef4f14
Merge pull request #819 from frappe/mergify/bp/main-hotfix/pr-818
fix: contact/organization page not loading (backport #818)
2025-05-15 01:19:12 +05:30
Shariq Ansari
454dbd06cc fix: remove updateField event from various components
(cherry picked from commit baf344a6976b61a2c62a4cc2e60bf159f546ac49)
2025-05-14 19:48:46 +00:00
Shariq Ansari
4e84fd0731 fix: contact/organization page not loading
(cherry picked from commit 8c94049e3cce7aadf83ad7e823d185ebd86af3f3)
2025-05-14 19:48:46 +00:00
Shariq Ansari
0b6954e728
Merge pull request #816 from frappe/mergify/bp/main-hotfix/pr-814 2025-05-14 23:48:40 +05:30
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