Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi 2015-09-09 18:42:49 +05:30
commit a2fda1c779
4 changed files with 8 additions and 7 deletions
Show Stats 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__ = '6.1.0' __version__ = '6.1.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 = "6.1.0" app_version = "6.1.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"

9
erpnext/patches/v6_0/fix_planned_qty.py
View File

@ -6,8 +6,9 @@ import frappe
from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
def execute(): def execute():
for item_code, warehouse in frappe.db.sql("""select distinct production_item, fg_warehouse for item_code, warehouse in frappe.db.sql("""select distinct production_item, fg_warehouse
from `tabProduction Order`"""): from `tabProduction Order`"""):
update_bin_qty(item_code, warehouse, { if frappe.db.exists("Item", item_code) and frappe.db.exists("Warehouse", warehouse):
"planned_qty": get_planned_qty(item_code, warehouse) update_bin_qty(item_code, warehouse, {
}) "planned_qty": get_planned_qty(item_code, warehouse)
})

2
setup.py
View File

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