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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-23 19:47:06 +05:30
committed by GitHub
parent 69a8e0dfac
commit 811953b9b0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
View File

@@ -196,18 +196,17 @@ class InventoryDimension(Document):
custom_fields["Stock Ledger Entry"] = dimension_field custom_fields["Stock Ledger Entry"] = dimension_field
filter_custom_fields = {} filter_custom_fields = {}
<<<<<<< HEAD
=======
ignore_doctypes = [ ignore_doctypes = [
"Serial and Batch Bundle",
"Serial and Batch Entry",
"Pick List Item", "Pick List Item",
"Maintenance Visit Purpose", "Maintenance Visit Purpose",
] ]
>>>>>>> cd4ba69262 (fix: inventory dimension for maintence visit)
if custom_fields: if custom_fields:
for doctype, fields in custom_fields.items(): for doctype, fields in custom_fields.items():
if doctype in ignore_doctypes:
continue
if isinstance(fields, dict): if isinstance(fields, dict):
fields = [fields] fields = [fields]