commit 0e90e8e8dcbbef6094665506e4a53fda03c92037
author Anand Doshi <anand@erpnext.com> Thu Aug 20 15:45:07 2015 +0530
committer Anand Doshi <anand@erpnext.com> Thu Aug 20 15:45:07 2015 +0530
tree b06864545bda36a20d56317e7aad893bd2775125
parent a5dce0adeac04c1f01687683f0c092119b1626dd
parent 30d3eb3d4b1991acb73b116120e5f906cc5b14b4

Merge branch 'develop'

erpnext/__version__.py

diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index ce6f452..33e3a7c 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.7.3'
+__version__ = '5.7.4'

erpnext/hooks.py

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 30acd47..a70cc72 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -27,7 +27,7 @@
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "5.7.3"
+app_version = "5.7.4"
 github_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 551518e..21656c6 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -191,5 +191,5 @@
 erpnext.patches.v5_4.cleanup_journal_entry #2015-08-14
 execute:frappe.db.sql("update `tabProduction Order` pro set description = (select description from tabItem where name=pro.production_item) where ifnull(description, '') = ''")
 erpnext.patches.v5_7.item_template_attributes
-erpnext.patches.v4_2.repost_reserved_qty #2015-08-17
+erpnext.patches.v4_2.repost_reserved_qty #2015-08-20
 erpnext.patches.v5_4.update_purchase_cost_against_project

setup.py

diff --git a/setup.py b/setup.py
index fff69cc..a05d221 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.7.3"
+version = "5.7.4"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()