Shariq Ansari
|
74f305490c
|
Merge pull request #915 from frappe/mergify/bp/main/pr-913
fix: future date is not captured in pretty date (backport #913)
|
2025-06-09 16:52:51 +05:30 |
|
Shariq Ansari
|
ac08ca8390
|
fix: future date is not captured in pretty date
(cherry picked from commit dba6dd19836501e595da5d7efe91bf78134de532)
|
2025-06-09 11:21:50 +00:00 |
|
Frappe PR Bot
|
90e80da208
|
chore(release): Bumped to Version 1.47.3
v1.47.3
|
2025-06-09 09:31:43 +00:00 |
|
Shariq Ansari
|
1b452a9486
|
Merge pull request #912 from frappe/main-hotfix
|
2025-06-09 15:00:54 +05:30 |
|
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 |
|
Frappe PR Bot
|
8c43732d2e
|
chore(release): Bumped to Version 1.47.2
v1.47.2
|
2025-06-06 15:48:46 +00:00 |
|
Shariq Ansari
|
e262c8e0ca
|
Merge pull request #904 from frappe/mergify/bp/main/pr-902
|
2025-06-06 21:17:53 +05:30 |
|
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
|
da4d60db19
|
fix: only load assignee if docname is passed
(cherry picked from commit 2a817e5861ae040fd8abd8823aad5d6e97fd0fd7)
|
2025-06-06 15:46:55 +00:00 |
|
Shariq Ansari
|
89da8d2e8d
|
refactor: statusOptions code
(cherry picked from commit 5e616f1a50d1a6b6e4d6190f554edd704cb9b25f)
|
2025-06-06 15:46:54 +00:00 |
|
Shariq Ansari
|
a4716e7899
|
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:54 +00:00 |
|
Shariq Ansari
|
9cc09f520c
|
fix: use document.doc in status dropdown
(cherry picked from commit f58d44bf9c453ced17085f6c686aa662f8a6cacb)
|
2025-06-06 15:46:54 +00:00 |
|
Shariq Ansari
|
d7f442d734
|
fix: onLoad & onSave
(cherry picked from commit f72ab39c933f02dad4991261cf985804a97eadcc)
|
2025-06-06 15:46:54 +00:00 |
|
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 |
|
Frappe PR Bot
|
b13dc76358
|
chore(release): Bumped to Version 1.47.1
v1.47.1
|
2025-06-06 12:23:57 +00:00 |
|
Shariq Ansari
|
d68f0a659d
|
Merge pull request #901 from frappe/mergify/bp/main/pr-899
fix: activity is not loading (backport #899)
|
2025-06-06 17:53:00 +05:30 |
|
Shariq Ansari
|
f4c86811a1
|
fix: activity is not loading
(cherry picked from commit 8f81d207b89a4f471f594dd3a2a702f6282f36de)
|
2025-06-06 12:22:45 +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 |
|
Frappe PR Bot
|
715ec67a82
|
chore(release): Bumped to Version 1.47.0
v1.47.0
|
2025-06-06 12:07:03 +00:00 |
|
Shariq Ansari
|
10148641c6
|
Merge pull request #898 from frappe/main-hotfix
|
2025-06-06 17:36:08 +05:30 |
|
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 |
|
Frappe PR Bot
|
d9dee3fa16
|
chore(release): Bumped to Version 1.46.4
v1.46.4
|
2025-06-05 10:54:40 +00:00 |
|
Shariq Ansari
|
06670e65e3
|
Merge pull request #893 from frappe/mergify/bp/main/pr-891
fixes (backport #891)
|
2025-06-05 16:23:49 +05:30 |
|
Shariq Ansari
|
95184b55f0
|
chore: resolved conflict
|
2025-06-05 16:22:54 +05:30 |
|
Shariq Ansari
|
6bbe7a9442
|
refactor: set default values for new lead, deal and contact
(cherry picked from commit 71f764c224ebf43425da0adb2db4100e0a74aa6a)
|
2025-06-05 10:51:43 +00:00 |
|
Shariq Ansari
|
6ad0742c9d
|
refactor: organization modal code refactor
(cherry picked from commit 93629972464163a41063317c4337b77b24aaf166)
# Conflicts:
# frontend/src/components/Modals/OrganizationModal.vue
|
2025-06-05 10:51:43 +00:00 |
|
Shariq Ansari
|
76cead4200
|
refactor: call log modal code refactor
(cherry picked from commit 28ea88f61e731aeeac64cd4272a61b7149d6a3d5)
|
2025-06-05 10:51:43 +00:00 |
|