nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2023-09-18 10:29:29 +05:30
parent 18702841af
commit 79321f56ca
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,14 +64,11 @@
"column_break_25", "column_break_25",
"frozen_accounts_modifier", "frozen_accounts_modifier",
"report_settings_sb", "report_settings_sb",
<<<<<<< HEAD
"banking_tab", "banking_tab",
"enable_party_matching", "enable_party_matching",
"enable_fuzzy_matching" "enable_fuzzy_matching",
=======
"tab_break_dpet", "tab_break_dpet",
"show_balance_in_coa" "show_balance_in_coa"
>>>>>>> 1b78fae6fc (refactor: show balance checkbox in Accounts Settings)
], ],
"fields": [ "fields": [
{ {
@@ -360,7 +357,6 @@
"label": "Allow multi-currency invoices against single party account " "label": "Allow multi-currency invoices against single party account "
}, },
{ {
<<<<<<< HEAD
"default": "0", "default": "0",
"description": "Split Early Payment Discount Loss into Income and Tax Loss", "description": "Split Early Payment Discount Loss into Income and Tax Loss",
"fieldname": "book_tax_discount_loss", "fieldname": "book_tax_discount_loss",
@@ -422,7 +418,8 @@
"fieldname": "ignore_account_closing_balance", "fieldname": "ignore_account_closing_balance",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Ignore Account Closing Balance" "label": "Ignore Account Closing Balance"
======= },
{
"fieldname": "tab_break_dpet", "fieldname": "tab_break_dpet",
"fieldtype": "Tab Break", "fieldtype": "Tab Break",
"label": "Chart Of Accounts" "label": "Chart Of Accounts"
@@ -432,7 +429,6 @@
"fieldname": "show_balance_in_coa", "fieldname": "show_balance_in_coa",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Show Balances in Chart Of Accounts" "label": "Show Balances in Chart Of Accounts"
>>>>>>> 1b78fae6fc (refactor: show balance checkbox in Accounts Settings)
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -440,11 +436,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-07-27 15:05:34.000264", "modified": "2023-07-27 15:05:34.000264",
=======
"modified": "2023-01-02 12:07:42.434214",
>>>>>>> 1b78fae6fc (refactor: show balance checkbox in Accounts Settings)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",