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

[validation][buying] stock and non-stock items are now allowed in same document

Browse Source
This commit is contained in:
Nabin Hait 2013-06-19 14:58:01 +05:30
parent 21f7623d2e
commit bc2d9e89a7
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/buying_controller.py
View File

@ -54,16 +54,7 @@ class BuyingController(StockController):
raise_exception=WrongWarehouseCompany) raise_exception=WrongWarehouseCompany)
def validate_stock_or_nonstock_items(self): def validate_stock_or_nonstock_items(self):
items = [d.item_code for d in self.doclist.get({"parentfield": self.fname})] if not self.stock_items:
if self.stock_items:
nonstock_items = list(set(items) - set(self.stock_items))
if nonstock_items:
webnotes.msgprint(_("Stock and non-stock items can not be entered in the same ") +
self.doc.doctype + _(""". You should make separate documents for them.
Stock Items: """) + ", ".join(self.stock_items) + _("""
Non-stock Items: """) + ", ".join(nonstock_items), raise_exception=1)
elif items and not self.stock_items:
tax_for_valuation = [d.account_head for d in tax_for_valuation = [d.account_head for d in
self.doclist.get({"parentfield": "purchase_tax_details"}) self.doclist.get({"parentfield": "purchase_tax_details"})
if d.category in ["Valuation", "Valuation and Total"]] if d.category in ["Valuation", "Valuation and Total"]]