mahsem
|
fb330c26d2
|
fix: add context for Integrations
(cherry picked from commit 33e6b80d5aa72b6b52fa4991f537e4fa4200e300)
|
2025-06-11 05:43:57 +00:00 |
|
Shariq Ansari
|
fa0085e2dd
|
Merge pull request #914 from frappe/mergify/bp/main-hotfix/pr-913
fix: future date is not captured in pretty date (backport #913)
|
2025-06-09 16:52:44 +05:30 |
|
Shariq Ansari
|
7de7f6ac59
|
fix: future date is not captured in pretty date
(cherry picked from commit dba6dd19836501e595da5d7efe91bf78134de532)
|
2025-06-09 11:21:50 +00:00 |
|
Shariq Ansari
|
8343b87526
|
Merge pull request #910 from frappe/mergify/bp/main-hotfix/pr-907
|
2025-06-09 14:54:26 +05:30 |
|
Shariq Ansari
|
cc96972213
|
chore: resolved conflict
|
2025-06-09 14:53:45 +05:30 |
|
Shariq Ansari
|
65e6da00d5
|
Merge pull request #909 from shariquerik/backport-issue
|
2025-06-09 14:11: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
|
2a4a83ea6d
|
fix: backport unbackport code
|
2025-06-09 14:03:30 +05:30 |
|
Shariq Ansari
|
c98beaee9c
|
fix: resolved conflicts
|
2025-06-09 14:03:07 +05:30 |
|
Md Hussain Nagaria
|
8bb84552e0
|
Merge pull request #906 from frappe/mergify/bp/main-hotfix/pr-905
|
2025-06-08 12:50:42 +05:30 |
|
Hussain Nagaria
|
37df5d6254
|
fix: yet another unused import due to merge conflict
(cherry picked from commit ab409dfd2c01d63952ed863496dc69ea1968e246)
# Conflicts:
# frontend/src/pages/MobileContact.vue
|
2025-06-08 07:19:55 +00:00 |
|
Hussain Nagaria
|
f44e12b0ff
|
fix: unused import due to merge conflict
(cherry picked from commit 42285dd9110f74494314bd090f4df08794a1c8f0)
# Conflicts:
# frontend/src/pages/Contact.vue
|
2025-06-08 07:19:55 +00:00 |
|
Hussain Nagaria
|
6224c3eadc
|
refactor: DRY up validate image file
* Also, allows more types of image files
(cherry picked from commit c6ad10857a3241fc2b9741d0298db034b01b789c)
# Conflicts:
# frontend/src/pages/Contact.vue
# frontend/src/pages/Lead.vue
# frontend/src/pages/MobileContact.vue
|
2025-06-08 07:19:55 +00:00 |
|
Shariq Ansari
|
1df3d051d6
|
Merge pull request #903 from frappe/mergify/bp/main-hotfix/pr-902
|
2025-06-06 21:17:44 +05:30 |
|
Shariq Ansari
|
165ed1155d
|
fix: only load assignee if docname is passed
(cherry picked from commit 2a817e5861ae040fd8abd8823aad5d6e97fd0fd7)
|
2025-06-06 15:46:53 +00:00 |
|
Shariq Ansari
|
1f8f62ad3a
|
refactor: statusOptions code
(cherry picked from commit 5e616f1a50d1a6b6e4d6190f554edd704cb9b25f)
|
2025-06-06 15:46:53 +00:00 |
|
Shariq Ansari
|
314c770236
|
fix: allow snake & camel case for on load, on save, convert to deal, on create lead
(cherry picked from commit c6e9d71e1f5178e7318be294ee3d29acbf562dc2)
|
2025-06-06 15:46:53 +00:00 |
|
Shariq Ansari
|
3f052b21b5
|
fix: use document.doc in status dropdown
(cherry picked from commit f58d44bf9c453ced17085f6c686aa662f8a6cacb)
|
2025-06-06 15:46:53 +00:00 |
|
Shariq Ansari
|
33c9b4a425
|
fix: onLoad & onSave
(cherry picked from commit f72ab39c933f02dad4991261cf985804a97eadcc)
|
2025-06-06 15:46:52 +00:00 |
|
Shariq Ansari
|
96a856b445
|
Merge pull request #900 from frappe/mergify/bp/main-hotfix/pr-899
fix: activity is not loading (backport #899)
|
2025-06-06 17:52:36 +05:30 |
|
Shariq Ansari
|
da241aef28
|
fix: activity is not loading
(cherry picked from commit 8f81d207b89a4f471f594dd3a2a702f6282f36de)
|
2025-06-06 12:22:20 +00:00 |
|
Shariq Ansari
|
62270a478c
|
Merge pull request #897 from frappe/mergify/bp/main-hotfix/pr-896
|
2025-06-06 17:27:48 +05:30 |
|
Shariq Ansari
|
0023ea0d44
|
fix: add custom actions using class based script in mobile view
(cherry picked from commit df412d51feba35fc9d799332a18abf6dea220863)
|
2025-06-06 11:55:13 +00:00 |
|
Shariq Ansari
|
9c27d3dbc6
|
feat: add custom statuses using class based script
(cherry picked from commit 8942bb7e4804553cd882c51d57c3956cdd579b76)
|
2025-06-06 11:55:12 +00:00 |
|
Shariq Ansari
|
2e9c5b1d6f
|
feat: add custom actions using class based script
(cherry picked from commit ca6067912653f621c4d3f1d4fc53c408952a9aa9)
|
2025-06-06 11:55:12 +00:00 |
|
Shariq Ansari
|
a8ee5295b7
|
fix: trigger onload method if controller is loaded
(cherry picked from commit 8db846ad5dc21aa23ff7fbd41e52b7cfe367b179)
|
2025-06-06 11:55:12 +00:00 |
|
Shariq Ansari
|
31c649d6f1
|
Merge pull request #895 from frappe/mergify/bp/main-hotfix/pr-894
|
2025-06-06 15:02:09 +05:30 |
|
Shariq Ansari
|
408714083d
|
fix: removed setuAssignees code
(cherry picked from commit 44df09fac28866c67b3d234dcaa100481841a602)
|
2025-06-06 09:29:56 +00:00 |
|
Shariq Ansari
|
22e38c05b4
|
refactor: render assignees from document.js
reload assignees if lead_owner/deal_owner is changed
(cherry picked from commit e214ce8bfbedfe93338ab04c2ee55259a60e9d8e)
|
2025-06-06 09:29:55 +00:00 |
|
Shariq Ansari
|
88f4e10833
|
fix: load assignees in document.js
(cherry picked from commit 6d281922e401a0961840135dc6255286c4611f7f)
|
2025-06-06 09:29:55 +00:00 |
|
Shariq Ansari
|
90c2832f44
|
fix: remove multiple assignees not working
(cherry picked from commit 58f09331b0076d9faf46deba694c934b8ac72821)
|
2025-06-06 09:29:55 +00:00 |
|
Shariq Ansari
|
260a9d8230
|
Merge pull request #892 from frappe/mergify/bp/main-hotfix/pr-891
fixes (backport #891)
|
2025-06-05 16:20:19 +05:30 |
|
Shariq Ansari
|
e93cc463be
|
chore: resolved conflict
|
2025-06-05 16:18:48 +05:30 |
|
Shariq Ansari
|
f1032b5f93
|
refactor: set default values for new lead, deal and contact
(cherry picked from commit 71f764c224ebf43425da0adb2db4100e0a74aa6a)
|
2025-06-05 10:45:25 +00:00 |
|
Shariq Ansari
|
985c538044
|
refactor: organization modal code refactor
(cherry picked from commit 93629972464163a41063317c4337b77b24aaf166)
# Conflicts:
# frontend/src/components/Modals/OrganizationModal.vue
|
2025-06-05 10:45:25 +00:00 |
|
Shariq Ansari
|
e623e0628f
|
refactor: call log modal code refactor
(cherry picked from commit 28ea88f61e731aeeac64cd4272a61b7149d6a3d5)
|
2025-06-05 10:45:24 +00:00 |
|
Shariq Ansari
|
93176a8d0c
|
fix: activity is not loading
(cherry picked from commit a25ff14dd4d23864bbf6b76ebac5dbbd0e906abf)
|
2025-06-05 10:45:24 +00:00 |
|
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 |
|