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

accounts/doctype/gl_entry/gl_entry.py

@@ -151,7 +151,7 @@ class DocType:
 				balance = webnotes.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry` 
 					where account = %s and ifnull(is_cancelled, 'No') = 'No'""", self.doc.account)
 				balance = account["debit_or_credit"] == "Debit" and \
-					balance[0][0] or -1*balance[0][0]
+					flt(balance[0][0]) or -1*flt(balance[0][0])
 			
 				if flt(balance) < 0:
 					msgprint(_("Negative balance is not allowed for account ") + self.doc.account, 

buying/doctype/purchase_common/purchase_common.py

@@ -76,7 +76,11 @@ class DocType(BuyingController):
 			elif is_submit == 1:
 				# even if this transaction is the latest one, it should be submitted
 				# for it to be considered for latest purchase rate
+				if flt(d.conversion_factor):
 					last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor)
+				else:
+					msgprint(_("Row ") + cstr(d.idx) + ": " + 
+						_("UOM Conversion Factor is mandatory"), raise_exception=1)
 
 			# update last purchsae rate
 			if last_purchase_rate:

selling/doctype/sales_order/sales_order.py

@@ -396,7 +396,8 @@ def make_delivery_note(source_name, target_doclist=None):
 				"parenttype": "prevdoc_doctype", 
 				"reserved_warehouse": "warehouse"
 			},
-			"postprocess": update_item
+			"postprocess": update_item,
+			"condition": lambda doc: doc.delivered_qty < doc.qty
 		}, 
 		"Sales Taxes and Charges": {
 			"doctype": "Sales Taxes and Charges", 

stock/doctype/stock_entry/stock_entry.py

@@ -554,7 +554,7 @@ class DocType(StockController):
 					`tabBOM Item`, `tabItem`
 				where 
 					`tabBOM Item`.parent = %s and 
-					`tabBOM Item`.item_code = tabItem.name
+					`tabBOM Item`.item_code = tabItem.name and
 					`tabBOM Item`.docstatus < 2 
 				group by item_code""", (qty, self.doc.bom_no), as_dict=1)