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

[hotfix] multicurrency gl entry

Browse Source
This commit is contained in:
Anand Doshi 2015-09-17 21:07:04 +05:30
parent bf8c8df9ce
commit be6cfddc4d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/accounts_controller.py
View File

@ -219,14 +219,13 @@ class AccountsController(TransactionBase):
if not account_currency: if not account_currency:
account_currency = frappe.db.get_value("Account", gl_dict.account, "account_currency") account_currency = frappe.db.get_value("Account", gl_dict.account, "account_currency")
self.validate_account_currency(gl_dict.account, account_currency) if self.doctype != "Journal Entry":
gl_dict = self.set_balance_in_account_currency(gl_dict, account_currency) self.validate_account_currency(gl_dict.account, account_currency)
self.set_balance_in_account_currency(gl_dict, account_currency)
return gl_dict return gl_dict
def validate_account_currency(self, account, account_currency=None): def validate_account_currency(self, account, account_currency=None):
if self.doctype == "Journal Entry":
return
valid_currency = [self.company_currency] valid_currency = [self.company_currency]
if self.get("currency") and self.currency != self.company_currency: if self.get("currency") and self.currency != self.company_currency:
valid_currency.append(self.currency) valid_currency.append(self.currency)
@ -236,8 +235,7 @@ 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 (not self.get("conversion_rate") and self.doctype!="Journal Entry" if (not self.get("conversion_rate") and account_currency!=self.company_currency):
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))
@ -253,8 +251,6 @@ class AccountsController(TransactionBase):
gl_dict.credit_in_account_currency = gl_dict.credit if account_currency==self.company_currency \ gl_dict.credit_in_account_currency = gl_dict.credit if account_currency==self.company_currency \
else flt(gl_dict.credit / (self.get("conversion_rate")), 2) else flt(gl_dict.credit / (self.get("conversion_rate")), 2)
return gl_dict
def clear_unallocated_advances(self, childtype, parentfield): def clear_unallocated_advances(self, childtype, parentfield):
self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]})) self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))