Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Conversion rate validation for multi-currency invoices #31350

Merged
merged 3 commits into from
Jun 21, 2022
Merged

fix: Conversion rate validation for multi-currency invoices #31350

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d05d153
fix: Conversion rate validation for multi-currency invoices
deepeshgarg007 Jun 14, 2022
8f37393
test: Add test case
deepeshgarg007 Jun 20, 2022
46e6c2c
Merge branch 'develop' of https://github.com/frappe/erpnext into sale…
deepeshgarg007 Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,6 @@ def set_missing_values(self, for_validate=False):

super(PurchaseInvoice, self).set_missing_values(for_validate)

def check_conversion_rate(self):
default_currency = erpnext.get_company_currency(self.company)
if not default_currency:
throw(_("Please enter default currency in Company Master"))
if (
(self.currency == default_currency and flt(self.conversion_rate) != 1.00)
or not self.conversion_rate
or (self.currency != default_currency and flt(self.conversion_rate) == 1.00)
):
throw(_("Conversion rate cannot be 0 or 1"))

def validate_credit_to_acc(self):
if not self.credit_to:
self.credit_to = get_party_account("Supplier", self.supplier, self.company)
Expand Down
1 change: 1 addition & 0 deletions erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ def validate(self):
self.set_income_account_for_fixed_assets()
self.validate_item_cost_centers()
self.validate_income_account()
self.check_conversion_rate()

validate_inter_company_party(
self.doctype, self.customer, self.company, self.inter_company_invoice_reference
Expand Down
11 changes: 11 additions & 0 deletions erpnext/controllers/accounts_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,6 +1838,17 @@ def create_advance_and_reconcile(self, party_link):
jv.save()
jv.submit()

def check_conversion_rate(self):
default_currency = erpnext.get_company_currency(self.company)
if not default_currency:
throw(_("Please enter default currency in Company Master"))
if (
(self.currency == default_currency and flt(self.conversion_rate) != 1.00)
or not self.conversion_rate
or (self.currency != default_currency and flt(self.conversion_rate) == 1.00)
ankush marked this conversation as resolved.
Show resolved Hide resolved
):
throw(_("Conversion rate cannot be 0 or 1"))


@frappe.whitelist()
def get_tax_rate(account_head):
Expand Down