schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Multi-currency: Exchange Rate in Journal Entry

Browse Source
This commit is contained in:
Nabin Hait
2015-09-09 18:43:12 +05:30
parent 6c3ff3e2ed
commit e3ae05aabd
14 changed files with 456 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@@ -236,8 +236,8 @@ class AccountsController(TransactionBase):
.format(account, " or ".join(valid_currency)))
def set_balance_in_account_currency(self, gl_dict, account_currency=None):
if not (self.get("conversion_rate") or self.get("exchange_rate")) \
and account_currency!=self.company_currency:
if (not self.get("conversion_rate") and self.doctype!="Journal Entry"
and account_currency!=self.company_currency):
frappe.throw(_("Account: {0} with currency: {1} can not be selected")
.format(gl_dict.account, account_currency))