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

change args of set_balance_in_account_currency

Browse Source 
https://github.com/frappe/erpnext/pull/4832
This commit is contained in:
Revant Nandgaonkar 2016-02-18 16:48:35 +05:30
parent 5da941b82c
commit 78a62fe123
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@ -239,7 +239,7 @@ class AccountsController(TransactionBase):
if self.doctype not in ["Journal Entry", "Period Closing Voucher"]: if self.doctype not in ["Journal Entry", "Period Closing Voucher"]:
self.validate_account_currency(gl_dict.account, account_currency) self.validate_account_currency(gl_dict.account, account_currency)
self.set_balance_in_account_currency(gl_dict, account_currency) set_balance_in_account_currency(gl_dict, account_currency, self.conversion_rate, self.company_currency)
return gl_dict return gl_dict
@ -525,7 +525,7 @@ def validate_inclusive_tax(tax, doc):
elif tax.get("category") == "Valuation": elif tax.get("category") == "Valuation":
frappe.throw(_("Valuation type charges can not marked as Inclusive")) frappe.throw(_("Valuation type charges can not marked as Inclusive"))
def set_balance_in_account_currency(gl_dict, conversion_rate=None, company_currency=None, account_currency=None): def set_balance_in_account_currency(gl_dict, account_currency=None, conversion_rate=None, company_currency=None):
if (not conversion_rate) and (account_currency!=company_currency): if (not conversion_rate) and (account_currency!=company_currency):
frappe.throw(_("Account: {0} with currency: {1} can not be selected") frappe.throw(_("Account: {0} with currency: {1} can not be selected")
.format(gl_dict.account, account_currency)) .format(gl_dict.account, account_currency))