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

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas
2014-10-15 14:44:35 +05:30
parent 577a3acaac 63914dd55b
commit 630bf2f0da
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1 +1 @@
__version__ = '4.7.0' __version__ = '4.7.1'

2
erpnext/hooks.py
View File

@@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.7.0" app_version = "4.7.1"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

1
erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py
View File

@@ -11,6 +11,7 @@ def execute():
warehouse_account = frappe.db.sql("""select name, master_name from tabAccount warehouse_account = frappe.db.sql("""select name, master_name from tabAccount
where ifnull(account_type, '') = 'Warehouse'""") where ifnull(account_type, '') = 'Warehouse'""")
if warehouse_account:
warehouses = [d[1] for d in warehouse_account] warehouses = [d[1] for d in warehouse_account]
accounts = [d[0] for d in warehouse_account] accounts = [d[0] for d in warehouse_account]

2
setup.py
View File

@@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os
version = "4.7.0" version = "4.7.1"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()