nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 11:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: create source_stock_entry to refer to original manufacturing entry

Browse Source 
(cherry picked from commit d4baa9a74a)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.json
#	erpnext/stock/doctype/stock_entry/stock_entry.py
This commit is contained in:
Smit Vora
2026-03-25 10:43:28 +05:30
committed by Mergify
parent 831ddcd5af
commit 55ee1dcd04
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@@ -28,7 +28,15 @@
"column_break_eaoa", "column_break_eaoa",
"set_posting_time", "set_posting_time",
"inspection_required", "inspection_required",
<<<<<<< HEAD
"apply_putaway_rule", "apply_putaway_rule",
=======
"column_break_jabv",
"work_order",
"subcontracting_order",
"outgoing_stock_entry",
"source_stock_entry",
>>>>>>> d4baa9a74a (fix: create source_stock_entry to refer to original manufacturing entry)
"bom_info_section", "bom_info_section",
"from_bom", "from_bom",
"use_multi_level_bom", "use_multi_level_bom",
@@ -120,6 +128,15 @@
"options": "Stock Entry", "options": "Stock Entry",
"read_only": 1 "read_only": 1
}, },
{
"depends_on": "eval:doc.purpose == 'Disassemble'",
"fieldname": "source_stock_entry",
"fieldtype": "Link",
"label": "Source Stock Entry (Manufacture)",
"no_copy": 1,
"options": "Stock Entry",
"print_hide": 1
},
{ {
"bold": 1, "bold": 1,
"fetch_from": "stock_entry_type.purpose", "fetch_from": "stock_entry_type.purpose",

5
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -142,7 +142,12 @@ class StockEntry(StockController):
scan_barcode: DF.Data | None scan_barcode: DF.Data | None
select_print_heading: DF.Link | None select_print_heading: DF.Link | None
set_posting_time: DF.Check set_posting_time: DF.Check
<<<<<<< HEAD
source_address_display: DF.SmallText | None source_address_display: DF.SmallText | None
=======
source_address_display: DF.TextEditor | None
source_stock_entry: DF.Link | None
>>>>>>> d4baa9a74a (fix: create source_stock_entry to refer to original manufacturing entry)
source_warehouse_address: DF.Link | None source_warehouse_address: DF.Link | None
stock_entry_type: DF.Link stock_entry_type: DF.Link
subcontracting_order: DF.Link | None subcontracting_order: DF.Link | None