Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index a87d0de..7bff8f3 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.0.47'
+__version__ = '7.0.48'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index bd7d9a4..07bf0f0 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -23,17 +23,15 @@
execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
execute:frappe.reload_doc('accounts', 'doctype', 'asset_category')
execute:frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
-execute:frappe.reload_doctype('Item')
erpnext.patches.v4_0.map_charge_to_taxes_and_charges
execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
execute:frappe.db.sql("update tabPage set module='Core' where name='Setup'")
-
erpnext.patches.v5_2.change_item_selects_to_checks
+execute:frappe.reload_doctype('Item')
erpnext.patches.v4_0.fields_to_be_renamed
erpnext.patches.v4_0.rename_sitemap_to_route
erpnext.patches.v7_0.re_route #2016-06-27
-
erpnext.patches.v4_0.fix_contact_address
erpnext.patches.v4_0.customer_discount_to_pricing_rule
execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
diff --git a/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py b/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
index d3dd2e9..77ecafd 100644
--- a/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
+++ b/erpnext/patches/v7_0/repost_gle_for_pos_sales_return.py
@@ -7,6 +7,7 @@
def execute():
frappe.reload_doctype("Sales Invoice")
+ frappe.reload_doctype("Sales Invoice Item")
for si in frappe.get_all("Sales Invoice", fields = ["name"],
filters={"docstatus": 1, "is_pos": 1, "is_return": 1}):