Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Refined Onboarding, desk cards and renamed field in Buying Settings

Browse Source
This commit is contained in:
marination 2020-05-15 15:17:11 +05:30
parent 2a73b3ef25
commit ec1f9594fa
11 changed files with 148 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
erpnext/buying/desk_page/buying/buying.json
View File

@ -33,7 +33,7 @@
{
"hidden": 0,
"label": "Other Reports",
"links": "[\n {\n \"is_query_report\": true,\n \"label\": \"Items To Be Requested\",\n \"name\": \"Items To Be Requested\",\n \"onboard\": 1,\n \"reference_doctype\": \"Item\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Item-wise Purchase History\",\n \"name\": \"Item-wise Purchase History\",\n \"onboard\": 1,\n \"reference_doctype\": \"Item\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Subcontracted Raw Materials To Be Transferred\",\n \"name\": \"Subcontracted Raw Materials To Be Transferred\",\n \"reference_doctype\": \"Purchase Order\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Subcontracted Item To Be Received\",\n \"name\": \"Subcontracted Item To Be Received\",\n \"reference_doctype\": \"Purchase Order\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Quoted Item Comparison\",\n \"name\": \"Quoted Item Comparison\",\n \"reference_doctype\": \"Supplier Quotation\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Material Requests for which Supplier Quotations are not created\",\n \"name\": \"Material Requests for which Supplier Quotations are not created\",\n \"reference_doctype\": \"Material Request\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Supplier Addresses And Contacts\",\n \"name\": \"Address And Contacts\",\n \"reference_doctype\": \"Address\",\n \"route_options\": {\n \"party_type\": \"Supplier\"\n },\n \"type\": \"report\"\n }\n]"
"links": "[\n {\n \"is_query_report\": true,\n \"label\": \"Items To Be Requested\",\n \"name\": \"Items To Be Requested\",\n \"onboard\": 1,\n \"reference_doctype\": \"Item\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Item-wise Purchase History\",\n \"name\": \"Item-wise Purchase History\",\n \"onboard\": 1,\n \"reference_doctype\": \"Item\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Subcontracted Raw Materials To Be Transferred\",\n \"name\": \"Subcontracted Raw Materials To Be Transferred\",\n \"reference_doctype\": \"Purchase Order\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Subcontracted Item To Be Received\",\n \"name\": \"Subcontracted Item To Be Received\",\n \"reference_doctype\": \"Purchase Order\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Quoted Item Comparison\",\n \"name\": \"Quoted Item Comparison\",\n \"onboard\": 1,\n \"reference_doctype\": \"Supplier Quotation\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Material Requests for which Supplier Quotations are not created\",\n \"name\": \"Material Requests for which Supplier Quotations are not created\",\n \"reference_doctype\": \"Material Request\",\n \"type\": \"report\"\n },\n {\n \"is_query_report\": true,\n \"label\": \"Supplier Addresses And Contacts\",\n \"name\": \"Address And Contacts\",\n \"reference_doctype\": \"Address\",\n \"route_options\": {\n \"party_type\": \"Supplier\"\n },\n \"type\": \"report\"\n }\n]"
}
],
"cards_label": "Masters & Reports ",
@ -54,7 +54,7 @@
"idx": 0,
"is_standard": 1,
"label": "Buying",
"modified": "2020-05-06 18:10:12.760321",
"modified": "2020-05-15 14:26:42.505702",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying",
@ -64,11 +64,11 @@
"pin_to_top": 0,
"shortcuts": [
{
"color": "#ffe8cd",
"format": "{} to Receive",
"label": "Purchase Order",
"link_to": "Purchase Order",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\":[\"in\", [\"To Receive\", \"To Receive and Bill\"]]\n}",
"color": "#cef6d1",
"format": "{} available",
"label": "Item",
"link_to": "Item",
"stats_filter": "{\n \"disabled\": 0\n}",
"type": "DocType"
},
{
@ -81,31 +81,20 @@
},
{
"color": "#ffe8cd",
"format": "{} to Bill ",
"label": "Purchase Receipt",
"link_to": "Purchase Receipt",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\": \"To Bill\"\n}",
"format": "{} to Receive",
"label": "Purchase Order",
"link_to": "Purchase Order",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\":[\"in\", [\"To Receive\", \"To Receive and Bill\"]]\n}",
"type": "DocType"
},
{
"color": "#ffe8cd",
"format": "{} Unpaid / Overdue",
"label": "Purchase Invoice",
"link_to": "Purchase Invoice",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\": [\"in\", [\"Unpaid\", \"Overdue\"]]\n}",
"type": "DocType"
"label": "Purchase Analytics",
"link_to": "Purchase Analytics",
"type": "Report"
},
{
"color": "#cef6d1",
"format": "{} Active",
"label": "Supplier Quotation",
"link_to": "Supplier Quotation",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\":[\"!=\", \"Expired\"]\n}",
"type": "DocType"
},
{
"label": "Item-wise Purchase Register",
"link_to": "Item-wise Purchase Register",
"label": "Purchase Order Analysis",
"link_to": "Purchase Order Analysis",
"type": "Report"
}
],

