nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 08:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi
2015-10-22 19:36:09 +05:30
parent e3910d02a5 b64b461d53
commit c6e2c8f79e
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.6.1'
__version__ = '6.6.2'

3
erpnext/accounts/party.py
View File

@@ -201,7 +201,8 @@ def get_party_gle_currency(party_type, party, company):
return existing_gle_currency[0][0] if existing_gle_currency else None
return frappe.local_cache("party_gle_currency", (party_type, party, company), generator)
return frappe.local_cache("party_gle_currency", (party_type, party, company), generator,
regenerate_if_none=True)
def validate_party_gle_currency(party_type, party, company, party_account_currency=None):
"""Validate party account currency with existing GL Entry's currency"""

2
erpnext/hooks.py
View File

@@ -29,7 +29,7 @@ blogs.
"""
app_icon = "icon-th"
app_color = "#e74c3c"
app_version = "6.6.1"
app_version = "6.6.2"
github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com"

2
setup.py
View File

@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
version = "6.6.1"
version = "6.6.2"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()