diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 054f817d7f7..be57e1108b8 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -30,10 +30,7 @@ from erpnext.manufacturing.doctype.production_plan.services.material_request imp get_warehouse_list, set_default_warehouses, ) -from erpnext.manufacturing.doctype.production_plan.services.sales_order_sourcing import ( - SalesOrderSourcingService, -) -from erpnext.manufacturing.doctype.production_plan.services.stock_reservation import ( +from erpnext.manufacturing.doctype.production_plan.services.reservation import ( cancel_stock_reservation_entries, get_non_completed_production_plans, get_reserved_qty_for_production_plan, @@ -41,10 +38,13 @@ from erpnext.manufacturing.doctype.production_plan.services.stock_reservation im make_stock_reservation_entries, reserve_stock_for_production_plan, ) +from erpnext.manufacturing.doctype.production_plan.services.sales_order_planning import ( + SalesOrderSourcingService, +) from erpnext.manufacturing.doctype.production_plan.services.sub_assembly import ( SubAssemblyService, ) -from erpnext.manufacturing.doctype.production_plan.services.work_order_creation import ( +from erpnext.manufacturing.doctype.production_plan.services.work_order_planning import ( WorkOrderCreationService, ) from erpnext.stock.utils import get_or_make_bin diff --git a/erpnext/manufacturing/doctype/production_plan/services/bom_explosion.py b/erpnext/manufacturing/doctype/production_plan/services/bom_explosion.py index 93bcb935959..c40c9e1e05f 100644 --- a/erpnext/manufacturing/doctype/production_plan/services/bom_explosion.py +++ b/erpnext/manufacturing/doctype/production_plan/services/bom_explosion.py @@ -6,7 +6,7 @@ import frappe from frappe.query_builder.functions import IfNull, Sum -from erpnext.manufacturing.doctype.production_plan.services.planning_helpers import get_uom_conversion_factor +from erpnext.manufacturing.doctype.production_plan.services.planning_queries import get_uom_conversion_factor def get_exploded_items(item_details, company, bom_no, include_non_stock_items, planned_qty=1, doc=None): diff --git a/erpnext/manufacturing/doctype/production_plan/services/material_request.py b/erpnext/manufacturing/doctype/production_plan/services/material_request.py index 750c627883e..a17d434136a 100644 --- a/erpnext/manufacturing/doctype/production_plan/services/material_request.py +++ b/erpnext/manufacturing/doctype/production_plan/services/material_request.py @@ -22,7 +22,7 @@ from erpnext.manufacturing.doctype.production_plan.services.bom_explosion import get_exploded_items, get_subitems, ) -from erpnext.manufacturing.doctype.production_plan.services.planning_helpers import ( +from erpnext.manufacturing.doctype.production_plan.services.planning_queries import ( get_bin_details, get_item_data, get_sales_orders, @@ -30,7 +30,7 @@ from erpnext.manufacturing.doctype.production_plan.services.planning_helpers imp get_warehouse_list, set_default_warehouses, ) -from erpnext.manufacturing.doctype.production_plan.services.sub_assembly_planning import ( +from erpnext.manufacturing.doctype.production_plan.services.sub_assembly_queries import ( get_raw_materials_of_sub_assembly_items, get_sub_assembly_items, ) diff --git a/erpnext/manufacturing/doctype/production_plan/services/planning_helpers.py b/erpnext/manufacturing/doctype/production_plan/services/planning_queries.py similarity index 100% rename from erpnext/manufacturing/doctype/production_plan/services/planning_helpers.py rename to erpnext/manufacturing/doctype/production_plan/services/planning_queries.py diff --git a/erpnext/manufacturing/doctype/production_plan/services/stock_reservation.py b/erpnext/manufacturing/doctype/production_plan/services/reservation.py similarity index 100% rename from erpnext/manufacturing/doctype/production_plan/services/stock_reservation.py rename to erpnext/manufacturing/doctype/production_plan/services/reservation.py diff --git a/erpnext/manufacturing/doctype/production_plan/services/sales_order_sourcing.py b/erpnext/manufacturing/doctype/production_plan/services/sales_order_planning.py similarity index 99% rename from erpnext/manufacturing/doctype/production_plan/services/sales_order_sourcing.py rename to erpnext/manufacturing/doctype/production_plan/services/sales_order_planning.py index cc0d96b1639..7761b299a61 100644 --- a/erpnext/manufacturing/doctype/production_plan/services/sales_order_sourcing.py +++ b/erpnext/manufacturing/doctype/production_plan/services/sales_order_planning.py @@ -9,7 +9,7 @@ from frappe.query_builder.functions import IfNull from frappe.utils import flt, now_datetime from pypika.terms import ExistsCriterion -from erpnext.manufacturing.doctype.production_plan.services.planning_helpers import get_sales_orders +from erpnext.manufacturing.doctype.production_plan.services.planning_queries import get_sales_orders from erpnext.manufacturing.doctype.work_order.work_order import get_item_details diff --git a/erpnext/manufacturing/doctype/production_plan/services/sub_assembly.py b/erpnext/manufacturing/doctype/production_plan/services/sub_assembly.py index ac6fe40f500..0f445d557ef 100644 --- a/erpnext/manufacturing/doctype/production_plan/services/sub_assembly.py +++ b/erpnext/manufacturing/doctype/production_plan/services/sub_assembly.py @@ -7,7 +7,7 @@ import frappe from frappe import _ from frappe.utils import flt -from erpnext.manufacturing.doctype.production_plan.services.sub_assembly_planning import ( +from erpnext.manufacturing.doctype.production_plan.services.sub_assembly_queries import ( get_sub_assembly_items, ) diff --git a/erpnext/manufacturing/doctype/production_plan/services/sub_assembly_planning.py b/erpnext/manufacturing/doctype/production_plan/services/sub_assembly_queries.py similarity index 99% rename from erpnext/manufacturing/doctype/production_plan/services/sub_assembly_planning.py rename to erpnext/manufacturing/doctype/production_plan/services/sub_assembly_queries.py index 9a529feabf7..c4e25cffae5 100644 --- a/erpnext/manufacturing/doctype/production_plan/services/sub_assembly_planning.py +++ b/erpnext/manufacturing/doctype/production_plan/services/sub_assembly_queries.py @@ -8,7 +8,7 @@ from frappe.query_builder.functions import IfNull, Sum from frappe.utils import flt from erpnext.manufacturing.doctype.bom.bom import get_children as get_bom_children -from erpnext.manufacturing.doctype.production_plan.services.planning_helpers import ( +from erpnext.manufacturing.doctype.production_plan.services.planning_queries import ( get_bin_details, get_uom_conversion_factor, ) diff --git a/erpnext/manufacturing/doctype/production_plan/services/work_order_creation.py b/erpnext/manufacturing/doctype/production_plan/services/work_order_planning.py similarity index 99% rename from erpnext/manufacturing/doctype/production_plan/services/work_order_creation.py rename to erpnext/manufacturing/doctype/production_plan/services/work_order_planning.py index 91ec2bf52e6..ae4611e9fe3 100644 --- a/erpnext/manufacturing/doctype/production_plan/services/work_order_creation.py +++ b/erpnext/manufacturing/doctype/production_plan/services/work_order_planning.py @@ -9,7 +9,7 @@ import frappe from frappe import _, msgprint from frappe.utils import flt, get_filtered_list_link, getdate, nowdate -from erpnext.manufacturing.doctype.production_plan.services.planning_helpers import set_default_warehouses +from erpnext.manufacturing.doctype.production_plan.services.planning_queries import set_default_warehouses _SUB_ASSEMBLY_WO_FIELDS = [ "production_item",