Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.9.1'
+__version__ = '6.9.2'

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.9.1"
+app_version = "6.9.2"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/public/js/controllers/taxes_and_totals.js

@@ -503,7 +503,7 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({
 		if(this.frm.doc.party_account_currency == this.frm.doc.currency) {	
 			var total_amount_to_pay = flt((this.frm.doc.grand_total - this.frm.doc.total_advance 
 				- this.frm.doc.write_off_amount), precision("grand_total"));
-		else {
+		} else {
 			var total_amount_to_pay = flt((this.frm.doc.base_grand_total - this.frm.doc.total_advance 
 				- this.frm.doc.base_write_off_amount), precision("base_grand_total"));
 		}

setup.py

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