Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840)

Browse Source
This commit is contained in:
Ganga Manoj 2021-06-01 10:44:26 +05:30 committed by GitHub
parent 970f00922d
commit c8b34798fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
"section_break_6", "section_break_6",
"warehouse", "warehouse",
"target_warehouse", "target_warehouse",
"conversion_factor",
"column_break_9", "column_break_9",
"qty", "qty",
"uom", "uom",
@ -209,13 +210,18 @@
"no_copy": 1, "no_copy": 1,
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
},
{
"fieldname": "conversion_factor",
"fieldtype": "Float",
"label": "Conversion Factor"
} }
], ],
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-09-24 09:25:13.050151", "modified": "2021-05-26 07:08:05.111385",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Packed Item", "name": "Packed Item",

1
erpnext/stock/doctype/packed_item/packed_item.py
View File

@ -53,6 +53,7 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row, descrip
pi.parent_detail_docname = main_item_row.name pi.parent_detail_docname = main_item_row.name
pi.uom = item.stock_uom pi.uom = item.stock_uom
pi.qty = flt(qty) pi.qty = flt(qty)
pi.conversion_factor = main_item_row.conversion_factor
if description and not pi.description: if description and not pi.description:
pi.description = description pi.description = description
if not pi.warehouse and not doc.amended_from: if not pi.warehouse and not doc.amended_from: