Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 6dd2447..0a6655d 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.0.6'
+__version__ = '7.0.7'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py b/erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
index ff9d48a..ba1d067 100644
--- a/erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
+++ b/erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
@@ -20,7 +20,7 @@
from `tabStock Ledger Entry` sle
where sle.warehouse in (%s) and creation > '2016-05-01'
and not exists(select name from `tabGL Entry`
- where account=sle.warehosue and voucher_type=sle.voucher_type and voucher_no=sle.voucher_no)
+ where account=sle.warehouse and voucher_type=sle.voucher_type and voucher_no=sle.voucher_no)
order by sle.posting_date""" %
', '.join(['%s']*len(warehouses)), tuple(warehouses))
@@ -47,4 +47,4 @@
else:
warehouse_account.remove(account)
- return warehouse_account
\ No newline at end of file
+ return warehouse_account