diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 5abd582280..1c25837f79 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.4'
+__version__ = '6.7.5'
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 8728ac91ad..bcdf9fcd5d 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -168,7 +168,11 @@ def get_pricing_rules(args):
 		field = frappe.scrub(parenttype)
 		condition = ""
 		if args.get(field):
-			lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
+			try:
+				lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
+			except TypeError:
+				frappe.throw(_("Invalid {0}").format(args[field]))
+
 			parent_groups = frappe.db.sql_list("""select name from `tab%s`
 				where lft<=%s and rgt>=%s""" % (parenttype, '%s', '%s'), (lft, rgt))
 
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index b459fb1806..fc997fbb9f 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.7.4"
+app_version = "6.7.5"
 source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index 4900bd0ec0..3658e650f4 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -196,11 +196,11 @@ class ProcessPayroll(Document):
 		journal_entry.set("accounts", [
 			{
 				"account": salary_account,
-				"debit": amount
+				"debit_in_account_currency": amount
 			},
 			{
 				"account": default_bank_account,
-				"credit": amount
+				"credit_in_account_currency": amount
 			},
 		])
 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 8b18fcccc2..7fc127c3e1 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -23,12 +23,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 
 				$.each(cur_frm.doc.items, function(i, item){
 					if(item.delivered_by_supplier == 1 || item.supplier){
-						if(item.qty > flt(item.ordered_qty))
+						if(item.qty > flt(item.ordered_qty)
+							&& item.qty > flt(item.delivered_qty)) {
 							is_delivered_by_supplier = true;
+						}
 					}
 					else{
-						if(item.qty > flt(item.delivered_qty))
+						if(item.qty > flt(item.delivered_qty)) {
 							is_delivery_note = true;
+						}
 					}
 				})
 
diff --git a/setup.py b/setup.py
index f52983dba7..a5f9aac14c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.7.4"
+version = "6.7.5"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()