Skip to content

Commit 279ad96

Browse files
authored
Merge pull request #83 from rtCamp/ui-fixes
feat: Ui update to frappe ui v1.0.0
2 parents 586f620 + 651fe27 commit 279ad96

28 files changed

Lines changed: 1991 additions & 1455 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*.egg-info
44
*.swp
55
__pycache__
6+
.ruff_cache
67
dev-dist
78
tags
89
node_modules

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ crm_sidebar = [
308308
{
309309
"label": "Procurement",
310310
"type": "group",
311-
"icon": "package",
312311
"items": [
313312
{
314313
"label": "Suppliers",
@@ -335,7 +334,7 @@ crm_sidebar = [
335334
| `type` | `str` || `"list_view"`, `"route"`, `"separator"`, or `"group"` |
336335
| `doctype` | `str` | `list_view` only | Frappe DocType to display |
337336
| `url` | `str` | `route` only | Destination URL |
338-
| `icon` | `str` || [Lucide](https://lucide.dev/icons/) icon name (default: `"list"`) |
337+
| `icon` | `str` || [Lucide](https://lucide.dev/icons/) icon name (default: `"list"`). Not supported on `group` — FCRM section headers are chevron + text only |
339338
| `default_filters` | `dict` || Pre-applied filters; users can see and clear them |
340339
| `hidden_filters` | `dict` || Always-applied filters; never shown in the UI |
341340
| `fields` | `list[str]` || Column order override; title and Modified are always included |

frappe_crm_xt/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.1.1"
1+
__version__ = "1.2.0"

frappe_crm_xt/fixtures/crm_form_script.json

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

frappe_crm_xt/hooks.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
# Destination URL, e.g. "/app/purchase-order" or "https://example.com"
106106
#
107107
# icon (str, optional) Lucide icon name (default: "list")
108+
# Not supported on type == "group": FCRM section headers are chevron +
109+
# text only (frappe-ui SidebarLabel has no icon slot), so a group icon
110+
# would be the one header in the sidebar that looks different.
108111
# Any of the 1600+ Lucide icon names work — see https://lucide.dev/icons/
109112
# Common examples: users, user, briefcase, file-text, package,
110113
# shopping-cart, tag, inbox, phone, calendar, square-check,
@@ -174,7 +177,6 @@
174177
# {
175178
# "label": "Procurement", # ── collapsible group ───────────────────
176179
# "type": "group",
177-
# "icon": "package",
178180
# "items": [
179181
# {
180182
# "label": "Suppliers",
@@ -198,7 +200,6 @@
198200
{
199201
"label": "List Views",
200202
"type": "group",
201-
"icon": "layout-grid",
202203
"items": [
203204
{
204205
"label": "Reports",
@@ -214,7 +215,7 @@
214215
"type": "list_view",
215216
"doctype": "CRM Lead",
216217
"icon": "users",
217-
"fields": ["name", "lead_name", "organization", "status", "creation"],
218+
"fields": ["name", "title", "organization", "status", "creation"],
218219
"default_filters": {"converted": ["=", "1"]},
219220
"row_url": "/crm/leads/{name}",
220221
},

frappe_crm_xt/patches.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ frappe_crm_xt.patches.v1_0.reset_fcrm_note_modified_to_creation
99
frappe_crm_xt.patches.v1_0.setup_global_search_for_crm_doctypes #rerun to add CRM Organization
1010
frappe_crm_xt.patches.v1_0.create_crm_slack_notifications
1111
frappe_crm_xt.patches.v1_0.relink_gmail_threads_to_converted_deals
12+
frappe_crm_xt.patches.v1_0.clear_calendar_field_descriptions
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import frappe
2+
3+
FIELDNAMES = (
4+
"custom_start_datetime",
5+
"custom_sync_with_calendar",
6+
"custom_google_calendar_link",
7+
)
8+
9+
10+
def execute():
11+
names = frappe.get_all(
12+
"Custom Field",
13+
filters={
14+
"dt": "CRM Task",
15+
"fieldname": ["in", FIELDNAMES],
16+
"description": ["is", "set"],
17+
},
18+
pluck="name",
19+
)
20+
if not names:
21+
return
22+
23+
for name in names:
24+
frappe.db.set_value("Custom Field", name, "description", "", update_modified=False)

frappe_crm_xt/public/js/search_bar.js

Lines changed: 0 additions & 252 deletions
This file was deleted.

frappe_crm_xt/public/js/style.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

frappe_crm_xt/setup/custom_fields.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,7 @@
422422
"fieldname": "custom_start_datetime",
423423
"fieldtype": "Datetime",
424424
"label": "Start Date & Time",
425-
"insert_after": "due_date",
426-
"description": "Start of the calendar event. Stored in the system timezone; shown in each user's own timezone."
425+
"insert_after": "due_date"
427426
},
428427
{
429428
"fieldname": "custom_calendar_sync_section",
@@ -436,7 +435,6 @@
436435
"fieldname": "custom_sync_with_calendar",
437436
"fieldtype": "Check",
438437
"label": "Sync with Calendar",
439-
"description": "When checked, a Frappe Event is created on this task and linked to your calendar.",
440438
"insert_after": "custom_calendar_sync_section"
441439
},
442440
{
@@ -453,8 +451,7 @@
453451
"label": "Google Calendar",
454452
"options": "Google Calendar",
455453
"insert_after": "custom_event_participants",
456-
"depends_on": "eval:doc.custom_sync_with_calendar",
457-
"description": "The connected Google Calendar to push this event to. The calendar must be authorized with Push enabled."
454+
"depends_on": "eval:doc.custom_sync_with_calendar"
458455
}
459456
],
460457
"CRM Deal Status": [

0 commit comments

Comments
 (0)