From e44d1430e14a359d9a85eb5776dd832df2822100 Mon Sep 17 00:00:00 2001 From: Umair Sayyed Date: Fri, 13 May 2016 18:31:20 +0530 Subject: [PATCH] fixes in domainification. Also reordered some fields in BOM --- erpnext/manufacturing/doctype/bom/bom.json | 122 +++++++++++---------- erpnext/setup/setup_wizard/domainify.py | 7 +- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json index e833e464af..5eeb69fde5 100644 --- a/erpnext/manufacturing/doctype/bom/bom.json +++ b/erpnext/manufacturing/doctype/bom/bom.json @@ -2,6 +2,7 @@ "allow_copy": 0, "allow_import": 1, "allow_rename": 0, + "beta": 0, "creation": "2013-01-22 15:11:38", "custom": 0, "docstatus": 0, @@ -65,49 +66,26 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "rm_cost_as_per", - "fieldtype": "Select", + "default": "1", + "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", + "fieldname": "quantity", + "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "label": "Rate Of Materials Based On", + "label": "Quantity", "length": 0, "no_copy": 0, - "options": "Valuation Rate\nLast Purchase Rate\nPrice List", + "oldfieldname": "quantity", + "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", - "fieldname": "buying_price_list", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Price List", - "length": 0, - "no_copy": 0, - "options": "Price List", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -214,6 +192,57 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "rm_cost_as_per", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Rate Of Materials Based On", + "length": 0, + "no_copy": 0, + "options": "Valuation Rate\nLast Purchase Rate\nPrice List", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", + "fieldname": "buying_price_list", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Price List", + "length": 0, + "no_copy": 0, + "options": "Price List", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -320,34 +349,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "default": "1", - "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", - "fieldname": "quantity", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Quantity", - "length": 0, - "no_copy": 0, - "oldfieldname": "quantity", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -807,7 +808,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-03-30 03:50:02.164476", + "modified": "2016-05-13 18:28:53.557967", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM", @@ -854,6 +855,7 @@ "write": 1 } ], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "search_fields": "item", diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py index 8aec54b7cf..5985708501 100644 --- a/erpnext/setup/setup_wizard/domainify.py +++ b/erpnext/setup/setup_wizard/domainify.py @@ -9,12 +9,11 @@ domains = { 'desktop_icons': ['Item', 'BOM', 'Customer', 'Supplier', 'Sales Order', 'Production Order', 'Stock Entry', 'Purchase Order', 'Task', 'Buying', 'Selling', 'Accounts', 'HR'], - 'remove_roles': ['Maintenance Manager', 'Maintenance User', 'Support Manager', 'Support Team'], 'properties': [ {'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'}, ], 'set_value': [ - ['Stock Settings', None, 'show_barcode_field', 0] + ['Stock Settings', None, 'show_barcode_field', 1] ] }, @@ -34,7 +33,7 @@ domains = { 'Distribution': { 'desktop_icons': ['Item', 'Customer', 'Supplier', 'Lead', 'Sales Order', 'Sales Invoice', 'CRM', 'Selling', 'Buying', 'Stock', 'Accounts', 'HR'], - 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Maintenance User'], + 'remove_roles': ['Manufacturing User', 'Manufacturing Manager'], 'properties': [ {'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1}, ], @@ -46,7 +45,7 @@ domains = { 'Services': { 'desktop_icons': ['Project', 'Time Log', 'Customer', 'Sales Invoice', 'Lead', 'Opportunity', 'Expense Claim', 'Employee', 'HR'], - 'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Maintenance User'], + 'remove_roles': ['Manufacturing User', 'Manufacturing Manager'], 'properties': [ {'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0}, ],