Skip to content

Commit

Permalink
fix(Item): allow UOM conversion for non-stock items (backport #41267) (
Browse files Browse the repository at this point in the history
…#41346)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Item): allow UOM conversion for non-stock items (#41267)
  • Loading branch information
mergify[bot] and barredterra committed May 6, 2024
1 parent 6491577 commit cd3ca1e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 4 additions & 4 deletions erpnext/stock/doctype/item/item.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
"section_break_11",
"description",
"brand",
"unit_of_measure_conversion",
"uoms",
"dashboard_tab",
"inventory_section",
"inventory_settings_section",
Expand All @@ -52,8 +54,6 @@
"barcodes",
"reorder_section",
"reorder_levels",
"unit_of_measure_conversion",
"uoms",
"serial_nos_and_batches",
"has_batch_no",
"create_new_batch",
Expand Down Expand Up @@ -891,7 +891,7 @@
"index_web_pages_for_search": 1,
"links": [],
"make_attachments_public": 1,
"modified": "2024-01-08 18:09:30.225085",
"modified": "2024-04-30 13:46:39.098753",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
Expand Down Expand Up @@ -964,4 +964,4 @@
"states": [],
"title_field": "item_name",
"track_changes": 1
}
}
6 changes: 2 additions & 4 deletions erpnext/stock/doctype/item/item.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ class Item(Document):
from erpnext.stock.doctype.item_reorder.item_reorder import ItemReorder
from erpnext.stock.doctype.item_supplier.item_supplier import ItemSupplier
from erpnext.stock.doctype.item_tax.item_tax import ItemTax
from erpnext.stock.doctype.item_variant_attribute.item_variant_attribute import (
ItemVariantAttribute,
)
from erpnext.stock.doctype.item_variant_attribute.item_variant_attribute import ItemVariantAttribute
from erpnext.stock.doctype.uom_conversion_detail.uom_conversion_detail import UOMConversionDetail

allow_alternative_item: DF.Check
allow_negative_stock: DF.Check
asset_category: DF.Link | None
asset_naming_series: DF.Literal
asset_naming_series: DF.Literal[None]
attributes: DF.Table[ItemVariantAttribute]
auto_create_assets: DF.Check
barcodes: DF.Table[ItemBarcode]
Expand Down

0 comments on commit cd3ca1e

Please sign in to comment.