Merge branch 'develop' into healthcare_refactor
diff --git a/erpnext/accounts/desk_page/accounting/accounting.json b/erpnext/accounts/desk_page/accounting/accounting.json
index 39ce586..7a777f9 100644
--- a/erpnext/accounts/desk_page/accounting/accounting.json
+++ b/erpnext/accounts/desk_page/accounting/accounting.json
@@ -85,10 +85,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Accounting",
- "modified": "2020-03-05 11:27:25.548004",
+ "modified": "2020-03-12 16:30:35.580450",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting",
diff --git a/erpnext/agriculture/desk_page/agriculture/agriculture.json b/erpnext/agriculture/desk_page/agriculture/agriculture.json
index b100ddf..6020d62 100644
--- a/erpnext/agriculture/desk_page/agriculture/agriculture.json
+++ b/erpnext/agriculture/desk_page/agriculture/agriculture.json
@@ -20,9 +20,11 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"idx": 0,
+ "is_standard": 1,
"label": "Agriculture",
- "modified": "2020-03-05 11:27:25.738073",
+ "modified": "2020-03-12 16:30:37.565413",
"modified_by": "Administrator",
"module": "Agriculture",
"name": "Agriculture",
diff --git a/erpnext/assets/desk_page/assets/assets.json b/erpnext/assets/desk_page/assets/assets.json
index c737b24..f9c65cb 100644
--- a/erpnext/assets/desk_page/assets/assets.json
+++ b/erpnext/assets/desk_page/assets/assets.json
@@ -21,10 +21,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Assets",
- "modified": "2020-03-05 11:27:25.866520",
+ "modified": "2020-03-12 16:30:38.651019",
"modified_by": "Administrator",
"module": "Assets",
"name": "Assets",
diff --git a/erpnext/buying/desk_page/buying/buying.json b/erpnext/buying/desk_page/buying/buying.json
index 0f078f3..ae8a605 100644
--- a/erpnext/buying/desk_page/buying/buying.json
+++ b/erpnext/buying/desk_page/buying/buying.json
@@ -46,10 +46,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Buying",
- "modified": "2020-03-05 11:27:26.007461",
+ "modified": "2020-03-12 16:30:40.779078",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying",
diff --git a/erpnext/communication/desk_page/communication/communication.json b/erpnext/communication/desk_page/communication/communication.json
index 7ad383e..59318fb 100644
--- a/erpnext/communication/desk_page/communication/communication.json
+++ b/erpnext/communication/desk_page/communication/communication.json
@@ -6,10 +6,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Communication",
- "modified": "2020-03-05 11:27:25.989412",
+ "modified": "2020-03-12 16:30:40.534226",
"modified_by": "Administrator",
"module": "Communication",
"name": "Communication",
diff --git a/erpnext/crm/desk_page/crm/crm.json b/erpnext/crm/desk_page/crm/crm.json
index 36ea3bb..9ebbe27 100644
--- a/erpnext/crm/desk_page/crm/crm.json
+++ b/erpnext/crm/desk_page/crm/crm.json
@@ -28,10 +28,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "CRM",
- "modified": "2020-03-05 11:27:26.045510",
+ "modified": "2020-03-12 16:30:41.142037",
"modified_by": "Administrator",
"module": "CRM",
"name": "CRM",
diff --git a/erpnext/education/desk_page/education/education.json b/erpnext/education/desk_page/education/education.json
index 6e85aae..bbd8ead 100644
--- a/erpnext/education/desk_page/education/education.json
+++ b/erpnext/education/desk_page/education/education.json
@@ -60,9 +60,11 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"idx": 0,
+ "is_standard": 1,
"label": "Education",
- "modified": "2020-03-05 11:27:25.706693",
+ "modified": "2020-03-12 16:30:37.217514",
"modified_by": "Administrator",
"module": "Education",
"name": "Education",
diff --git a/erpnext/healthcare/desk_page/healthcare/healthcare.json b/erpnext/healthcare/desk_page/healthcare/healthcare.json
index d948cee..320fd74 100644
--- a/erpnext/healthcare/desk_page/healthcare/healthcare.json
+++ b/erpnext/healthcare/desk_page/healthcare/healthcare.json
@@ -50,9 +50,11 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"idx": 0,
+ "is_standard": 1,
"label": "Healthcare",
- "modified": "2020-03-12 17:24:45.970847",
+ "modified": "2020-03-12 16:30:36.952979",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Healthcare",
diff --git a/erpnext/hr/desk_page/hr/hr.json b/erpnext/hr/desk_page/hr/hr.json
index 6955484..ec38ef0 100644
--- a/erpnext/hr/desk_page/hr/hr.json
+++ b/erpnext/hr/desk_page/hr/hr.json
@@ -70,10 +70,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "HR",
- "modified": "2020-03-05 11:27:25.493284",
+ "modified": "2020-03-12 16:30:35.211246",
"modified_by": "Administrator",
"module": "HR",
"name": "HR",
diff --git a/erpnext/loan_management/desk_page/loan_management/loan_management.json b/erpnext/loan_management/desk_page/loan_management/loan_management.json
new file mode 100644
index 0000000..1d60ca4
--- /dev/null
+++ b/erpnext/loan_management/desk_page/loan_management/loan_management.json
@@ -0,0 +1,54 @@
+{
+ "cards": [
+ {
+ "links": "[\n {\n \"description\": \"Loan Type for interest and penalty rates\",\n \"label\": \"Loan Type\",\n \"name\": \"Loan Type\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Loan Applications from customers and employees.\",\n \"label\": \"Loan Application\",\n \"name\": \"Loan Application\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Loans provided to customers and employees.\",\n \"label\": \"Loan\",\n \"name\": \"Loan\",\n \"type\": \"doctype\"\n }\n]",
+ "title": "Loan"
+ },
+ {
+ "links": "[\n {\n \"label\": \"Process Loan Security Shortfall\",\n \"name\": \"Process Loan Security Shortfall\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Process Loan Interest Accrual\",\n \"name\": \"Process Loan Interest Accrual\",\n \"type\": \"doctype\"\n }\n]",
+ "title": "Loan Processes"
+ },
+ {
+ "links": "[\n {\n \"label\": \"Loan Disbursement\",\n \"name\": \"Loan Disbursement\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Repayment\",\n \"name\": \"Loan Repayment\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Interest Accrual\",\n \"name\": \"Loan Interest Accrual\",\n \"type\": \"doctype\"\n }\n]",
+ "title": "Disbursement and Repayment"
+ },
+ {
+ "links": "[\n {\n \"label\": \"Loan Security Type\",\n \"name\": \"Loan Security Type\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Security Price\",\n \"name\": \"Loan Security Price\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Security\",\n \"name\": \"Loan Security\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Security Pledge\",\n \"name\": \"Loan Security Pledge\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Security Unpledge\",\n \"name\": \"Loan Security Unpledge\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Loan Security Shortfall\",\n \"name\": \"Loan Security Shortfall\",\n \"type\": \"doctype\"\n }\n]",
+ "title": "Loan Security"
+ },
+ {
+ "links": "[\n {\n \"dependencies\": [\n \"Loan Repayment\"\n ],\n \"doctype\": \"Loan Repayment\",\n \"incomplete_dependencies\": [\n \"Loan Repayment\"\n ],\n \"is_query_report\": true,\n \"label\": \"Loan Repayment and Closure\",\n \"name\": \"Loan Repayment and Closure\",\n \"route\": \"#query-report/Loan Repayment and Closure\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Loan Security Pledge\"\n ],\n \"doctype\": \"Loan Security Pledge\",\n \"incomplete_dependencies\": [\n \"Loan Security Pledge\"\n ],\n \"is_query_report\": true,\n \"label\": \"Loan Security Status\",\n \"name\": \"Loan Security Status\",\n \"route\": \"#query-report/Loan Security Status\",\n \"type\": \"report\"\n }\n]",
+ "title": "Reports"
+ }
+ ],
+ "category": "Modules",
+ "charts": [],
+ "creation": "2020-03-12 16:35:55.299820",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends_another_page": 0,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "Loan Management",
+ "modified": "2020-03-12 16:38:00.347959",
+ "modified_by": "Administrator",
+ "module": "Loan Management",
+ "name": "Loan Management",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": [
+ {
+ "is_query_report": 0,
+ "link_to": "Loan Application",
+ "type": "DocType"
+ },
+ {
+ "is_query_report": 0,
+ "link_to": "Loan",
+ "type": "DocType"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
index c8ade46..6127ef6 100644
--- a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
@@ -36,9 +36,11 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"idx": 0,
+ "is_standard": 1,
"label": "Manufacturing",
- "modified": "2020-03-05 11:27:25.627824",
+ "modified": "2020-03-12 16:30:36.389877",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing",
diff --git a/erpnext/non_profit/desk_page/non_profit/non_profit.json b/erpnext/non_profit/desk_page/non_profit/non_profit.json
index 62117ca..5d759ba 100644
--- a/erpnext/non_profit/desk_page/non_profit/non_profit.json
+++ b/erpnext/non_profit/desk_page/non_profit/non_profit.json
@@ -34,9 +34,11 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"idx": 0,
+ "is_standard": 1,
"label": "Non Profit",
- "modified": "2020-03-05 11:27:25.655850",
+ "modified": "2020-03-12 16:30:36.683012",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Non Profit",
diff --git a/erpnext/projects/desk_page/projects/projects.json b/erpnext/projects/desk_page/projects/projects.json
index bf362aa..13fd1b8 100644
--- a/erpnext/projects/desk_page/projects/projects.json
+++ b/erpnext/projects/desk_page/projects/projects.json
@@ -22,10 +22,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Projects",
- "modified": "2020-03-05 11:27:26.076716",
+ "modified": "2020-03-12 16:30:41.538685",
"modified_by": "Administrator",
"module": "Projects",
"name": "Projects",
diff --git a/erpnext/quality_management/desk_page/quality/quality.json b/erpnext/quality_management/desk_page/quality/quality.json
index 06ec869..5193e0c 100644
--- a/erpnext/quality_management/desk_page/quality/quality.json
+++ b/erpnext/quality_management/desk_page/quality/quality.json
@@ -24,10 +24,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Quality",
- "modified": "2020-03-05 11:27:25.890813",
+ "modified": "2020-03-12 16:30:39.093081",
"modified_by": "Administrator",
"module": "Quality Management",
"name": "Quality",
diff --git a/erpnext/selling/desk_page/retail/retail.json b/erpnext/selling/desk_page/retail/retail.json
index db726d7..9838462 100644
--- a/erpnext/selling/desk_page/retail/retail.json
+++ b/erpnext/selling/desk_page/retail/retail.json
@@ -12,9 +12,11 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"idx": 0,
+ "is_standard": 1,
"label": "Retail",
- "modified": "2020-03-05 11:27:25.602834",
+ "modified": "2020-03-12 16:30:36.154297",
"modified_by": "Administrator",
"module": "Selling",
"name": "Retail",
diff --git a/erpnext/selling/desk_page/selling/selling.json b/erpnext/selling/desk_page/selling/selling.json
index 1e7e029..7a0111c 100644
--- a/erpnext/selling/desk_page/selling/selling.json
+++ b/erpnext/selling/desk_page/selling/selling.json
@@ -38,10 +38,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Selling",
- "modified": "2020-03-05 11:27:25.835953",
+ "modified": "2020-03-12 16:30:38.207013",
"modified_by": "Administrator",
"module": "Selling",
"name": "Selling",
diff --git a/erpnext/setup/desk_page/erpnext_settings/erpnext_settings.json b/erpnext/setup/desk_page/erpnext_settings/erpnext_settings.json
new file mode 100644
index 0000000..ac0a4b2
--- /dev/null
+++ b/erpnext/setup/desk_page/erpnext_settings/erpnext_settings.json
@@ -0,0 +1,112 @@
+{
+ "cards": [],
+ "category": "Modules",
+ "charts": [],
+ "creation": "2020-03-12 14:47:51.166455",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends": "Settings",
+ "extends_another_page": 1,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "ERPNext Settings",
+ "modified": "2020-03-12 18:03:17.126782",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "ERPNext Settings",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": [
+ {
+ "icon": "octicon octicon-rocket",
+ "is_query_report": 0,
+ "link_to": "Projects Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-repo",
+ "is_query_report": 0,
+ "link_to": "Accounts Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-package",
+ "is_query_report": 0,
+ "link_to": "Stock Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-organization",
+ "is_query_report": 0,
+ "link_to": "HR Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-tag",
+ "is_query_report": 0,
+ "link_to": "Selling Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-briefcase",
+ "is_query_report": 0,
+ "link_to": "Buying Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "fa fa-life-ring",
+ "is_query_report": 0,
+ "link_to": "Support Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "fa fa-shopping-cart",
+ "is_query_report": 0,
+ "link_to": "Shopping Cart Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "fa fa-globe",
+ "is_query_report": 0,
+ "link_to": "Portal Settings",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-tools",
+ "is_query_report": 0,
+ "link_to": "Manufacturing Settings",
+ "restrict_to_domain": "Manufacturing",
+ "type": "DocType"
+ },
+ {
+ "icon": "octicon octicon-mortar-board",
+ "is_query_report": 0,
+ "link_to": "Education Settings",
+ "restrict_to_domain": "Education",
+ "type": "DocType"
+ },
+ {
+ "icon": "fa fa-bed",
+ "is_query_report": 0,
+ "link_to": "Hotel Settings",
+ "restrict_to_domain": "Hospitality",
+ "type": "DocType"
+ },
+ {
+ "icon": "fa fa-heartbeat",
+ "is_query_report": 0,
+ "link_to": "Healthcare Settings",
+ "restrict_to_domain": "Healthcare",
+ "type": "DocType"
+ },
+ {
+ "icon": "fa fa-cog",
+ "is_query_report": 0,
+ "link_to": "Domain Settings",
+ "type": "DocType"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/setup/desk_page/getting_started/getting_started.json b/erpnext/setup/desk_page/getting_started/getting_started.json
index d67da62..00236ba 100644
--- a/erpnext/setup/desk_page/getting_started/getting_started.json
+++ b/erpnext/setup/desk_page/getting_started/getting_started.json
@@ -50,10 +50,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Getting Started",
- "modified": "2020-03-05 11:27:25.800189",
+ "modified": "2020-03-12 16:30:37.821762",
"modified_by": "Administrator",
"module": "Setup",
"name": "Getting Started",
diff --git a/erpnext/stock/desk_page/stock/stock.json b/erpnext/stock/desk_page/stock/stock.json
index 5786733..779e61f 100644
--- a/erpnext/stock/desk_page/stock/stock.json
+++ b/erpnext/stock/desk_page/stock/stock.json
@@ -44,10 +44,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Stock",
- "modified": "2020-03-05 11:27:25.950288",
+ "modified": "2020-03-12 16:30:39.881667",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock",
diff --git a/erpnext/support/desk_page/support/support.json b/erpnext/support/desk_page/support/support.json
index 8602567..4a7885e 100644
--- a/erpnext/support/desk_page/support/support.json
+++ b/erpnext/support/desk_page/support/support.json
@@ -34,10 +34,12 @@
"disable_user_customization": 0,
"docstatus": 0,
"doctype": "Desk Page",
+ "extends_another_page": 0,
"icon": "",
"idx": 0,
+ "is_standard": 1,
"label": "Support",
- "modified": "2020-03-05 11:27:25.917497",
+ "modified": "2020-03-12 16:30:39.482621",
"modified_by": "Administrator",
"module": "Support",
"name": "Support",