nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31572 from frappe/mergify/bp/version-13-hotfix/pr-31566

Browse Source 
fix: Allow multi currency invoice against single party account (backport #31566)
This commit is contained in:
Deepesh Garg
2022-07-14 21:25:17 +05:30
committed by GitHub
parent dfa0638baf 0a5bc86d1b
commit 9fd1fad259
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -19,6 +19,7 @@
"book_asset_depreciation_entry_automatically", "book_asset_depreciation_entry_automatically",
"unlink_advance_payment_on_cancelation_of_order", "unlink_advance_payment_on_cancelation_of_order",
"enable_common_party_accounting", "enable_common_party_accounting",
"allow_multi_currency_invoices_against_single_party_account",
"post_change_gl_entries", "post_change_gl_entries",
"enable_discount_accounting", "enable_discount_accounting",
"tax_settings_section", "tax_settings_section",
@@ -276,14 +277,21 @@
"fieldname": "enable_common_party_accounting", "fieldname": "enable_common_party_accounting",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Enable Common Party Accounting" "label": "Enable Common Party Accounting"
} },
{
"default": "0",
"description": "Enabling this will allow creation of multi-currency invoices against single party account in company currency",
"fieldname": "allow_multi_currency_invoices_against_single_party_account",
"fieldtype": "Check",
"label": "Allow multi-currency invoices against single party account"
}
], ],
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-10-11 17:42:36.427699", "modified": "2022-07-11 13:37:50.605141",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

9
erpnext/controllers/accounts_controller.py
View File

@@ -1470,8 +1470,15 @@ class AccountsController(TransactionBase):
self.get("debit_to") if self.doctype == "Sales Invoice" else self.get("credit_to") self.get("debit_to") if self.doctype == "Sales Invoice" else self.get("credit_to")
) )
party_account_currency = get_account_currency(party_account) party_account_currency = get_account_currency(party_account)
allow_multi_currency_invoices_against_single_party_account = frappe.db.get_singles_value(
"Accounts Settings", "allow_multi_currency_invoices_against_single_party_account"
)
if not party_gle_currency and (party_account_currency != self.currency): if (
not party_gle_currency
and (party_account_currency != self.currency)
and not allow_multi_currency_invoices_against_single_party_account
):
frappe.throw( frappe.throw(
_("Party Account {0} currency ({1}) and document currency ({2}) should be same").format( _("Party Account {0} currency ({1}) and document currency ({2}) should be same").format(
frappe.bold(party_account), party_account_currency, self.currency frappe.bold(party_account), party_account_currency, self.currency