23
erpnext/buying/doctype/buying_settings/buying_settings.js
View File

@ -6,3 +6,26 @@ frappe.ui.form.on('Buying Settings', {
// }
});
frappe.tour['Buying Settings'] = [
{
fieldname: "supp_master_name",
title: "Supplier Naming By",
description: __("By default, the Item Name is set as per the Item Code entered. If you want Items to be named by a set ") + "<a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series'>Naming Series</a>" + __(" choose the 'Naming Series' option."),
},
{
fieldname: "buying_price_list",
title: "Default Buying Price List",
description: __("Configure the default Price List when creating a new Buying transaction, the default is set as 'Standard Buying'. Item prices will be fetched from this Price List. You can modify the 'Price List' by using the arrow at the right-end of the field to change the currency and country.")
},
{
fieldname: "po_required",
title: "Purchase Order Required for Purchase Invoice & Receipt Creation",
description: __("If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in supplier master.")
},
{
fieldname: "pr_required",
title: "Purchase Receipt Required for Purchase Invoice Creation",
description: __("If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in supplier master.")
}
];

13
erpnext/buying/doctype/buying_settings/buying_settings.json
View File

@ -1,8 +1,10 @@
{
"actions": [],
"creation": "2013-06-25 11:04:03",
"description": "Settings for Buying Module",
"doctype": "DocType",
"document_type": "Other",
"engine": "InnoDB",
"field_order": [
"supp_master_name",
"supplier_group",
@ -44,13 +46,13 @@
{
"fieldname": "po_required",
"fieldtype": "Select",
"label": "Purchase Order Required",
"label": "Purchase Order Required for Purchase Invoice & Receipt Creation",
"options": "No\nYes"
},
{
"fieldname": "pr_required",
"fieldtype": "Select",
"label": "Purchase Receipt Required",
"label": "Purchase Receipt Required for Purchase Invoice Creation",
"options": "No\nYes"
},
{
@ -92,7 +94,8 @@
"icon": "fa fa-cog",
"idx": 1,
"issingle": 1,
"modified": "2019-08-20 13:13:09.055189",
"links": [],
"modified": "2020-05-15 14:49:32.513611",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying Settings",
@ -107,5 +110,7 @@
"share": 1,
"write": 1
}
]
],
"sort_field": "modified",
"sort_order": "DESC"
}

54
erpnext/buying/module_onboarding/buying/buying.json Normal file
View File

@ -0,0 +1,54 @@
{
"allow_roles": [
{
"role": "Purchase Manager"
},
{
"role": "Purchase User"
},
{
"role": "Stock Manager"
},
{
"role": "Stock User"
}
],
"creation": "2020-05-06 15:56:35.049205",
"docstatus": 0,
"doctype": "Module Onboarding",
"documentation_url": "https://docs.erpnext.com/docs/user/manual/en/buying",
"idx": 0,
"is_complete": 0,
"modified": "2020-05-15 14:39:16.514904",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying",
"owner": "Administrator",
"steps": [
{
"step": "Introduction to Buying"
},
{
"step": "Create a Supplier"
},
{
"step": "Create a Warehouse"
},
{
"step": "Create a Product"
},
{
"step": "Buying Settings"
},
{
"step": "Create your first Purchase Order"
},
{
"step": "Create a Material Request"
}
],
"subtitle": "Products, Purchases, Analysis and more.",
"success_message": "The Buying Module is all set up!",
"title": "Let's Setup the Buying Module.",
"user_can_dismiss": 1
}

