Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.6.2'
+__version__ = '5.6.3'

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -48,10 +48,6 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 			}
 		});
 
-		$.each([["against_voucher", "Purchase Invoice", "supplier"],
-			["against_invoice", "Sales Invoice", "customer"]], function(i, opts) {
-		});
-
 		me.frm.set_query("reference_name", "accounts", function(doc, cdt, cdn) {
 			var jvd = frappe.get_doc(cdt, cdn);
 

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -605,7 +605,7 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
 		from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
 		where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s
-		and (ifnull(jv_detail.reference_type, '') = ''
+		and ifnull(jv_detail.reference_type, '') = ''
 		and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield),
 		(filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))
 

erpnext/hooks.py

@@ -27,7 +27,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "5.6.2"
+app_version = "5.6.3"
 github_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json

@@ -89,7 +89,7 @@
  "is_submittable": 0,
  "issingle": 1,
  "istable": 0,
- "modified": "2015-07-23 08:12:33.889753", 
+ "modified": "2015-08-12 08:12:33.889753",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Manufacturing Settings",

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.6.2"
+version = "5.6.3"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()