Merge branch 'develop'

erpnext/__version__.py

@@ -1 +1 @@
-__version__ = '4.9.1'
+__version__ = '4.9.2'

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -96,13 +96,14 @@ class PaymentReconciliation(Document):
 
 			payment_amount = payment_amount[0][0] if payment_amount else 0
 
-			if d.invoice_amount > payment_amount:
+			if d.invoice_amount - payment_amount > 0.005:
 				non_reconciled_invoices.append({
 					'voucher_no': d.voucher_no,
 					'voucher_type': d.voucher_type,
 					'posting_date': d.posting_date,
 					'invoice_amount': flt(d.invoice_amount),
-					'outstanding_amount': d.invoice_amount - payment_amount})
+					'outstanding_amount': flt(d.invoice_amount - payment_amount, 2)
+				})
 
 		self.add_invoice_entries(non_reconciled_invoices)
 

erpnext/hooks.py

@@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "4.9.1"
+app_version = "4.9.2"
 
 error_report_email = "support@erpnext.com"
 

erpnext/support/doctype/customer_issue/customer_issue.js

@@ -51,9 +51,14 @@ cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) {
 		['Serial No', 'docstatus', '!=', 2],
 		['Serial No', 'status', '=', "Delivered"]
 	];
-	if(doc.item_code) cond = ['Serial No', 'item_code', '=', doc.item_code];
-	if(doc.customer) cond = ['Serial No', 'customer', '=', doc.customer];
-	filter.push(cond);
+	if(doc.item_code) {
+		cond = ['Serial No', 'item_code', '=', doc.item_code];
+		filter.push(cond);
+	}
+	if(doc.customer) {
+		cond = ['Serial No', 'customer', '=', doc.customer];
+		filter.push(cond);
+	}
 	return{
 		filters:filter
 	}

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.9.1"
+version = "4.9.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()

test_sites/test_site/site_config.json

@@ -2,5 +2,6 @@
  "db_name": "test_frappe",
  "db_password": "test_frappe",
  "admin_password": "admin",
+ "host_name": "http://localhost:8888",
  "mute_emails": 1
 }