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

This commit is contained in:
Anand Doshi 2013-08-06 11:55:15 +05:30
commit b9eb0849c3

View File

@ -126,11 +126,8 @@ class DocType(SellingController):
self.validate_mandatory() self.validate_mandatory()
self.validate_proj_cust() self.validate_proj_cust()
self.validate_po() self.validate_po()
self.validate_uom_is_integer("stock_uom", "qty") self.validate_uom_is_integer("stock_uom", "qty")
self.validate_for_items()
if self.doc.docstatus == 1:
self.validate_for_items()
sales_com_obj = get_obj(dt = 'Sales Common') sales_com_obj = get_obj(dt = 'Sales Common')
sales_com_obj.check_active_sales_items(self) sales_com_obj.check_active_sales_items(self)
sales_com_obj.check_conversion_rate(self) sales_com_obj.check_conversion_rate(self)
@ -490,4 +487,4 @@ def make_maintenance_visit(source_name, target_doclist=None):
} }
}, target_doclist) }, target_doclist)
return [d.fields for d in doclist] return [d.fields for d in doclist]