diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py index 2435029a2c4..d1f498280f5 100644 --- a/erpnext/demo/demo.py +++ b/erpnext/demo/demo.py @@ -53,7 +53,7 @@ def simulate(): if not runs_for: runs_for = frappe.utils.date_diff(frappe.utils.nowdate(), current_date) # runs_for = 100 - + fixed_asset.work() for i in xrange(runs_for): @@ -72,9 +72,6 @@ def simulate(): stock.work() accounts.work() projects.run_projects(current_date) - # run_stock() - # run_accounts() - # run_projects() # run_messages() current_date = frappe.utils.add_days(current_date, 1) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index ab3f6018369..05699b13d6f 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -705,33 +705,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "default": "Purchase", - "fieldname": "default_material_request_type", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Default Material Request Type", - "length": 0, - "no_copy": 0, - "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture", - "permlevel": 0, - "precision": "", - "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, @@ -1993,7 +1966,7 @@ "collapsible": 0, "depends_on": "show_in_website", "fieldname": "route", - "fieldtype": "Data", + "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -2011,7 +1984,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "unique": 1 + "unique": 0 }, { "allow_on_submit": 0, @@ -2335,7 +2308,7 @@ "issingle": 0, "istable": 0, "max_attachments": 1, - "modified": "2016-07-28 19:12:27.253074", + "modified": "2016-08-03 03:39:05.978087", "modified_by": "Administrator", "module": "Stock", "name": "Item",