test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity
3,788 Commits 1 Branch 169 Tags
Commit Graph

2049 Commits

Author SHA1 Message Date
jingrow
a607d41366 基础替换完成 2025-10-23 18:27:04 +08:00
jingrow
e6400c939b frappecloud.com - jcloud.jingrow.com 2025-10-23 18:07:03 +08:00
jingrow
7d5b6efb17 frappe.io - jingrow.com 2025-10-23 17:56:14 +08:00
Shariq Ansari
85df56b464
Merge pull request #1285 from frappe/mergify/bp/main-hotfix/pr-1284 2025-09-25 21:53:53 +05:30
Shariq Ansari
46cc1d2924 build(deps): bump frappeui to 0.1.201 
(cherry picked from commit 171060df8ade73f6b9ef4b51945c76604c759299)
 2025-09-25 16:22:33 +00:00
Shariq Ansari
ff4ca9fe66 fix: add validation for mandatory fields in useDocument 
(cherry picked from commit dbcda4c548270f4b030d819857b1f393fdaadecb)
 2025-09-25 16:18:30 +00:00
Shariq Ansari
1e613ebcd1 fix: Bulk Delete 'Reference Doctype must be set first' Error backport (#1125) 2025-09-22 16:04:53 +05:30
Shariq Ansari
803e639961 build(deps): bump frappeui to 0.1.200 
(cherry picked from commit 96c0c99939b30880ddf27b91f3f6b18c95ef3409)
 2025-09-22 09:40:21 +00:00
Shariq Ansari
7dd98733f1
chore: resolved conflict 2025-09-18 15:38:44 +05:30
Shariq Ansari
ee4b7721b0
chore: resolved conflict 2025-09-18 15:37:11 +05:30
Shariq Ansari
95bc551254
chore: resolved conflict 2025-09-18 15:35:03 +05:30
Shariq Ansari
2546bdabb1 refactor: adjust padding and improve layout for Settings component 
(cherry picked from commit d687a2eb56142c49b2b776dec55ad533556421f6)
 2025-09-18 09:59:25 +00:00
Shariq Ansari
af248964c6 refactor: adjust padding and improve layout for Currency and Forecasting settings components 
(cherry picked from commit 1044adc494b0b5b7f347aaf0080914a28be56eb9)
 2025-09-18 09:59:25 +00:00
Shariq Ansari
8749f7bfd0 refactor: update styling and improve layout for assignment rules components 
(cherry picked from commit 9f95a3a2b2132357708db03b9b4922f356150ff4)
 2025-09-18 09:59:25 +00:00
Shariq Ansari
d18618b856 refactor: replace EmailMultiSelect with FormControl for inviting users by email 
(cherry picked from commit 69f80903118965f500199f1b3368deb195882699)

# Conflicts:
#	frontend/src/components/Settings/InviteUserPage.vue
 2025-09-18 09:59:24 +00:00
Shariq Ansari
ce4af4907a refactor: remove TemplateOption component usage and simplify dropdown options in multiple components 
(cherry picked from commit ac34ac9b87b9c671be75401a545e09e0e83ac378)

# Conflicts:
#	frontend/src/components/Settings/Users.vue
 2025-09-18 09:59:24 +00:00
Shariq Ansari
84d24a384b refactor: update Vite configuration to support dynamic loading of frappe-ui in development mode 
(cherry picked from commit 129f8a00b66d87529c21ef085e66dc7864a3776e)
 2025-09-18 09:59:24 +00:00
Shariq Ansari
29d86859d4 revert: create dynamic alias to use components from frontend vue apps 
(cherry picked from commit 6328b6941bb620e47cebe82519df3f1453f355ae)
 2025-09-18 09:59:23 +00:00
Shariq Ansari
be452fee58 refactor: reduce gap in Brand logo and Favicon sections for improved layout 
(cherry picked from commit fbc9e37036d5720948381ca891714d78af001433)
 2025-09-18 09:59:23 +00:00
Shariq Ansari
100eec0677 refactor: remove icon-left from Update button in multiple settings components 
(cherry picked from commit 149901f6054f000d503ef8940037c13bd2e344f3)
 2025-09-18 09:59:23 +00:00
Shariq Ansari
a4d3852c0e feat: Auto update expected deal value based on products value 
(cherry picked from commit 7e21a5fee206723cf714f7a8732bb8929aaa57df)
 2025-09-18 09:59:23 +00:00
Shariq Ansari
0399fc32be refactor: add ForecastingSettings component and remove GeneralSettingsPage component 
(cherry picked from commit f4ff6bbdf306a89b78aab82df972bf55e1e0d82d)
 2025-09-18 09:59:22 +00:00
Shariq Ansari
e10ec543a7 refactor: CurrencySettings component 
(cherry picked from commit 186584c1ac79170afa4ef8860bff9d3d3d91cadc)
 2025-09-18 09:59:22 +00:00
Shariq Ansari
1962b9a103 refactor: update BrandSettings component to improve logo and favicon handling 
(cherry picked from commit 3752c611576778f028ba78d6c1ae533a88c6040b)
 2025-09-18 09:59:21 +00:00
Shariq Ansari
a3abaa57ec refactor: HomeActions component 
(cherry picked from commit a6ecc5cfeda51781286d013cf3a738b8a3adfdc5)
 2025-09-18 09:59:21 +00:00
Shariq Ansari
1bf3f7a38c refactor: BrandSettings component 
(cherry picked from commit 84e0fe30a9667468ea9ddbb0bc768e3da62620d3)
 2025-09-18 09:59:20 +00:00
Shariq Ansari
af81750388 refactor: enhance Settings component structure 
(cherry picked from commit 03acea69b130cfdbdc00994c8d9930ad948cb64c)

# Conflicts:
#	frontend/src/components/Settings/Settings.vue
 2025-09-18 09:59:20 +00:00
Shariq Ansari
7330a3c2a5 refactor: clean up ImageUploader component and improve label handling 
(cherry picked from commit e19f75083147faaf988bcbef448e9d1ddbb9179a)
 2025-09-18 09:59:19 +00:00
Shariq Ansari
7ef00965fa
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-1252 2025-09-18 15:21:52 +05:30
Pratik Badhe
d985a44291 feat: add assignment rule 
(cherry picked from commit 0c5684905f44af211189bf674735b046858a5b86)

# Conflicts:
#	frontend/components.d.ts
#	yarn.lock
 2025-09-18 09:19:54 +00:00
Pratik Badhe
004923419c fix: paddings and labels 
(cherry picked from commit db577afc568b56b49846773b16b638e0cf1444fa)

# Conflicts:
#	frontend/src/components/Settings/AssignmentRules/AssigneeRules.vue
#	frontend/src/components/Settings/AssignmentRules/AssignmentRuleView.vue
#	frontend/src/components/Settings/AssignmentRules/AssignmentRules.vue
 2025-09-17 06:47:25 +00:00
Shariq Ansari
49d7af5548 build(deps): bump frappeui to 0.1.197 2025-09-16 14:51:32 +05:30
Shariq Ansari
cfeac13c9c fix: remove unnecessary class from Button component in TaskModal and add click.stop to Notes dropdown 
(cherry picked from commit 30d95a6582cf8d5ba8e06e6d94e78b54c82e57a3)
 2025-09-07 13:55:55 +00:00
Shariq Ansari
b82dc0473a fix: add 'interactjs' to optimizeDeps include list in vite.config.js 
(cherry picked from commit 24b580150af1e51db30c3c9fac8138bc62dd8a05)
 2025-09-07 13:55:55 +00:00
Shariq Ansari
8f0e8f3f52 fix: update organization logo handling and add beforeFieldChange functionality to rename organization 
(cherry picked from commit 1b7af2096f6bfc18094ce727e3e43754c279e51b)
 2025-09-07 13:55:54 +00:00
Shariq Ansari
0d9264e5e2
chore: resolved conflict 2025-09-05 15:53:57 +05:30
Shariq Ansari
068f303448
chore: resolved conflict 2025-09-05 15:51:48 +05:30
Shariq Ansari
e8e4367eb7
chore: resolved conflict 2025-09-05 15:50:09 +05:30
Shariq Ansari
afadf9f8f4 fix: if contact email is updated it is updating previously opened contact 
(cherry picked from commit 50708ebe32df130a4c6c5f678b5b9d0e85ccfa66)

# Conflicts:
#	frontend/components.d.ts
#	frontend/src/components/SidePanelLayout.vue
#	frontend/src/pages/Contact.vue
 2025-09-05 10:16:18 +00:00
Shariq Ansari
95df85f676 chore: removed commented code 
(cherry picked from commit f9f405cc00e156a64df045dc6df700bb6ece929f)
 2025-09-04 12:21:26 +00:00
Aftab Shaikh
728150e324 fix: address creation not returning to organization modal 
(cherry picked from commit 32993af090f2e741254ffb2ce8241ed11122f11b)
 2025-09-04 12:21:25 +00:00
Shariq Ansari
2f56af0384 chore: indentation fix 
(cherry picked from commit 899481d752209687c26390e8a037dc7c139891fa)
 2025-09-03 07:17:24 +00:00
Shariq Ansari
06d647dd72 chore: indentation fix 
(cherry picked from commit 8a1ebeb52d7682e00e6626990408d81386d5093a)
 2025-09-03 07:17:24 +00:00
Yashpal Patle
ee964637ac fixed popup deletion 
(cherry picked from commit b55bf0918fed0c5c997e12f983616f7f1f152567)
 2025-09-03 07:17:24 +00:00
Shariq Ansari
57fb0e07cf fix: do not allow saving public view kanban changes for non managers 
(cherry picked from commit 4301cd48061ab853eb975e7d47e2e6c39856f46a)
 2025-08-26 06:56:49 +00:00
Shariq Ansari
4d619a908c fix: update button state to use document properties 
(cherry picked from commit 41118eda97b9aeaa47814c2c499dc8e4c6f57b47)
 2025-08-21 06:03:21 +00:00
Shariq Ansari
6dc8975c08 fix: reorder idx if grid row is reordered 
(cherry picked from commit cd96171a4c1a784ffa2b00d28e2b22921b9c9f37)
 2025-08-21 06:03:20 +00:00
wasim3357
bd3aca85ac fix(Org Modal): Setting loading false in case of Validation Error 
In this case user can add the details and save the form again instead of refreshing and then trying again for fresh.

(cherry picked from commit ea2e44a2befd5cfd775f7e1b0d3c2321f6d075b0)
 2025-08-20 09:05:12 +00:00
Shariq Ansari
89abee30bf fix: dropdown item is not updating 
(cherry picked from commit 8ea94765ce351df2586ab71238ef6baa8068613e)
 2025-08-20 07:45:21 +00:00
Shariq Ansari
cf0f922f2f fix: add immediate execution to watch for assignees updates 
(cherry picked from commit f2d87fa801b2c906e182f85bf8e7b29f52ccab4a)
 2025-08-19 08:08:45 +00:00