diff --git a/erpnext/crm/doctype/newsletter/newsletter.json b/erpnext/crm/doctype/newsletter/newsletter.json index a18c7b31bdb..f2baf2e462b 100644 --- a/erpnext/crm/doctype/newsletter/newsletter.json +++ b/erpnext/crm/doctype/newsletter/newsletter.json @@ -78,7 +78,7 @@ ], "icon": "icon-envelope", "idx": 1, - "modified": "2015-03-19 07:39:53.550198", + "modified": "2015-03-20 05:27:31.613881", "modified_by": "Administrator", "module": "CRM", "name": "Newsletter", diff --git a/erpnext/patches/v5_0/convert_stock_reconciliation.py b/erpnext/patches/v5_0/convert_stock_reconciliation.py index ce649c0d60c..1417426361f 100644 --- a/erpnext/patches/v5_0/convert_stock_reconciliation.py +++ b/erpnext/patches/v5_0/convert_stock_reconciliation.py @@ -9,12 +9,13 @@ def execute(): {"reconciliation_json": ["!=", ""]}): sr = frappe.get_doc("Stock Reconciliation", sr.name) for item in json.loads(sr.reconciliation_json): - sr.append("items", { - "item_code": item.item_code, - "warehouse": item.warehouse, - "valuation_rate": item.valuation_rate, - "qty": item.qty - }) + if item.get("item_code"): + sr.append("items", { + "item_code": item.item_code, + "warehouse": item.warehouse, + "valuation_rate": item.valuation_rate, + "qty": item.qty + }) for item in sr.items: item.db_update() diff --git a/erpnext/support/__init__.py b/erpnext/support/__init__.py index b72925ea895..cc26c14433c 100644 --- a/erpnext/support/__init__.py +++ b/erpnext/support/__init__.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals install_docs = [ {'doctype':'Role', 'role_name':'Support Team', 'name':'Support Team'}, - {'doctype':'Role', 'role_name':'Support Manager', 'name':'Support Manager'}, {'doctype':'Role', 'role_name':'Maintenance User', 'name':'Maintenance User'}, {'doctype':'Role', 'role_name':'Maintenance Manager', 'name':'Maintenance Manager'} ]