Merge branch 'develop'
This commit is contained in:
commit
a2fda1c779
@ -1,2 +1,2 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
__version__ = '6.1.0'
|
__version__ = '6.1.1'
|
||||||
|
@ -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"
|
||||||
|
@ -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
2
setup.py
@ -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()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user