3343 Commits

Author SHA1 Message Date
Shariq Ansari
3d55706d60
Merge pull request #1111 from frappe/mergify/bp/main-hotfix/pr-1108 2025-08-04 12:53:18 +05:30
Shariq Ansari
b0009e1701
Merge pull request #1110 from frappe/mergify/bp/main-hotfix/pr-1104 2025-08-04 12:52:59 +05:30
frappe-pr-bot
c3b6b380f4 chore: update POT file
(cherry picked from commit fa14d4ad15d036be35656ea29ced747cf79de5ff)
2025-08-04 07:04:29 +00:00
Shariq Ansari
5b34142a40 refactor: update Activities component for improved z-index layering
(cherry picked from commit 2a18a556bf6fbefc6aee2d10c3e7e9d529f33298)
2025-08-04 07:03:54 +00:00
Shariq Ansari
d39500f706 refactor: update z-index values for activity components for better layering
(cherry picked from commit 4c1eaf507d9ea095ada7277d1a3ae8850184e961)
2025-08-04 07:03:54 +00:00
Shariq Ansari
29e8c73d50 refactor: update Activities component to scroll on success
(cherry picked from commit 76149b0c79f70fc903516bb3665312d01873f381)
2025-08-04 07:03:53 +00:00
Shariq Ansari
5ac003e860 refactor: update AssignTo component to use correct doctype for CRM Deal
(cherry picked from commit 564d2b1ac5bdee71d4b54b6ef672cd08ae2a87a1)
2025-08-04 07:03:53 +00:00
Shariq Ansari
9b988f638e refactor: update AssignTo component to use docname prop and streamline assignment logic
(cherry picked from commit faef5cb86629ace8a113bd5dc06cfaa272d55e88)
2025-08-04 07:03:53 +00:00
Shariq Ansari
2bbd0206c6 refactor: do not update modified field
(cherry picked from commit 3ed2c4812a98f6a08f21276e27d09070987af048)
2025-08-04 07:03:52 +00:00
Shariq Ansari
8c3733a212 refactor: replace json.loads with frappe.parse_json for assignees in remove_assignments function
(cherry picked from commit 5010cccc7158dca670530c564a4a4b01067e090f)
2025-08-04 07:03:52 +00:00
Shariq Ansari
7e53e0f4e4 refactor: assignment modal for bulk assign
(cherry picked from commit aeb3f150c58a24396824037f01ccf09624bdcc01)
2025-08-04 07:03:51 +00:00
Shariq Ansari
e5ed7e0daf refactor: Assign to as popover instead of dialog
(cherry picked from commit 995f3564193ec1a44c2a6bfa344e734bce415a46)
2025-08-04 07:03:51 +00:00
Shariq Ansari
0f2ad3590d refactor: simplify AssignmentModal component by streamlining dialog options and enhancing assignee management
(cherry picked from commit 819a669922b9105d7978d6b3242f1c2f0c4353d9)
2025-08-04 07:03:51 +00:00
Shariq Ansari
2d912e01b7
Merge pull request #1107 from frappe/mergify/bp/main-hotfix/pr-1103
chore: sync translations from crowdin (backport #1103)
2025-08-03 14:02:55 +05:30
Shariq Ansari
6bd1dd2f64 chore: Persian translations
(cherry picked from commit 2601c1d059271e6006de781a7c305b4564a51cb2)
2025-08-03 08:31:12 +00:00
Shariq Ansari
95aa5ac4d3 chore: Indonesian translations
(cherry picked from commit 7e51d963799639f87bd59ef44fc920b961d046ac)
2025-08-03 08:31:12 +00:00
Shariq Ansari
45a8bdaf5f chore: Persian translations
(cherry picked from commit 4c53dd6ea331d48bec12bd249d6575fcc05065ff)
2025-08-03 08:31:12 +00:00
Shariq Ansari
17f63d1484
Merge pull request #1102 from frappe/mergify/bp/main-hotfix/pr-1095 2025-07-31 16:40:21 +05:30
Shariq Ansari
50ada2ad64 chore: Croatian translations
(cherry picked from commit 72c31b9f2105a1aee00a5064310d235301bb3251)
2025-07-31 11:09:39 +00:00
Shariq Ansari
326cad3275 chore: Serbian (Latin) translations
(cherry picked from commit f2b1c24d19ce7f1756b82f3b2de5a551dcaa459b)
2025-07-31 11:09:38 +00:00
Shariq Ansari
7e1dde24d0 chore: Bosnian translations
(cherry picked from commit f86bb0ada220b770672e06d339928d3b6cbbb060)
2025-07-31 11:09:38 +00:00
Shariq Ansari
238d75c398 chore: Indonesian translations
(cherry picked from commit ec4866f39a4b00b03f08f857caf545b4467b88fd)
2025-07-31 11:09:38 +00:00
Shariq Ansari
24f4ae4294 chore: Swedish translations
(cherry picked from commit 7961b614f1ece2d69d4a6c84a5ec6e99e1c4844d)
2025-07-31 11:09:37 +00:00
Shariq Ansari
4dc6eb8c4e chore: Serbian (Cyrillic) translations
(cherry picked from commit 901d84d07028bc26403594fdeb05748fadc82f06)
2025-07-31 11:09:37 +00:00
Shariq Ansari
9c9d998ef5
Merge pull request #1101 from frappe/mergify/bp/main-hotfix/pr-1100
fix: update delete button click handler in Deal component (backport #1100)
2025-07-31 16:38:36 +05:30
Shariq Ansari
8fa583dbc6
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-1100 2025-07-31 16:37:42 +05:30
Shariq Ansari
d08e15a4b5
Merge pull request #1097 from frappe/mergify/bp/main-hotfix/pr-1096 2025-07-31 16:34:37 +05:30
Shariq Ansari
bad30d6232
Merge pull request #1099 from frappe/mergify/bp/main-hotfix/pr-1094 2025-07-31 16:34:29 +05:30
Shariq Ansari
63d3bc8bd5 fix: update delete button click handler in Deal component
(cherry picked from commit abc501825ae6cbaf1c1b939823dbe5c387b4c0b8)

# Conflicts:
#	frontend/src/pages/Deal.vue
2025-07-31 11:02:41 +00:00
Shariq Ansari
5eb3bcbf43 fix: update init scripts for consistent Redis configuration and branch usage
(cherry picked from commit c53e486bf0a0dfe902e16b1de6df3f5b59753c2d)
2025-07-31 10:59:37 +00:00
C.L.STARK
e3baeabbb4 Update init.sh
Fixed: docker setup error in crm-frappe container.
(cherry picked from commit b6a6152a492d31e8fd0ce600c968d0002c6fda95)
2025-07-31 10:59:37 +00:00
Shariq Ansari
4a3504fce3
chore: resolved conflict 2025-07-31 16:27:45 +05:30
Shariq Ansari
cde1084ed4
chore: resolved conflict 2025-07-31 16:25:58 +05:30
Shariq Ansari
b5925ef0e9
chore: resolved conflict 2025-07-31 16:23:44 +05:30
Shariq Ansari
fe02a9077f
chore: resolved conflict 2025-07-31 16:21:52 +05:30
Shariq Ansari
6b00ede6ad refactor: remove unused get_lead function and related imports from api.py
(cherry picked from commit d431d5b4b15e9b8fa984e27a0368c7f930dbaec4)
2025-07-30 12:44:45 +00:00
Shariq Ansari
d94c99b161 refactor: clean up unused variables and streamline tab management in Deal, Lead, and MobileLead components
(cherry picked from commit ba99d14f688de7eaa20be142e4b3184645b76305)
2025-07-30 12:44:44 +00:00
Shariq Ansari
12b92b3f21 refactor: update mobile lead/deal components
(cherry picked from commit 7e42599b494395b50305fcb806817d043d514637)
2025-07-30 12:44:44 +00:00
Shariq Ansari
9ebd7bde2c fix: update docname references to use dealId and leadId in Deal and Lead components
(cherry picked from commit c38c190d42eb1f5750dba97681d73bad5e7e37f6)
2025-07-30 12:44:43 +00:00
Shariq Ansari
6a729fb5e7 fix: update whatsappMessages auto property based on whatsappEnabled state
(cherry picked from commit 6e8d869afb6f588cb4e353974fa1eb23c56e3133)
2025-07-30 12:44:43 +00:00
Shariq Ansari
bed6e346ef refactor: update button icon rendering in AttachmentArea component
(cherry picked from commit 63d60626738be6b6dc911a8d6a78a9cb7f3e77b8)
2025-07-30 12:44:43 +00:00
Shariq Ansari
788c565e71 refactor: use doc in activity & child components
(cherry picked from commit af830b8782f2c9dbeca8ba1bce29565ab03388bc)
2025-07-30 12:44:42 +00:00
Shariq Ansari
72c61f6cc4 refactor: updateField & deleteDeal/Lead
(cherry picked from commit 0605cf5fd0c0de9ba22e4f504a8acb24a6cbdf3c)
2025-07-30 12:44:42 +00:00
Shariq Ansari
b1dfa6e9c9 fix: remount on route change with param and hash change
(cherry picked from commit 4acb4dd3a70c8aed5f8613a2db827a5441ea6148)
2025-07-30 12:44:41 +00:00
Shariq Ansari
971265d000 fix: use document.doc instead of lead.data/deal.data
(cherry picked from commit 0144bc109a83f80e4349508001d1cb752707043c)

# Conflicts:
#	frontend/src/pages/Deal.vue
#	frontend/src/pages/Lead.vue
2025-07-30 12:44:41 +00:00
Shariq Ansari
0e177818cc fix: handle errors when creating document resources
(cherry picked from commit ca5d82f5beb9395a88bbc576cc58911360b62b03)
2025-07-30 12:44:40 +00:00
Shariq Ansari
07bea95479
Merge pull request #1093 from frappe/mergify/bp/main-hotfix/pr-1090 2025-07-29 16:12:42 +05:30
Shariq Ansari
ab51a54ea2 chore: Esperanto translations
(cherry picked from commit 94b0077b2ae363a88af0b93541d727cc13db9c9c)
2025-07-29 10:41:41 +00:00
Shariq Ansari
f6e1b01645 chore: Croatian translations
(cherry picked from commit ea815d014767a8e843fd1da423a771a760baae8b)
2025-07-29 10:41:40 +00:00
Shariq Ansari
11c564835a chore: Thai translations
(cherry picked from commit 0ae048d3969d7d1b095bceaf52655ed9fee87ef8)
2025-07-29 10:41:40 +00:00