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

Merge pull request #7816 from mbauskar/hotfix

Browse Source 
[minor] minor fixes for journal entry get_exchange_rate trigger
This commit is contained in:
Nabin Hait 2017-02-22 15:03:32 +05:30 committed by GitHub
commit 1965949c67
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.js
View File

@ -38,7 +38,7 @@ frappe.ui.form.on("Journal Entry", {
}, },
posting_date: function(frm) { posting_date: function(frm) {
if(!frm.doc.multi_currency) return; if(!frm.doc.multi_currency || !frm.doc.posting_date) return;
$.each(frm.doc.accounts || [], function(i, row) { $.each(frm.doc.accounts || [], function(i, row) {
erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name); erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);

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

@ -832,7 +832,7 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
# Added posting_date as one of the parameters of get_exchange_rate # Added posting_date as one of the parameters of get_exchange_rate
@frappe.whitelist() @frappe.whitelist()
def get_exchange_rate(posting_date, account, account_currency=None, company=None, def get_exchange_rate(posting_date, account=None, account_currency=None, company=None,
reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None): reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None):
from erpnext.setup.utils import get_exchange_rate from erpnext.setup.utils import get_exchange_rate
account_details = frappe.db.get_value("Account", account, account_details = frappe.db.get_value("Account", account,