CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 19:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Item): allow UOM conversion for non-stock items (backport #41267) (#41346)

Browse Source 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Item): allow UOM conversion for non-stock items (#41267)
This commit is contained in:
mergify[bot]
2024-05-06 20:51:11 +02:00
committed by GitHub
parent 6491577501
commit cd3ca1ee25
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/item/item.json
View File

@@ -36,6 +36,8 @@
"section_break_11", "section_break_11",
"description", "description",
"brand", "brand",
"unit_of_measure_conversion",
"uoms",
"dashboard_tab", "dashboard_tab",
"inventory_section", "inventory_section",
"inventory_settings_section", "inventory_settings_section",
@@ -52,8 +54,6 @@
"barcodes", "barcodes",
"reorder_section", "reorder_section",
"reorder_levels", "reorder_levels",
"unit_of_measure_conversion",
"uoms",
"serial_nos_and_batches", "serial_nos_and_batches",
"has_batch_no", "has_batch_no",
"create_new_batch", "create_new_batch",
@@ -891,7 +891,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"make_attachments_public": 1, "make_attachments_public": 1,
"modified": "2024-01-08 18:09:30.225085", "modified": "2024-04-30 13:46:39.098753",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",
@@ -964,4 +964,4 @@
"states": [], "states": [],
"title_field": "item_name", "title_field": "item_name",
"track_changes": 1 "track_changes": 1
} }

6
erpnext/stock/doctype/item/item.py
View File

@@ -65,15 +65,13 @@ class Item(Document):
from erpnext.stock.doctype.item_reorder.item_reorder import ItemReorder 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_supplier.item_supplier import ItemSupplier
from erpnext.stock.doctype.item_tax.item_tax import ItemTax from erpnext.stock.doctype.item_tax.item_tax import ItemTax
from erpnext.stock.doctype.item_variant_attribute.item_variant_attribute import ( from erpnext.stock.doctype.item_variant_attribute.item_variant_attribute import ItemVariantAttribute
ItemVariantAttribute,
)
from erpnext.stock.doctype.uom_conversion_detail.uom_conversion_detail import UOMConversionDetail from erpnext.stock.doctype.uom_conversion_detail.uom_conversion_detail import UOMConversionDetail
allow_alternative_item: DF.Check allow_alternative_item: DF.Check
allow_negative_stock: DF.Check allow_negative_stock: DF.Check
asset_category: DF.Link | None asset_category: DF.Link | None
asset_naming_series: DF.Literal asset_naming_series: DF.Literal[None]
attributes: DF.Table[ItemVariantAttribute] attributes: DF.Table[ItemVariantAttribute]
auto_create_assets: DF.Check auto_create_assets: DF.Check
barcodes: DF.Table[ItemBarcode] barcodes: DF.Table[ItemBarcode]