1
0
forked from test/crm

2798 Commits

Author SHA1 Message Date
Shariq Ansari
a28eab3193
Merge pull request #888 from frappe/mergify/bp/main-hotfix/pr-887
fix: Apply Class Based Form Script in New Modal (backport #887)
2025-06-05 14:23:44 +05:30
Shariq Ansari
aaf6f5e868
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-887 2025-06-05 14:19:23 +05:30
Shariq Ansari
08cd604dae
Merge pull request #889 from frappe/mergify/bp/main-hotfix/pr-704
fix: add mandatory fields (backport #704)
2025-06-05 14:12:25 +05:30
Pratik
20fc1d0ae1 fix: add mandatory fields
(cherry picked from commit 7a6efb900e190069a3d49c8c92068cb93c0c011c)
2025-06-05 08:41:10 +00:00
Shariq Ansari
63614b92ca fix: moved address modal to global modals and control it using modals.js
(cherry picked from commit c4caabe72266efa62976281f2a96036261cfc697)
2025-06-05 08:28:03 +00:00
Shariq Ansari
d30a3efa60 fix: moved quick entry modal related logic to modals.js & GlobalModals for all pages
(cherry picked from commit 8dcb77634bf85ae98c428272ac7de8fb221ea19a)
2025-06-05 08:28:03 +00:00
Shariq Ansari
5358b5fdba fix: handle new document for lead/deal/contact/organization
(cherry picked from commit c4feed116dcccdf23cc346557c36b3e719111e29)

# Conflicts:
#	frontend/src/components/Modals/OrganizationModal.vue
2025-06-05 08:28:02 +00:00
Shariq Ansari
82414cff7d fix: global modals not working in mobile view
(cherry picked from commit e220767179b41ecb8625d990b6ba48dc7c9559e8)
2025-06-05 08:28:02 +00:00
Shariq Ansari
42594c44ce fix: moved modal related code to modal.js
(cherry picked from commit 571126c36d54ed301ce762ad57dd3465dec27787)
2025-06-05 08:28:01 +00:00
Shariq Ansari
1870ced3b1 fix: handle new document for call log
(cherry picked from commit 832323f25ef9f1231eb97f721317f306a0a2eabc)

# Conflicts:
#	frontend/src/components/Modals/CallLogModal.vue
2025-06-05 08:28:01 +00:00
Shariq Ansari
3d48e12744 fix: handle controllers for new document
(cherry picked from commit 3b73432d8cd8a49b8d0978575ce1d496ec760d20)
2025-06-05 08:28:01 +00:00
Shariq Ansari
87f50edefe fix: await scripts.list.promise
(cherry picked from commit 3aa341370b693f7af67f008f785398fb2e0adbac)
2025-06-05 08:28:00 +00:00
Shariq Ansari
815d807fcb
Merge pull request #885 from frappe/mergify/bp/main-hotfix/pr-884
fix: remove invasive settings (backport #884)
2025-06-02 19:20:57 +05:30
Ankush Menat
f0e03f6594 fix: remove invasive settings (#884)
(cherry picked from commit 895da1a8125581e8b9476ace591123ab59d7b3d3)
2025-06-02 13:50:42 +00:00
Shariq Ansari
f0e17f49fe
Merge pull request #881 from frappe/mergify/bp/main-hotfix/pr-875 2025-06-02 12:42:31 +05:30
Ocheretovich
01566217ad Update README.md
(cherry picked from commit c9b9dbb092d36280bc27f58d8df627b2a017afd7)
2025-06-02 07:12:16 +00:00
Shariq Ansari
3ca32e99e5
Merge pull request #880 from frappe/mergify/bp/main-hotfix/pr-878 2025-06-02 12:39:04 +05:30
Shariq Ansari
f2d65bffeb
Merge pull request #873 from frappe/mergify/bp/main-hotfix/pr-872
fix: export with filter (backport #872)
2025-06-02 12:38:53 +05:30
Shariq Ansari
ca2e60a67c
Merge pull request #879 from frappe/mergify/bp/main-hotfix/pr-874 2025-06-02 12:38:16 +05:30
frappe-pr-bot
a0cb49ef3a chore: update POT file
(cherry picked from commit 165509f5a08b7e38ed84c73ce4896b95a6eb4caf)
2025-06-02 07:07:57 +00:00
Ocheretovich
217151fa97 Update README.md
(cherry picked from commit 0cc1d5da8f7af481ec6d70622a664a44daf852c6)
2025-06-02 07:06:58 +00:00
Pratik
32a8d61176 fix: export with filter
(cherry picked from commit 51b87d0ac67f2c64bae6f25a3bfe55881718407c)
2025-05-28 11:49:43 +00:00
Shariq Ansari
d02ccc0822
Merge pull request #869 from frappe/mergify/bp/main-hotfix/pr-868
fix: use prettydate method instead of useTimeAgo (backport #868)
2025-05-28 14:04:26 +05:30
Shariq Ansari
5d35bb4537 fix: use prettydate method instead of useTimeAgo
(cherry picked from commit 549665bc616f937de91a263be86a332e44c2040e)
2025-05-28 08:29:37 +00:00
Shariq Ansari
e2983fd70b
Merge pull request #866 from frappe/mergify/bp/main-hotfix/pr-865
fix: reactivity issue with form script (new class based script) (backport #865)
2025-05-26 18:01:44 +05:30
Shariq Ansari
c7eaef54f0 fix: handle script load while setting up script
(cherry picked from commit 91f7cf05fc2a13e60ebb29c7703550f046d1d553)
2025-05-26 12:27:34 +00:00
Shariq Ansari
c583e8044b fix: moved setupHelperMethods from setupFormController to evaluateFormClass
(cherry picked from commit 875431a620027de9a5d30fc6ab0d12047c09b82b)
2025-05-26 12:27:33 +00:00
Shariq Ansari
d820ff1572 fix: pass getDoc function instead of document.doc to keep the reactivity
(cherry picked from commit db0c0d98bc88710fc8377204e7a927627f9fe8d6)
2025-05-26 12:27:33 +00:00
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