2653 Commits

Author SHA1 Message Date
Shariq Ansari
15d18bee43 fix: setup form script in document.js
(cherry picked from commit 1e2f325c55e05bc711f8b97a1d96fd5c7316b0f4)
2025-05-09 14:55:47 +00:00
Shariq Ansari
fab665ad3f fix: created document composable to get any doctype record
(cherry picked from commit ccd240f4e8a5c717ed3d3929c1b710714ad54527)
2025-05-09 14:55:47 +00:00
Shariq Ansari
ddc142b0bc fix: load script and setup class instances
(cherry picked from commit 7b34c5eb66509851e993df19335a5ebedd0f3055)
2025-05-09 14:55:47 +00:00
Shariq Ansari
1a1f0478f0 fix: check if setupForm exist
(cherry picked from commit 6da3761e76a5a8bbd2f3059b04790c5c73645c76)
2025-05-09 14:55:47 +00:00
Shariq Ansari
d1a15e97f1 fix: get scripts api
(cherry picked from commit b03abdd2eb523e17b62c34a5e2610387480c3847)
2025-05-09 14:55:46 +00:00
Shariq Ansari
c521ec299b
Merge pull request #790 from frappe/mergify/bp/main-hotfix/pr-787 2025-04-28 12:31:46 +05:30
frappe-pr-bot
ed2821725f chore: update POT file
(cherry picked from commit 699d6cb08c1970fca91c49d28742e2ceeec04e2a)
2025-04-28 06:59:58 +00:00
Pratik Badhe
2ea03cfbbf
Merge pull request #782 from frappe/mergify/bp/main-hotfix/pr-781
fix: international call log issue (backport #781)
2025-04-23 16:19:19 +05:30
Pratik
a15af06176 fix: international call log issue
(cherry picked from commit 4907db44eb1b9cc51b700647fae6b1cdd5b38ce0)
2025-04-23 10:43:52 +00:00
Pratik Badhe
0e4495b581
Merge pull request #777 from frappe/mergify/bp/main-hotfix/pr-776
chore: add localization support for email account settings (backport #776)
2025-04-22 16:03:43 +05:30
Pratik Badhe
cf352ddcc6
Merge pull request #778 from pratikb64/mergify/bp/main-hotfix/pr-776
fix: merge conflict
2025-04-22 15:57:03 +05:30
Pratik
73b39d58fb fix: merge conflict 2025-04-22 15:55:06 +05:30
Pratik
b28c6b94f1 chore: add localization support for email account settings
(cherry picked from commit 5eb46f6b6cd528c22a0d01cd564c7209d4ee78b4)

# Conflicts:
#	frontend/src/components/Settings/emailConfig.ts
2025-04-22 10:10:09 +00:00
Pratik Badhe
1f1090c2e6
Merge pull request #754 from frappe/mergify/bp/main-hotfix/pr-753
fix: dark mode email account css (backport #753)
2025-04-22 14:34:04 +05:30
Pratik Badhe
a921be33b3
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-753 2025-04-22 14:33:16 +05:30
Pratik Badhe
265c50cbba
Merge pull request #775 from frappe/mergify/bp/main-hotfix/pr-696
feat: add email account (backport #696)
2025-04-22 14:12:31 +05:30
Pratik
5b9539245d feat: add email account
(cherry picked from commit 87174f207dc4fe60706b9c1d9b6be7b5a19628f9)
2025-04-22 08:40:28 +00:00
Shariq Ansari
065a5ba07a
Merge pull request #772 from frappe/mergify/bp/main-hotfix/pr-771
fix: contact page not loading (backport #771)
2025-04-22 13:17:07 +05:30
Shariq Ansari
161f3bbf87 fix: do not show error page while loading
(cherry picked from commit c009373a43a71709bfd81313c5cf8f6ee06b20ad)
2025-04-22 07:42:25 +00:00
Shariq Ansari
8282e09949 fix: contact page not loading
(cherry picked from commit cef20e37c23ffbf36991f50fa7eade41edf10a11)
2025-04-22 07:42:24 +00:00
Shariq Ansari
eaa794f862
Merge pull request #763 from frappe/mergify/bp/main-hotfix/pr-759 2025-04-21 14:38:24 +05:30
frappe-pr-bot
4fe0caaa0d chore: update POT file
(cherry picked from commit d89e71ac2f3a9896e555df5791f6ef2297278c44)
2025-04-21 09:07:16 +00:00
Shariq Ansari
b4e6db3e5b
Merge pull request #762 from frappe/mergify/bp/main-hotfix/pr-761
fix: mark data tab form dirty by watching field updates (backport #761)
2025-04-21 14:30:40 +05:30
Shariq Ansari
9a08747951 fix: do not show error page while loading
(cherry picked from commit 84e773eab95c6310bca814442b5c9a018352fb69)
2025-04-21 06:24:42 +00:00
Shariq Ansari
2c0fec20d1 fix: mark data tab form dirty by watching field updates
(cherry picked from commit da4d3032bec9c0cb7996d94601bdbf0a0e6c938d)
2025-04-21 06:24:42 +00:00
Pratik
7c4a697b9f fix: dark mode email account css
(cherry picked from commit 9c45877999234e72fed113639b767fb7594b66f6)

# Conflicts:
#	frontend/src/components/Settings/EmailAccountCard.vue
#	frontend/src/components/Settings/EmailAccountList.vue
#	frontend/src/components/Settings/EmailAdd.vue
#	frontend/src/components/Settings/EmailEdit.vue
#	frontend/src/components/Settings/EmailProviderIcon.vue
2025-04-16 12:41:14 +00:00
Shariq Ansari
4e3a85e03b
Merge pull request #746 from frappe/mergify/bp/main-hotfix/pr-726
fix: export logic (backport #726)
2025-04-14 16:36:17 +05:30
Pratik
16c727cc47 refactor: make function names clearer
(cherry picked from commit cbf00e29ac1e67557b80f3966cb9b7729edd0ce3)
2025-04-14 05:51:21 +00:00
Pratik
db330f425c refactor: remove unnecessary watchers
(cherry picked from commit a466766c5cb9eab4b7aa63d0e3a7aad20ff91bf8)
2025-04-14 05:51:21 +00:00
Pratik
a0fdf7013d fix: export logic
(cherry picked from commit a227389e3e761e9b3fa4a981bf5779d5892699ec)
2025-04-14 05:51:20 +00:00
Shariq Ansari
a89619080a
Merge pull request #743 from frappe/mergify/bp/main-hotfix/pr-742 2025-04-14 10:37:38 +05:30
Shariq Ansari
a757220a82 revert: restrict app in apps page if no access to FCRM module
(cherry picked from commit 0bd448a3994e0e8a166db1dfb249a9aa87d08526)
2025-04-14 05:07:13 +00:00
Shariq Ansari
31e1429485
Merge branch 'main' into main-hotfix 2025-04-13 20:30:57 +05:30
Shariq Ansari
f0ab7b0959
Merge pull request #737 from frappe/mergify/bp/main-hotfix/pr-734 2025-04-13 20:29:27 +05:30
Shariq Ansari
44dab36a3a
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-734 2025-04-13 20:28:45 +05:30
Shariq Ansari
a1ac0008de
Merge pull request #738 from frappe/mergify/bp/main-hotfix/pr-701 2025-04-13 20:17:54 +05:30
frappe-pr-bot
e926ac8783 chore: update POT file
(cherry picked from commit e080e47a356f443b8aef2652ae18db7e10f719d3)
2025-04-13 14:47:19 +00:00
frappe-pr-bot
1015ba7bd9 chore: update POT file
(cherry picked from commit da0a502756389f30f156299998e70eca8aff3fc5)

# Conflicts:
#	crm/locale/main.pot
2025-04-13 14:45:16 +00:00
Shariq Ansari
1798da43ae
Merge pull request #736 from frappe/mergify/bp/main-hotfix/pr-735
fix: restrict app in apps page if no access to FCRM module (backport #735)
2025-04-13 20:13:42 +05:30
Shariq Ansari
1500c3f2b0
chore: resolved conflict 2025-04-13 20:09:49 +05:30
Shariq Ansari
7858ce7095 fix: restrict app in apps page if no access to FCRM module
(cherry picked from commit 3881179f723ce21986ba8a683ef5ab9d851e7aae)

# Conflicts:
#	crm/api/__init__.py
2025-04-13 14:38:26 +00:00
Shariq Ansari
4d708eef98 revert: module validation 2025-04-08 16:08:17 +05:30
Shariq Ansari
ff4693dde7
Merge pull request #729 from frappe/mergify/bp/main-hotfix/pr-728
fix: added ErrorPage if user does not have access to doc (backport #728)
2025-04-08 15:48:11 +05:30
Shariq Ansari
ade31d6f67 fix: show error page if there is no access
(cherry picked from commit fa56dc479108f189f8fd72bd7ef46672cbaeea1b)
2025-04-08 10:12:29 +00:00
Shariq Ansari
d6c6af4690 fix: check read access before loading data
(cherry picked from commit e92ee3b730df73017aa409cbdbce23eed7e9defd)
2025-04-08 10:12:29 +00:00
Shariq Ansari
45010ff8e6 fix: added ErrorPage component
(cherry picked from commit bb794f4887a6f74fc4382a211f18e67a4abd7790)
2025-04-08 10:12:29 +00:00
Frappe PR Bot
c31c7e8ae7 chore(release): Bumped to Version 1.40.0 v1.40.0 2025-04-08 10:03:17 +00:00
Shariq Ansari
2e578787f6
Merge pull request #725 from frappe/mergify/bp/main/pr-716
fix: Create & Make call (backport #716)
2025-04-08 15:30:42 +05:30
Shariq Ansari
cc7f6fd719
Merge pull request #724 from frappe/mergify/bp/main/pr-712
feat: Dynamic Link field support (backport #712)
2025-04-08 15:30:32 +05:30
Shariq Ansari
77751179f7 fix: added multi action button to make and create call
(cherry picked from commit fdceb51fdc634255853f7642c368b78c399318b0)
2025-04-08 08:52:48 +00:00