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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2012-04-03 13:23:14 +05:30
commit e9c505608a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/buying/doctype/purchase_common/purchase_common.py
View File

@ -227,7 +227,7 @@ class DocType(TransactionBase):
if d.fields.has_key(x): if d.fields.has_key(x):
d.fields[x] = f_lst[x] d.fields[x] = f_lst[x]
item = sql("select is_stock_item, is_purchase_item from tabItem where name=%s and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())", d.item_code) item = sql("select is_stock_item, is_purchase_item, is_sub_contracted_item from tabItem where name=%s and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())", d.item_code)
if not item: if not item:
msgprint("Item %s does not exist in Item Master." % cstr(d.item_code)) msgprint("Item %s does not exist in Item Master." % cstr(d.item_code))
raise Exception raise Exception
@ -239,10 +239,11 @@ class DocType(TransactionBase):
raise Exception raise Exception
# validate purchase item # validate purchase item
if not item[0][1]=='Yes': if item[0][1] != 'Yes' and item[0][2] != 'Yes':
msgprint("Item %s is not purchase item." % (d.item_code)) msgprint("Item %s is not a purchase item or sub-contracted item. Please check" % (d.item_code))
raise Exception raise Exception
if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname: if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname:
# check warehouse, uom in previous doc and in current doc are same. # check warehouse, uom in previous doc and in current doc are same.
data = sql("select item_code, warehouse, uom from `tab%s` where name = '%s'" % ( self.doctype_dict[d.prevdoc_doctype], d.prevdoc_detail_docname), as_dict = 1) data = sql("select item_code, warehouse, uom from `tab%s` where name = '%s'" % ( self.doctype_dict[d.prevdoc_doctype], d.prevdoc_detail_docname), as_dict = 1)