commit ed019123e297b164fe0a0558a9a66e31e84127bb
author Nabin Hait <nabinhait@gmail.com> Mon Apr 17 15:36:59 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Apr 17 15:36:59 2017 +0530
tree 955f17520bc9e07044487bf7d22bf661e9219d13
parent d12a4f5e8c7c035c2b0c34173f206b4c7386b526
parent 4d1cf534660be763c2cf067f839fb17bf82fee9d

Merge branch 'develop'

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index afa6131..3f6504d 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.12'
+__version__ = '8.0.13'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 0dcae82..bf370c8 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -1939,7 +1939,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-04-11 13:44:17.460674", 
+ "modified": "2017-04-17 13:44:17.460674", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item",