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

Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party

Browse Source 
Revert "fix: validating party currency with doc currency"
This commit is contained in:
Deepesh Garg 2021-03-25 16:49:50 +05:30 committed by GitHub
commit 7b8742bd70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/controllers/accounts_controller.py
View File

@ -829,10 +829,10 @@ class AccountsController(TransactionBase):
party_account_currency = get_party_account_currency(party_type, party, self.company) party_account_currency = get_party_account_currency(party_type, party, self.company)
if (party_account_currency if (party_account_currency
and (self.currency != party_account_currency and party_account_currency != self.company_currency
and self.currency != self.company_currency)): and self.currency != party_account_currency):
frappe.throw(_("Accounting Entry for {0}: {1} can only be made in currency: {2}") frappe.throw(_("Accounting Entry for {0}: {1} can only be made in currency: {2}")
.format(party_type, party, frappe.bold(party_account_currency), InvalidCurrency)) .format(party_type, party, party_account_currency), InvalidCurrency)
# Note: not validating with gle account because we don't have the account # Note: not validating with gle account because we don't have the account
# at quotation / sales order level and we shouldn't stop someone # at quotation / sales order level and we shouldn't stop someone
@ -898,7 +898,7 @@ class AccountsController(TransactionBase):
date = self.get("due_date") date = self.get("due_date")
due_date = date or posting_date due_date = date or posting_date
if self.company_currency == self.currency: if party_account_currency == self.company_currency:
grand_total = self.get("base_rounded_total") or self.base_grand_total grand_total = self.get("base_rounded_total") or self.base_grand_total
else: else:
grand_total = self.get("rounded_total") or self.grand_total grand_total = self.get("rounded_total") or self.grand_total
@ -959,7 +959,7 @@ class AccountsController(TransactionBase):
for d in self.get("payment_schedule"): for d in self.get("payment_schedule"):
total += flt(d.payment_amount) total += flt(d.payment_amount)
if self.company_currency == self.currency: if party_account_currency == self.company_currency:
total = flt(total, self.precision("base_grand_total")) total = flt(total, self.precision("base_grand_total"))
grand_total = flt(self.get("base_rounded_total") or self.base_grand_total, self.precision('base_grand_total')) grand_total = flt(self.get("base_rounded_total") or self.base_grand_total, self.precision('base_grand_total'))
else: else: