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

fix: Allow multi currency invoice against single party account

Browse Source 
(cherry picked from commit c83fbd5c50)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
This commit is contained in:
Deepesh Garg
2022-07-11 13:43:01 +05:30
committed by Mergify
parent 7d36bdf292
commit 9ac9c46dab
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@
"book_asset_depreciation_entry_automatically",
"unlink_advance_payment_on_cancelation_of_order",
"enable_common_party_accounting",
<<<<<<< HEAD
"post_change_gl_entries",
"enable_discount_accounting",
"tax_settings_section",
@@ -30,6 +31,11 @@
"frozen_accounts_modifier",
"column_break_4",
"credit_controller",
=======
"allow_multi_currency_invoices_against_single_party_account",
"report_setting_section",
"use_custom_cash_flow",
>>>>>>> c83fbd5c50 (fix: Allow multi currency invoice against single party account)
"deferred_accounting_settings_section",
"book_deferred_entries_based_on",
"column_break_18",
@@ -272,10 +278,37 @@
"label": "Enable Discount Accounting"
},
{
<<<<<<< HEAD
"default": "0",
"fieldname": "enable_common_party_accounting",
"fieldtype": "Check",
"label": "Enable Common Party Accounting"
=======
"fieldname": "invoicing_features_section",
"fieldtype": "Section Break",
"label": "Invoicing Features"
},
{
"fieldname": "column_break_17",
"fieldtype": "Column Break"
},
{
"fieldname": "pos_tab",
"fieldtype": "Tab Break",
"label": "POS"
},
{
"fieldname": "report_setting_section",
"fieldtype": "Section Break",
"label": "Report Setting"
},
{
"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 "
>>>>>>> c83fbd5c50 (fix: Allow multi currency invoice against single party account)
}
],
"icon": "icon-cog",
@@ -283,7 +316,11 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-10-11 17:42:36.427699",
=======
"modified": "2022-07-11 13:37:50.605141",
>>>>>>> c83fbd5c50 (fix: Allow multi currency invoice against single party account)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",