diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index aad7276df4..2ff3053e3d 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.11.1'
+__version__ = '6.11.2'
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index e9449d7ef7..908794fcbf 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -347,7 +347,7 @@ class JournalEntry(AccountsController):
 						"customer_name" if d.party_type=="Customer" else "supplier_name")
 
 			elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
-				total_amount += (d.debit or d.credit)
+				total_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
 
 		self.set_total_amount(total_amount)
 
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index d8d2b341a6..c4d71ff7d7 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.11.1"
+app_version = "6.11.2"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 37c69a55a1..559a3e78ba 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -235,5 +235,5 @@ execute:frappe.delete_doc_if_exists("DocType", "Stock UOM Replace Utility")
 erpnext.patches.v6_8.make_webform_standard #2015-11-23
 erpnext.patches.v6_8.move_drop_ship_to_po_items
 erpnext.patches.v6_10.fix_ordered_received_billed
-erpnext.patches.v6_10.fix_jv_total_amount
+erpnext.patches.v6_10.fix_jv_total_amount #2015-11-27
 erpnext.patches.v6_10.email_digest_default_quote
diff --git a/setup.py b/setup.py
index a3bf6eaefb..196214c25b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.11.1"
+version = "6.11.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()