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

fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584)

Browse Source 
(cherry picked from commit 69d88a9212)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.py
#	erpnext/manufacturing/doctype/production_plan/production_plan_list.js
This commit is contained in:
Richard Case
2021-08-26 17:22:16 +01:00
committed by Mergify
parent 495528a758
commit bbd718d98d
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@@ -481,6 +481,7 @@ class ProductionPlan(Document):
{"sales_order": data.parent, "sales_order_item": data.name, "qty": data.pending_qty} {"sales_order": data.parent, "sales_order_item": data.name, "qty": data.pending_qty}
) )
<<<<<<< HEAD
bom_no = data.bom_no or item_details and item_details.get("bom_no") or "" bom_no = data.bom_no or item_details and item_details.get("bom_no") or ""
if not bom_no: if not bom_no:
continue continue
@@ -499,6 +500,19 @@ class ProductionPlan(Document):
"product_bundle_item": data.parent_item, "product_bundle_item": data.parent_item,
}, },
) )
=======
pi = self.append('po_items', {
'warehouse': data.warehouse,
'item_code': data.item_code,
'description': data.description or item_details.description,
'stock_uom': item_details and item_details.stock_uom or '',
'bom_no': item_details and item_details.bom_no or '',
'planned_qty': data.pending_qty,
'pending_qty': data.pending_qty,
'planned_start_date': now_datetime(),
'product_bundle_item': data.parent_item
})
>>>>>>> 69d88a9212 (fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584))
pi._set_defaults() pi._set_defaults()
if self.get_items_from == "Sales Order": if self.get_items_from == "Sales Order":

4
erpnext/manufacturing/doctype/production_plan/production_plan_list.js
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
frappe.listview_settings["Production Plan"] = { frappe.listview_settings["Production Plan"] = {
=======
frappe.listview_settings['Production Plan'] = {
>>>>>>> 69d88a9212 (fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584))
hide_name_column: true, hide_name_column: true,
add_fields: ["status"], add_fields: ["status"],
filters: [["status", "!=", "Closed"]], filters: [["status", "!=", "Closed"]],