| commit | c30ae2842251d2915a795743f10f2032bb671f89 | [log] [tgz] |
|---|---|---|
| author | Revant Nandgaonkar <revant.one@gmail.com> | Wed Dec 21 12:52:23 2016 +0530 |
| committer | Revant Nandgaonkar <revant.one@gmail.com> | Wed Dec 21 12:52:23 2016 +0530 |
| tree | 51da8e0a1f9e2d819732b9c066373a34f740f041 | |
| parent | 0766d3e67ec51b04ab39d47b4c32d05c7c94a1c8 [diff] | |
| parent | e7939fd87b80afdc9ee80b788825f89d88a9515b [diff] |
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 84660b6..f91c97a 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.1.27' +__version__ = '7.1.28' def get_default_company(user=None): '''Get default company for user'''
diff --git a/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py b/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py index 5c63c00..d1974d2 100644 --- a/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py +++ b/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py
@@ -3,6 +3,8 @@ from erpnext.stock.stock_balance import repost_stock def execute(): + frappe.reload_doc('manufacturing', 'doctype', 'production_order_item') + modified_items = frappe.db.sql_list(""" select name from `tabItem` where is_stock_item=1 and modified >= '2016-10-31'