nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-07-14 17:20:32 +05:30
parent 1c686c732e
commit 0a5bc86d1b
1 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +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",
<<<<<<< HEAD "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",
@@ -31,11 +31,6 @@
"frozen_accounts_modifier", "frozen_accounts_modifier",
"column_break_4", "column_break_4",
"credit_controller", "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", "deferred_accounting_settings_section",
"book_deferred_entries_based_on", "book_deferred_entries_based_on",
"column_break_18", "column_break_18",
@@ -278,49 +273,25 @@
"label": "Enable Discount Accounting" "label": "Enable Discount Accounting"
}, },
{ {
<<<<<<< HEAD
"default": "0", "default": "0",
"fieldname": "enable_common_party_accounting", "fieldname": "enable_common_party_accounting",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Enable Common Party Accounting" "label": "Enable Common Party Accounting"
=======
"fieldname": "invoicing_features_section",
"fieldtype": "Section Break",
"label": "Invoicing Features"
}, },
{ {
"fieldname": "column_break_17", "default": "0",
"fieldtype": "Column Break" "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",
"fieldname": "pos_tab", "label": "Allow multi-currency invoices against single party account"
"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", "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": [],
<<<<<<< HEAD
"modified": "2021-10-11 17:42:36.427699",
=======
"modified": "2022-07-11 13:37:50.605141", "modified": "2022-07-11 13:37:50.605141",
>>>>>>> c83fbd5c50 (fix: Allow multi currency invoice against single party account)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",