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

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-10-31 17:34:15 +05:30
committed by GitHub
parent d9d9230d4a
commit 1a3652bee1
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/setup/doctype/company/company.py
View File

@@ -180,9 +180,7 @@ class Company(NestedSet):
["Default Income Account", "default_income_account"], ["Default Income Account", "default_income_account"],
["Stock Received But Not Billed Account", "stock_received_but_not_billed"], ["Stock Received But Not Billed Account", "stock_received_but_not_billed"],
["Stock Adjustment Account", "stock_adjustment_account"], ["Stock Adjustment Account", "stock_adjustment_account"],
<<<<<<< HEAD
["Expense Included In Valuation Account", "expenses_included_in_valuation"], ["Expense Included In Valuation Account", "expenses_included_in_valuation"],
=======
["Write Off Account", "write_off_account"], ["Write Off Account", "write_off_account"],
["Default Payment Discount Account", "default_discount_account"], ["Default Payment Discount Account", "default_discount_account"],
["Unrealized Profit / Loss Account", "unrealized_profit_loss_account"], ["Unrealized Profit / Loss Account", "unrealized_profit_loss_account"],
@@ -194,7 +192,6 @@ class Company(NestedSet):
["Accumulated Depreciation Account", "accumulated_depreciation_account"], ["Accumulated Depreciation Account", "accumulated_depreciation_account"],
["Depreciation Expense Account", "depreciation_expense_account"], ["Depreciation Expense Account", "depreciation_expense_account"],
["Gain/Loss Account on Asset Disposal", "disposal_account"], ["Gain/Loss Account on Asset Disposal", "disposal_account"],
>>>>>>> 4af1ae1470 (fix: added validation for default accounts on company)
] ]
for account in accounts: for account in accounts: