mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-16 21:35:09 +00:00
fix: production plan not considering planning datetime when creating WO
(cherry picked from commit 4e19c7e8bd)
This commit is contained in:
@@ -747,19 +747,21 @@ class ProductionPlan(Document):
|
|||||||
"project": self.project,
|
"project": self.project,
|
||||||
}
|
}
|
||||||
|
|
||||||
key = (d.item_code, d.sales_order, d.sales_order_item, d.warehouse)
|
key = (d.item_code, d.sales_order, d.sales_order_item, d.warehouse, d.planned_start_date)
|
||||||
if self.combine_items:
|
if self.combine_items:
|
||||||
key = (d.item_code, d.sales_order, d.warehouse)
|
key = (d.item_code, d.sales_order, d.warehouse, d.planned_start_date)
|
||||||
|
|
||||||
if not d.sales_order:
|
if not d.sales_order:
|
||||||
key = (d.name, d.item_code, d.warehouse)
|
key = (d.name, d.item_code, d.warehouse, d.planned_start_date)
|
||||||
|
|
||||||
if not item_details["project"] and d.sales_order:
|
if not item_details["project"] and d.sales_order:
|
||||||
item_details["project"] = frappe.get_cached_value("Sales Order", d.sales_order, "project")
|
item_details["project"] = frappe.get_cached_value("Sales Order", d.sales_order, "project")
|
||||||
|
|
||||||
if self.get_items_from == "Material Request":
|
if self.get_items_from == "Material Request":
|
||||||
item_details.update({"qty": d.planned_qty})
|
item_details.update({"qty": d.planned_qty})
|
||||||
item_dict[(d.item_code, d.material_request_item, d.warehouse)] = item_details
|
item_dict[
|
||||||
|
(d.item_code, d.material_request_item, d.warehouse, d.planned_start_date)
|
||||||
|
] = item_details
|
||||||
else:
|
else:
|
||||||
item_details.update(
|
item_details.update(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -999,7 +999,7 @@ class TestProductionPlan(IntegrationTestCase):
|
|||||||
items_data = pln.get_production_items()
|
items_data = pln.get_production_items()
|
||||||
|
|
||||||
# Update qty
|
# Update qty
|
||||||
items_data[(pln.po_items[0].name, item, None)]["qty"] = qty
|
items_data[(pln.po_items[0].name, item, None, pln.po_items[0].planned_start_date)]["qty"] = qty
|
||||||
|
|
||||||
# Create and Submit Work Order for each item in items_data
|
# Create and Submit Work Order for each item in items_data
|
||||||
for _key, item in items_data.items():
|
for _key, item in items_data.items():
|
||||||
|
|||||||
Reference in New Issue
Block a user