diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index e9449d7..908794f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -347,7 +347,7 @@
 						"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/patches.txt b/erpnext/patches.txt
index 37c69a5..559a3e7 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -235,5 +235,5 @@
 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