From 6c4655dd72dc304d07b2b23a26e7f61eb1ff00b9 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 28 Jan 2025 16:56:05 +0530 Subject: [PATCH] fix: existing logical error --- erpnext/manufacturing/doctype/job_card/job_card.py | 2 +- erpnext/manufacturing/doctype/job_card/test_job_card.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index 0f0694e33b0..90f915d9c24 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -791,7 +791,7 @@ class JobCard(Document): fields=["total_time_in_mins", "hour_rate"], filters={"is_corrective_job_card": 1, "docstatus": 1, "work_order": self.work_order}, ): - wo.corrective_operation_cost += flt(row.total_time_in_mins) * flt(row.hour_rate) + wo.corrective_operation_cost += (flt(row.total_time_in_mins) / 60) * flt(row.hour_rate) wo.calculate_operating_cost() wo.flags.ignore_validate_update_after_submit = True diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py index 0119e74cb4c..7f456b9881e 100644 --- a/erpnext/manufacturing/doctype/job_card/test_job_card.py +++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py @@ -451,7 +451,6 @@ class TestJobCard(FrappeTestCase): job_card.name, operation=corrective_action.name, for_operation=job_card.operation ) corrective_job_card.hour_rate = 100 - corrective_job_card.update({"hour_rate": 100}) corrective_job_card.insert() corrective_job_card.append( "time_logs", @@ -461,7 +460,6 @@ class TestJobCard(FrappeTestCase): "completed_qty": 4, }, ) - print(corrective_job_card.as_dict()) corrective_job_card.submit() wo.reload() @@ -479,8 +477,10 @@ class TestJobCard(FrappeTestCase): wo.name, [{"name": wo.operations[0].name, "operation": "_Test Operation 1", "qty": 3, "pending_qty": 3}], ) + workstation = job_card.workstation job_card = frappe.get_last_doc("Job Card", {"work_order": wo.name}) job_card.update({"for_quantity": 3}) + job_card.workstation = workstation job_card.append( "time_logs", {