From 5b03a75970b92b0c761f3bf9720c05f8deffdb90 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 27 Nov 2015 17:23:54 +0530 Subject: [PATCH] [hotfix] total amount in journal entry --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 2 +- erpnext/patches.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index e9449d7ef79..908794fcbfd 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/patches.txt b/erpnext/patches.txt index 37c69a55a14..559a3e78bac 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