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

fix(warehouse-account): get warehouse account map fallback handling (#15625)

Browse Source 
* fix(warehouse-account): get warehouse account map fallback handling

* fix: import issue
This commit is contained in:
Nabin Hait 2018-10-08 18:19:53 +05:30 committed by GitHub
parent cf91f34ffa
commit d2c5b50842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/__init__.py
View File

@ -1,5 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _
install_docs = [ install_docs = [
{"doctype":"Role", "role_name":"Stock Manager", "name":"Stock Manager"}, {"doctype":"Role", "role_name":"Stock Manager", "name":"Stock Manager"},
@ -33,7 +34,11 @@ def get_warehouse_account(warehouse, warehouse_account=None):
account = warehouse.account account = warehouse.account
if not account and warehouse.parent_warehouse: if not account and warehouse.parent_warehouse:
if warehouse_account: if warehouse_account:
account = warehouse_account.get(warehouse.parent_warehouse).account if warehouse_account.get(warehouse.parent_warehouse):
account = warehouse_account.get(warehouse.parent_warehouse).account
else:
from frappe.utils.nestedset import rebuild_tree
rebuild_tree("Warehouse", "parent_warehouse")
else: else:
account = frappe.db.sql(""" account = frappe.db.sql("""
select select
@ -48,6 +53,9 @@ def get_warehouse_account(warehouse, warehouse_account=None):
if not account and warehouse.company: if not account and warehouse.company:
account = get_company_default_inventory_account(warehouse.company) account = get_company_default_inventory_account(warehouse.company)
if not account:
frappe.throw(_("Please set Account in Warehouse {0} or Default Inventory Account in Company {1}")
.format(warehouse, warehouse.company))
return account return account
def get_company_default_inventory_account(company): def get_company_default_inventory_account(company):