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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-08-19 11:06:23 +05:30
parent 0cd45a0022
commit 4af814dc3b
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
View File

@@ -101,11 +101,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-07 14:59:41.869117",
=======
"modified": "2025-08-08 14:13:22.203011", "modified": "2025-08-08 14:13:22.203011",
>>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounting Dimension Filter", "name": "Accounting Dimension Filter",
@@ -150,12 +146,7 @@
} }
], ],
"quick_entry": 1, "quick_entry": 1,
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1

5
erpnext/patches.txt
View File

@@ -419,10 +419,5 @@ erpnext.patches.v15_0.remove_sales_partner_from_consolidated_sales_invoice
erpnext.patches.v15_0.repost_gl_entries_with_no_account_subcontracting #2025-08-04 erpnext.patches.v15_0.repost_gl_entries_with_no_account_subcontracting #2025-08-04
execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_for_internal_transaction", 1) execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_for_internal_transaction", 1)
erpnext.patches.v15_0.add_company_payment_gateway_account erpnext.patches.v15_0.add_company_payment_gateway_account
<<<<<<< HEAD
erpnext.patches.v15_0.update_uae_zero_rated_fetch erpnext.patches.v15_0.update_uae_zero_rated_fetch
=======
erpnext.patches.v16_0.update_serial_no_reference_name
erpnext.patches.v16_0.set_invoice_type_in_pos_settings
erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
>>>>>>> 3cf765d985 (fix: add patch)