Merge branch 'develop'

This commit is contained in:
Anand Doshi 2015-08-20 15:45:07 +05:30
commit 0e90e8e8dc
4 changed files with 4 additions and 4 deletions

View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '5.7.3'
__version__ = '5.7.4'

View File

@ -27,7 +27,7 @@ blogs.
"""
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"

View File

@ -191,5 +191,5 @@ erpnext.patches.v5_4.stock_entry_additional_costs
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

View File

@ -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()