schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: tests

Browse Source 
(cherry picked from commit 09d26a835f)
This commit is contained in:
Mihir Kandoi
2025-01-14 16:27:49 +05:30
committed by Mergify
parent bb0695a883
commit 8ba42cfbf0
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/production_plan/test_production_plan.py
View File

@@ -744,9 +744,9 @@ class TestProductionPlan(FrappeTestCase):
""" """
from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
make_stock_entry(item_code="_Test Item", target="Work In Progress - _TC", qty=2, basic_rate=100) make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=2, basic_rate=100)
make_stock_entry( make_stock_entry(
item_code="_Test Item Home Desktop 100", target="Work In Progress - _TC", qty=4, basic_rate=100 item_code="_Test Item Home Desktop 100", target="_Test Warehouse - _TC", qty=4, basic_rate=100
) )
item = "_Test FG Item" item = "_Test FG Item"
@@ -794,10 +794,10 @@ class TestProductionPlan(FrappeTestCase):
from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
make_stock_entry( make_stock_entry(
item_code="Raw Material Item 1", target="Work In Progress - _TC", qty=2, basic_rate=100 item_code="Raw Material Item 1", target="_Test Warehouse - _TC", qty=2, basic_rate=100
) )
make_stock_entry( make_stock_entry(
item_code="Raw Material Item 2", target="Work In Progress - _TC", qty=2, basic_rate=100 item_code="Raw Material Item 2", target="_Test Warehouse - _TC", qty=2, basic_rate=100
) )
pln = create_production_plan(item_code="Test Production Item 1", skip_getting_mr_items=True) pln = create_production_plan(item_code="Test Production Item 1", skip_getting_mr_items=True)

10
erpnext/manufacturing/doctype/work_order/test_work_order.py
View File

@@ -714,7 +714,12 @@ class TestWorkOrder(FrappeTestCase):
self.assertEqual(row.item_code, fg_item) self.assertEqual(row.item_code, fg_item)
work_order = make_wo_order_test_record( work_order = make_wo_order_test_record(
item=fg_item, skip_transfer=True, planned_start_date=now(), qty=30, do_not_save=True item=fg_item,
skip_transfer=True,
planned_start_date=now(),
qty=30,
do_not_save=True,
source_warehouse="_Test Warehouse - _TC",
) )
work_order.batch_size = 10 work_order.batch_size = 10
work_order.insert() work_order.insert()
@@ -931,11 +936,13 @@ class TestWorkOrder(FrappeTestCase):
wip_warehouse=wip_warehouse, wip_warehouse=wip_warehouse,
qty=qty, qty=qty,
skip_transfer=1, skip_transfer=1,
source_warehouse=wip_warehouse,
stock_uom=fg_item_non_whole.stock_uom, stock_uom=fg_item_non_whole.stock_uom,
) )
se = frappe.get_doc(make_stock_entry(wo.name, "Material Transfer for Manufacture", qty)) se = frappe.get_doc(make_stock_entry(wo.name, "Material Transfer for Manufacture", qty))
se.get("items")[0].s_warehouse = "Stores - _TC" se.get("items")[0].s_warehouse = "Stores - _TC"
se.get("items")[0].t_warehouse = wip_warehouse
se.insert() se.insert()
se.submit() se.submit()
@@ -2045,6 +2052,7 @@ class TestWorkOrder(FrappeTestCase):
bom_no=bom_doc.name, bom_no=bom_doc.name,
qty=1, qty=1,
skip_transfer=1, skip_transfer=1,
source_warehouse="_Test Warehouse - _TC",
) )
job_cards = frappe.get_all("Job Card", filters={"work_order": wo.name}) job_cards = frappe.get_all("Job Card", filters={"work_order": wo.name})

6
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@@ -1426,7 +1426,11 @@ def make_stock_entry(work_order_id, purpose, qty=None, target_warehouse=None):
stock_entry.to_warehouse = wip_warehouse stock_entry.to_warehouse = wip_warehouse
stock_entry.project = work_order.project stock_entry.project = work_order.project
else: else:
stock_entry.from_warehouse = wip_warehouse stock_entry.from_warehouse = (
work_order.source_warehouse
if work_order.skip_transfer and not work_order.from_wip_warehouse
else wip_warehouse
)
stock_entry.to_warehouse = work_order.fg_warehouse stock_entry.to_warehouse = work_order.fg_warehouse
stock_entry.project = work_order.project stock_entry.project = work_order.project

4
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -1687,13 +1687,13 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
wo.submit() wo.submit()
make_stock_entry( make_stock_entry(
item_code="_Test Item", item_code="_Test Item",
target="Work In Progress - _TC", target="_Test Warehouse - _TC",
qty=4, qty=4,
basic_rate=100, # Stock RM basic_rate=100, # Stock RM
) )
make_stock_entry( make_stock_entry(
item_code="_Test Item Home Desktop 100", # Stock RM item_code="_Test Item Home Desktop 100", # Stock RM
target="Work In Progress - _TC", target="_Test Warehouse - _TC",
qty=4, qty=4,
basic_rate=100, basic_rate=100,
) )