Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[hotfix] total amount in journal entry"

Browse Source 
This reverts commit 5b03a75970b92b0c761f3bf9720c05f8deffdb90.
This commit is contained in:
Anand Doshi 2015-11-27 17:37:41 +05:30
parent 7781763efa
commit 563c243ec6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -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)

2
erpnext/patches.txt
View File

@ -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