From 2dfe13e183f5358e9ad2ce85ddf5f4bea31d7902 Mon Sep 17 00:00:00 2001 From: Md Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com> Date: Wed, 2 Apr 2025 12:15:10 +0530 Subject: [PATCH] chore: update links to Frappe School (#46823) (cherry picked from commit ef4f662c319d8d7d1943c3bc62abc9652a15a7e4) # Conflicts: # erpnext/accounts/workspace/accounting/accounting.json # erpnext/buying/workspace/buying/buying.json # erpnext/manufacturing/workspace/manufacturing/manufacturing.json # erpnext/projects/workspace/projects/projects.json # erpnext/selling/workspace/selling/selling.json # erpnext/stock/workspace/stock/stock.json --- README.md | 2 +- .../accounts/workspace/accounting/accounting.json | 6 +++++- erpnext/buying/workspace/buying/buying.json | 6 +++++- .../workspace/manufacturing/manufacturing.json | 6 +++++- erpnext/projects/workspace/projects/projects.json | 6 +++++- erpnext/selling/workspace/selling/selling.json | 12 +++++++++++- erpnext/setup/install.py | 2 +- erpnext/stock/workspace/stock/stock.json | 6 +++++- 8 files changed, 38 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 44bd7296881..3b703d97831 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ New passwords will be created for the ERPNext "Administrator" user, the MariaDB ## Learning and community -1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. +1. [Frappe School](https://school.frappe.io) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. 2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext. 3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers. 4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users. diff --git a/erpnext/accounts/workspace/accounting/accounting.json b/erpnext/accounts/workspace/accounting/accounting.json index 45ab92e2c56..ed081102aa3 100644 --- a/erpnext/accounts/workspace/accounting/accounting.json +++ b/erpnext/accounts/workspace/accounting/accounting.json @@ -621,7 +621,11 @@ "doc_view": "List", "label": "Learn Accounting", "type": "URL", +<<<<<<< HEAD "url": "https://frappe.school/courses/erpnext-accounting?utm_source=in_app" +======= + "url": "https://school.frappe.io/lms/courses/erpnext-accounting?utm_source=in_app" +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) }, { "label": "Chart of Accounts", @@ -670,4 +674,4 @@ } ], "title": "Accounting" -} \ No newline at end of file +} diff --git a/erpnext/buying/workspace/buying/buying.json b/erpnext/buying/workspace/buying/buying.json index 1394fc48d5b..54f44ea13da 100644 --- a/erpnext/buying/workspace/buying/buying.json +++ b/erpnext/buying/workspace/buying/buying.json @@ -537,7 +537,11 @@ "doc_view": "List", "label": "Learn Procurement", "type": "URL", +<<<<<<< HEAD "url": "https://frappe.school/courses/procurement?utm_source=in_app" +======= + "url": "https://school.frappe.io/lms/courses/procurement?utm_source=in_app" +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) }, { "color": "Yellow", @@ -572,4 +576,4 @@ } ], "title": "Buying" -} \ No newline at end of file +} diff --git a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json index 06b9f1b0759..08befc61ef0 100644 --- a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json +++ b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json @@ -336,7 +336,11 @@ "doc_view": "List", "label": "Learn Manufacturing", "type": "URL", +<<<<<<< HEAD "url": "https://frappe.school/courses/manufacturing?utm_source=in_app" +======= + "url": "https://school.frappe.io/lms/courses/manufacturing?utm_source=in_app" +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) }, { "color": "Grey", @@ -402,4 +406,4 @@ ], "title": "Manufacturing", "type": "Workspace" -} \ No newline at end of file +} diff --git a/erpnext/projects/workspace/projects/projects.json b/erpnext/projects/workspace/projects/projects.json index 94ae9c04a40..9effb1cbda6 100644 --- a/erpnext/projects/workspace/projects/projects.json +++ b/erpnext/projects/workspace/projects/projects.json @@ -210,7 +210,11 @@ "doc_view": "List", "label": "Learn Project Management", "type": "URL", +<<<<<<< HEAD "url": "https://frappe.school/courses/project-management?utm_source=in_app" +======= + "url": "https://school.frappe.io/lms/courses/project-management?utm_source=in_app" +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) }, { "color": "Blue", @@ -245,4 +249,4 @@ } ], "title": "Projects" -} \ No newline at end of file +} diff --git a/erpnext/selling/workspace/selling/selling.json b/erpnext/selling/workspace/selling/selling.json index e13bdec11fb..a392574e15c 100644 --- a/erpnext/selling/workspace/selling/selling.json +++ b/erpnext/selling/workspace/selling/selling.json @@ -639,7 +639,11 @@ "doc_view": "List", "label": "Learn Sales Management", "type": "URL", +<<<<<<< HEAD "url": "https://frappe.school/courses/sales-management-course?utm_source=in_app" +======= + "url": "https://school.frappe.io/lms/courses/sales-management-course?utm_source=in_app" +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) }, { "label": "Point of Sale", @@ -676,5 +680,11 @@ "type": "Dashboard" } ], +<<<<<<< HEAD "title": "Selling" -} \ No newline at end of file +} +======= + "title": "Selling", + "type": "Workspace" +} +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 23ffd49de5d..81e1ac6a458 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -182,7 +182,7 @@ def add_standard_navbar_items(): { "item_label": "Frappe School", "item_type": "Route", - "route": "https://frappe.school?utm_source=in_app", + "route": "https://frappe.io/school?utm_source=in_app", "is_standard": 1, }, { diff --git a/erpnext/stock/workspace/stock/stock.json b/erpnext/stock/workspace/stock/stock.json index 1a683e2b3d8..9a9e3d9e5c3 100644 --- a/erpnext/stock/workspace/stock/stock.json +++ b/erpnext/stock/workspace/stock/stock.json @@ -802,7 +802,11 @@ "doc_view": "List", "label": "Learn Inventory Management", "type": "URL", +<<<<<<< HEAD "url": "https://frappe.school/courses/inventory-management?utm_source=in_app" +======= + "url": "https://school.frappe.io/lms/courses/inventory-management?utm_source=in_app" +>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823)) }, { "color": "Yellow", @@ -850,4 +854,4 @@ } ], "title": "Stock" -} \ No newline at end of file +}