nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50867 from frappe/version-14-hotfix

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-03 11:12:16 +05:30
committed by GitHub
parent 14a7ab71b4 10f1c9c3ac
commit ea1ca7111d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -443,7 +443,7 @@ class JobCard(Document):
op_row.employee.append(time_log.employee) op_row.employee.append(time_log.employee)
if time_log.time_in_mins: if time_log.time_in_mins:
op_row.completed_time += time_log.time_in_mins op_row.completed_time += time_log.time_in_mins
op_row.completed_qty += time_log.completed_qty op_row.completed_qty += flt(time_log.completed_qty)
for row in self.sub_operations: for row in self.sub_operations:
operation_deatils = operation_wise_completed_time.get(row.sub_operation) operation_deatils = operation_wise_completed_time.get(row.sub_operation)

1
erpnext/public/js/controllers/transaction.js
View File

@@ -438,6 +438,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
item.weight_per_unit = 0; item.weight_per_unit = 0;
item.weight_uom = ''; item.weight_uom = '';
item.uom = null // make UOM blank to update the existing UOM when item changes
item.conversion_factor = 0; item.conversion_factor = 0;
if(['Sales Invoice'].includes(this.frm.doc.doctype)) { if(['Sales Invoice'].includes(this.frm.doc.doctype)) {