nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1232 from nabinhait/hotfix

Browse Source 
Hotfix
This commit is contained in:
Nabin Hait
2013-12-23 23:29:00 -08:00
parent de69ad0a48 6ebcc5c006
commit 2ca388b0a5
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stock/doctype/warehouse/warehouse.py
View File

@@ -20,6 +20,19 @@ class DocType:
if self.doc.email_id and not validate_email_add(self.doc.email_id):
msgprint("Please enter valid Email Id", raise_exception=1)
self.update_parent_account()
def update_parent_account(self):
if not self.doc.__islocal and (self.doc.create_account_under !=
webnotes.conn.get_value("Warehouse", self.doc.name, "create_account_under")):
warehouse_account = webnotes.conn.get_value("Account",
{"account_type": "Warehouse", "company": self.doc.company,
"master_name": self.doc.name}, ["name", "parent_account"])
if warehouse_account and warehouse_account[1] != self.doc.create_account_under:
acc_bean = webnotes.bean("Account", warehouse_account[0])
acc_bean.doc.parent_account = self.doc.create_account_under
acc_bean.save()
def on_update(self):
self.create_account_head()

5
stock/report/stock_ledger/stock_ledger.py
View File

@@ -62,9 +62,10 @@ def get_item_conditions(filters):
def get_sle_conditions(filters):
conditions = []
if filters.get("item_code"):
item_conditions=get_item_conditions(filters)
if item_conditions:
conditions.append("""item_code in (select name from tabItem
{item_conditions})""".format(item_conditions=get_item_conditions(filters)))
{item_conditions})""".format(item_conditions=item_conditions))
if filters.get("warehouse"):
conditions.append("warehouse=%(warehouse)s")
if filters.get("voucher_no"):