From 563c243ec69995c6bd1601d57516deb98cf1fab2 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 27 Nov 2015 17:37:41 +0530 Subject: [PATCH 1/2] Revert "[hotfix] total amount in journal entry" This reverts commit 5b03a75970b92b0c761f3bf9720c05f8deffdb90. --- 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 908794fcbf..e9449d7ef7 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_in_account_currency or d.credit_in_account_currency) + total_amount += (d.debit or d.credit) self.set_total_amount(total_amount) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 559a3e78ba..3675924cdb 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 #2015-11-27 +erpnext.patches.v6_10.fix_jv_total_amount #2015-11-28 erpnext.patches.v6_10.email_digest_default_quote From 47e82d1a491ef89cdb89bc495d27403efef31efb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 27 Nov 2015 18:08:46 +0600 Subject: [PATCH 2/2] bumped to version 6.11.3 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 2ff3053e3d..56b5e468a9 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.11.2' +__version__ = '6.11.3' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index c4d71ff7d7..7ed5708dad 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.2" +app_version = "6.11.3" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 196214c25b..f140d4def4 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.11.2" +version = "6.11.3" with open("requirements.txt", "r") as f: install_requires = f.readlines()