Merge branch 'develop'

This commit is contained in:
Anand Doshi 2016-02-26 20:58:26 +05:30
commit 3ef8d066b9
4 changed files with 4 additions and 4 deletions

View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.23.5'
__version__ = '6.23.6'

View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
app_version = "6.23.5"
app_version = "6.23.6"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"

View File

@ -246,7 +246,7 @@ erpnext.patches.v6_16.update_billing_status_in_dn_and_pr
erpnext.patches.v6_16.create_manufacturer_records
execute:frappe.db.sql("update `tabPricing Rule` set title=name where title='' or title is null") #2016-01-27
erpnext.patches.v6_20.set_party_account_currency_in_orders
#erpnext.patches.v6_19.comment_feed_communication
erpnext.patches.v6_19.comment_feed_communication
erpnext.patches.v6_21.fix_reorder_level
erpnext.patches.v6_21.rename_material_request_fields
erpnext.patches.v6_23.update_stopped_status_to_closed

View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
version = "6.23.5"
version = "6.23.6"
requirements = parse_requirements("requirements.txt", session="")
setup(