Shariq Ansari
|
136aa73822
|
chore: resolved conflict
|
2025-07-05 14:39:32 +05:30 |
|
Shariq Ansari
|
8b04f3da3e
|
chore: resolved conflict
|
2025-07-05 14:38:21 +05:30 |
|
Shariq Ansari
|
a78a110914
|
fix: useDocument in organization page
(cherry picked from commit 6760798f180e1630612080905eebbded0ec81551)
|
2025-07-05 09:03:54 +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
|
8c91f38fee
|
fix: grid field is not getting set
(cherry picked from commit 39eb5600d93ce27e4468db135db4c59ead410a74)
|
2025-07-02 12:21:46 +00:00 |
|
Shariq Ansari
|
39d97e1e0b
|
build(deps): bump frappeui to 0.1.166
(cherry picked from commit fc89c7b93caee3dbcde1db826a114f2f20d58313)
|
2025-07-02 11:40:14 +00:00 |
|
Shariq Ansari
|
b50c2e6d00
|
chore: resolved conflict
|
2025-07-02 16:35:51 +05:30 |
|
Shariq Ansari
|
5f459f58cb
|
fix: allow creating lost reason from lost reason modal field
(cherry picked from commit 144470877d943802e3fb3439fdfc6b8c1abb8359)
|
2025-07-02 10:34:38 +00:00 |
|
Shariq Ansari
|
e4abb0f9de
|
fix: intercept data tab's before save and side panel's before field change to show lost reason modal
(cherry picked from commit 391844512a1e5955c866f77c7fde01cc40129c19)
|
2025-07-02 10:34:37 +00:00 |
|
Shariq Ansari
|
a7bc3abcdd
|
fix: show lost reason modal if status changed to lost
(cherry picked from commit d89c304b134a7ec1f7a16bc667f2ee13858daac9)
# Conflicts:
# frontend/components.d.ts
|
2025-07-02 10:34:37 +00:00 |
|
Shariq Ansari
|
9b315c2e0c
|
refactor: statusOptions code
(cherry picked from commit 881126c7f1145fb2db1143b63c1e0f2f81ebb2ea)
|
2025-07-02 10:34:36 +00:00 |
|
Shariq Ansari
|
040692c13c
|
fix: removed unused triggerOnChange
(cherry picked from commit 7730e46cfc2c0886c9bb1237d1558c31a05be712)
|
2025-07-02 10:34:36 +00:00 |
|
Shariq Ansari
|
59e762d658
|
fix: show absolute day count not in decimels
(cherry picked from commit a7dc5e05b3b5dff845b8c5cf32b3dc540e85e9ad)
|
2025-07-01 13:54:13 +00:00 |
|
Shariq Ansari
|
57fb8b3abe
|
fix: show error message on convert to deal modal
(cherry picked from commit adc22efcb1e20eda3c0c3b897e5c5456ccf67b98)
|
2025-07-01 11:20:52 +00:00 |
|
Shariq Ansari
|
08243530e7
|
fix: mandatory error
(cherry picked from commit 4c70b1a06bff81aac6baacffe34d624c7e3c4b86)
|
2025-07-01 11:20:52 +00:00 |
|
Shariq Ansari
|
2cd08bebb9
|
refactor: moved convert to deal modal into separate component
(cherry picked from commit 6320e580ae556df683d50b5145e39039968ad9ad)
|
2025-07-01 11:20:51 +00:00 |
|
Shariq Ansari
|
336ac2ad34
|
fix: prettyDate is not accurate
(cherry picked from commit 611f4cde70d7d4d14f823b1875c57bc75fa66c0f)
|
2025-07-01 11:20:51 +00:00 |
|
Shariq Ansari
|
c8c7a95ac0
|
fix: show edit call log button in call log details modal
(cherry picked from commit 693c0869302de05ae2b956542e51caf5ce732b57)
|
2025-07-01 06:23:08 +00:00 |
|
Shariq Ansari
|
a04b9f5a5e
|
fix: pass reference doc to call log modal to get reference doc in on before create
(cherry picked from commit aae7e0e36cf86f7be76fc9e6fcc22f57fd5b56e3)
|
2025-06-30 14:36:45 +00:00 |
|
Shariq Ansari
|
f6af8d562e
|
fix: added on before create hook in all modals
(cherry picked from commit 2e5c1bc3b564a9c7e1dd49f521cd4ec36b202102)
|
2025-06-30 14:12:26 +00:00 |
|
Shariq Ansari
|
d8f990ac8e
|
fix: added on before create hook in call log modal
(cherry picked from commit ac13b7a3bd58021a91793817f07b4703bd8f42b4)
|
2025-06-30 14:12:26 +00:00 |
|
Shariq Ansari
|
bca6ef575a
|
feat: added on before create hook in document.js
(cherry picked from commit 6b7bdf5afbbd40e6799abdf5de7fc3aa2301abb7)
|
2025-06-30 14:12:26 +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
|
5c41df0ad6
|
Merge branch 'main-hotfix' of https://github.com/frappe/crm into main-hotfix
|
2025-06-30 06:58:27 +00:00 |
|
Shariq Ansari
|
c1b3a201a2
|
feat: create dynamic alias to use components from frontend vue apps
(cherry picked from commit f4f799f636410ac535ba119449b8bfbb81ffc562)
|
2025-06-30 06:30:34 +00:00 |
|
Pratik
|
1aaafc41d2
|
style: switch button position
|
2025-06-29 12:37:00 +00:00 |
|
Pratik
|
6292824f41
|
refactor: remove unnecessary functions & components
|
2025-06-29 12:36:50 +00:00 |
|
Pratik
|
2ef3ccafc7
|
refactor: change labels & function names
|
2025-06-29 12:36:40 +00:00 |
|
Pratik
|
369292f523
|
refactor: internationalization & code clean up
|
2025-06-29 12:36:33 +00:00 |
|
Pratik
|
acc746bd15
|
refactor: move delete button
|
2025-06-29 12:36:27 +00:00 |
|
Pratik
|
71f9b8e79f
|
style: fix dark mode styles
|
2025-06-29 12:36:21 +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
|
547ffc5f65
|
fix: delete icon issue & more cleanup
(cherry picked from commit 65435cf2b52157d15a00371c75d431d352cf6443)
# Conflicts:
# frontend/src/components/BulkDeleteLinkedDocModal.vue
# frontend/src/components/DeleteLinkedDocModal.vue
# frontend/src/components/ListViews/LinkedDocsListView.vue
# frontend/src/pages/Deal.vue
# frontend/src/pages/Lead.vue
|
2025-06-26 12:24:37 +00:00 |
|
Shariq Ansari
|
516b8e09a1
|
build(deps): bump frappeui to 0.1.162
(cherry picked from commit af4c64e63345498bd8ba9a351e05b65dca464c08)
|
2025-06-26 12:24:36 +00:00 |
|
Shariq Ansari
|
1a036a8b1c
|
fix: cannot change role of user with Admin access
(cherry picked from commit 41b913debe153798def9d355e81a6a3e3fddf7fd)
|
2025-06-26 12:24:36 +00:00 |
|
Shariq Ansari
|
4f1348b08c
|
style: better spacing
(cherry picked from commit 28ece820ed38dde603102ee5efe711bbc3fc058b)
|
2025-06-26 12:24:35 +00:00 |
|
Shariq Ansari
|
65b635eeb3
|
style: minor changes
(cherry picked from commit cca420b1a06c78b9623259ed7897720a06d5aaaa)
|
2025-06-26 12:24:35 +00:00 |
|
Shariq Ansari
|
d184068760
|
fix: make email template row clickable
(cherry picked from commit 05803c79b4e30de9d3d0b9b5f5c2a875d02cc719)
|
2025-06-26 12:24:35 +00:00 |
|
Shariq Ansari
|
35533a8296
|
fix: add new email template from email selector modal
(cherry picked from commit 5932ccafec0d5e346f5e5a47962dd90cdc84391c)
|
2025-06-26 12:24:34 +00:00 |
|
Shariq Ansari
|
18e9d1e3fc
|
fix: removed email template page and related components
(cherry picked from commit 7cee017e20709b4d101d62e7d08787636d10659a)
|
2025-06-26 12:24:34 +00:00 |
|
Shariq Ansari
|
61625f2938
|
fix: added email template icon
(cherry picked from commit b15a8d9c8ae058a3052f3e58805ca9ac37be6fed)
|
2025-06-26 12:24:34 +00:00 |
|
Shariq Ansari
|
3f51da59ad
|
fix: Duplicate email template
(cherry picked from commit 7e6d5c3e544b784b07ae0975b4ae784fb9f9ee46)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
ab6ea90c66
|
fix: Edit email template
(cherry picked from commit dd3d297dab4fb2380889b4cec39aeba53f102896)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
d2527da5a4
|
fix: Create email template
(cherry picked from commit e4f728d809b20e54d4057cbb9e699bfe1c2bc06f)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
b799e8dbb4
|
feat: Create/Edit & List page for email template & implemented delete from list
(cherry picked from commit cd7bab918448e914516b43536d346068bbdfe659)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
b932130bb2
|
fix: only show search if users are more than 10
(cherry picked from commit ec6b1558b15432490ba3e1933c2448b2d32c5a4b)
|
2025-06-26 12:24:32 +00:00 |
|
Shariq Ansari
|
14ac102d6d
|
refactor: added email templates in settings modal
(cherry picked from commit 1c3ee8b557bf9371aad2d6803876095a1c0a8026)
|
2025-06-26 12:24:32 +00:00 |
|
Shariq Ansari
|
af6994f8fc
|
fix: make header sticky
(cherry picked from commit 3c1ce1fe2741a5d2f4faa4a0a5be71f188439f07)
|
2025-06-24 06:42:49 +00:00 |
|