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

Revert "[hotfix] set_balance_in_account_currency"

Browse Source 
This reverts commit 9acd6a2629.
This commit is contained in:
Anand Doshi 2015-09-17 20:51:41 +05:30
parent 26bcd89d10
commit bf8c8df9ce
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/accounts_controller.py
View File

@ -236,10 +236,8 @@ class AccountsController(TransactionBase):
.format(account, _(" or ").join(valid_currency))) .format(account, _(" or ").join(valid_currency)))
def set_balance_in_account_currency(self, gl_dict, account_currency=None): def set_balance_in_account_currency(self, gl_dict, account_currency=None):
if self.doctype=="Journal Entry": if (not self.get("conversion_rate") and self.doctype!="Journal Entry"
return and account_currency!=self.company_currency):
if (not self.get("conversion_rate") and account_currency!=self.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))