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

chore: fix conflict

Browse Source
This commit is contained in:
Sagar Vora
2024-04-08 15:50:58 +05:30
parent 0172880fd3
commit 24709ab400
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hooks.py
View File

@@ -643,15 +643,5 @@ extend_bootinfo = [
"erpnext.support.doctype.service_level_agreement.service_level_agreement.add_sla_doctypes", "erpnext.support.doctype.service_level_agreement.service_level_agreement.add_sla_doctypes",
"erpnext.startup.boot.bootinfo", "erpnext.startup.boot.bootinfo",
] ]
<<<<<<< HEAD
=======
default_log_clearing_doctypes = {
"Repost Item Valuation": 60,
}
export_python_type_annotations = True
fields_for_group_similar_items = ["qty", "amount"] fields_for_group_similar_items = ["qty", "amount"]
>>>>>>> f7c9e1538b (feat: new hook `fields_for_group_similar_items` to group additional fields for print formats (#40831))