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

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi
2015-08-13 15:54:41 +05:30
parent b1bae1bde8 d7ba618b92
commit 169c3ed09d
4 changed files with 17 additions and 16 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 from __future__ import unicode_literals
__version__ = '5.6.0' __version__ = '5.6.1'

2
erpnext/hooks.py
View File

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

3
erpnext/patches/v5_4/stock_entry_additional_costs.py
View File

@@ -17,7 +17,8 @@ def execute():
""") """)
stock_entries = frappe.db.sql_list("""select name from `tabStock Entry` stock_entries = frappe.db.sql_list("""select name from `tabStock Entry`
where purpose in ('Manufacture', 'Repack') and ifnull(additional_operating_cost, 0)!=0""") where purpose in ('Manufacture', 'Repack') and ifnull(additional_operating_cost, 0)!=0
and docstatus < 2""")
for d in stock_entries: for d in stock_entries:
stock_entry = frappe.get_doc("Stock Entry", d) stock_entry = frappe.get_doc("Stock Entry", d)

2
setup.py
View File

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