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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2018-03-13 17:11:52 +05:30
commit e01dcc170c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.9' __version__ = '10.1.10'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

9
erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py
View File

@ -37,8 +37,11 @@ def execute():
and po.is_subcontracted = "Yes" and po.is_subcontracted = "Yes"
and po.docstatus = 1"""), as_dict=1) and po.docstatus = 1"""), as_dict=1)
for d in item_wh_bin: for d in item_wh_bin:
stock_bin = get_bin(d["rm_item_code"], d["reserve_warehouse"]) try:
stock_bin.update_reserved_qty_for_sub_contracting() stock_bin = get_bin(d["rm_item_code"], d["reserve_warehouse"])
stock_bin.update_reserved_qty_for_sub_contracting()
except:
pass
def get_warehouse(item_code, company, company_warehouse, item_wh): def get_warehouse(item_code, company, company_warehouse, item_wh):
reserve_warehouse = item_wh.get(item_code) reserve_warehouse = item_wh.get(item_code)
@ -46,4 +49,4 @@ def get_warehouse(item_code, company, company_warehouse, item_wh):
reserve_warehouse = None reserve_warehouse = None
if not reserve_warehouse: if not reserve_warehouse:
reserve_warehouse = company_warehouse.get(company) reserve_warehouse = company_warehouse.get(company)
return reserve_warehouse return reserve_warehouse