fixed test cases
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 490555c..18ca9cc 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -609,6 +609,9 @@
so_item_details = frappe._dict()
for data in po_items:
planned_qty = data.get('required_qty') or data.get('planned_qty')
+ ignore_existing_ordered_qty = data.get('ignore_existing_ordered_qty') or ignore_existing_ordered_qty
+ warehouse = data.get("warehouse") or warehouse
+
item_details = {}
if data.get("bom") or data.get("bom_no"):
if data.get('required_qty'):
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index bc1f958..e27ca01 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -365,6 +365,8 @@
fields: [
{fieldtype:'Read Only', fieldname:'item_code',
label: __('Item Code'), in_list_view:1},
+ {fieldtype:'Link', fieldname:'warehouse', options: 'Warehouse',
+ label: __('For Warehouse'), in_list_view:1},
{fieldtype:'Link', fieldname:'bom', options: 'BOM', reqd: 1,
label: __('BOM'), in_list_view:1, get_query: function(doc) {
return {filters: {item: doc.item_code}};
@@ -372,8 +374,6 @@
},
{fieldtype:'Float', fieldname:'required_qty', reqd: 1,
label: __('Qty'), in_list_view:1},
- {fieldtype:'Link', fieldname:'for_warehouse', options: 'Warehouse',
- label: __('For Warehouse')}
],
data: r.message,
get_data: function() {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 7eab352..ae2cd94 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -936,7 +936,12 @@
item["ignore_existing_ordered_qty"] = items.get('ignore_existing_ordered_qty')
item["include_raw_materials_from_sales_order"] = items.get('include_raw_materials_from_sales_order')
- raw_materials = get_items_for_material_requests(items, sales_order, company)
+ items.update({
+ 'company': company,
+ 'sales_order': sales_order
+ })
+
+ raw_materials = get_items_for_material_requests(items)
if not raw_materials:
frappe.msgprint(_("Material Request not created, as quantity for Raw Materials already available."))
return