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

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

Browse Source
This commit is contained in:
Revant Nandgaonkar 2016-12-21 12:52:23 +05:30
commit c30ae28422
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.1.27' __version__ = '7.1.28'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py
View File

@ -3,6 +3,8 @@ import frappe
from erpnext.stock.stock_balance import repost_stock from erpnext.stock.stock_balance import repost_stock
def execute(): def execute():
frappe.reload_doc('manufacturing', 'doctype', 'production_order_item')
modified_items = frappe.db.sql_list(""" modified_items = frappe.db.sql_list("""
select name from `tabItem` select name from `tabItem`
where is_stock_item=1 and modified >= '2016-10-31' where is_stock_item=1 and modified >= '2016-10-31'