11
erpnext/buying/onboarding_step/buying_settings/buying_settings.json
View File

@ -1,16 +1,19 @@
{
"action": "Update Settings",
"action": "Show Form Tour",
"creation": "2020-05-06 15:53:44.667414",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 0,
"is_complete": 0,
"is_mandatory": 0,
"is_mandatory": 1,
"is_single": 1,
"is_skipped": 0,
"modified": "2020-05-12 18:30:06.323797",
"modified": "2020-05-15 14:38:01.142256",
"modified_by": "Administrator",
"name": "Buying Settings",
"owner": "Administrator",
"reference_document": "Buying Settings",
"title": "Configure Buying Settings."
"show_full_form": 0,
"title": "Explore Buying Settings.",
"validate_action": 0
}

19
erpnext/buying/onboarding_step/create_a_material_request/create_a_material_request.json Normal file
View File

@ -0,0 +1,19 @@
{
"action": "Create Entry",
"creation": "2020-05-15 14:39:09.818764",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 0,
"is_complete": 0,
"is_mandatory": 1,
"is_single": 0,
"is_skipped": 0,
"modified": "2020-05-15 14:39:09.818764",
"modified_by": "Administrator",
"name": "Create a Material Request",
"owner": "Administrator",
"reference_document": "Material Request",
"show_full_form": 1,
"title": "Create a Material Request",
"validate_action": 1
}

5
erpnext/buying/onboarding_step/create_a_product/create_a_product.json
View File

@ -6,11 +6,14 @@
"idx": 0,
"is_complete": 0,
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2020-05-12 18:30:02.489949",
"modified_by": "Administrator",
"name": "Create a Product",
"owner": "Administrator",
"reference_document": "Item",
"title": "Create a Product"
"show_full_form": 0,
"title": "Create a Product",
"validate_action": 1
}

5
erpnext/buying/onboarding_step/create_a_supplier/create_a_supplier.json
View File

@ -6,11 +6,14 @@
"idx": 0,
"is_complete": 0,
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2020-05-12 18:25:29.121647",
"modified_by": "Administrator",
"name": "Create a Supplier",
"owner": "Administrator",
"reference_document": "Supplier",
"title": "Create a Supplier"
"show_full_form": 0,
"title": "Create a Supplier",
"validate_action": 1
}

7
erpnext/buying/onboarding_step/create_a_warehouse/create_a_warehouse.json
View File

@ -6,11 +6,14 @@
"idx": 0,
"is_complete": 0,
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2020-05-12 18:27:44.128737",
"modified": "2020-05-15 14:32:17.072731",
"modified_by": "Administrator",
"name": "Create a Warehouse",
"owner": "Administrator",
"reference_document": "Warehouse",
"title": "Setup your Purchase Warehouse"
"show_full_form": 0,
"title": "Setup your Warehouse",
"validate_action": 1
}

5
erpnext/buying/onboarding_step/create_your_first_purchase_order/create_your_first_purchase_order.json
View File

@ -6,11 +6,14 @@
"idx": 0,
"is_complete": 0,
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2020-05-12 18:31:56.856112",
"modified_by": "Administrator",
"name": "Create your first Purchase Order",
"owner": "Administrator",
"reference_document": "Purchase Order",
"title": "Create your first Purchase Order"
"show_full_form": 0,
"title": "Create your first Purchase Order",
"validate_action": 1
}

3
erpnext/buying/onboarding_step/introduction_to_buying/introduction_to_buying.json
View File

@ -6,11 +6,14 @@
"idx": 0,
"is_complete": 0,
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
"modified": "2020-05-12 18:25:08.509900",
"modified_by": "Administrator",
"name": "Introduction to Buying",
"owner": "Administrator",
"show_full_form": 0,
"title": "Introduction to Buying",
"validate_action": 1,
"video_url": "https://youtu.be/efFajTTQBa8"
}