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

chore: resolve conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2026-08-09 20:43:30 +05:30
parent d97cf131a1
commit f176a46722
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1517,16 +1517,6 @@ class JobCard(Document):
self.set_for_quantity(kwargs)
self.validate_complete_job_card_qty(kwargs)
<<<<<<< HEAD
=======
self.pending_qty = flt(kwargs.pending_qty)
self.process_loss_qty = flt(kwargs.process_loss_qty)
self.add_completion_time_logs(kwargs)
if kwargs.auto_submit:
self.auto_submit_job_card(kwargs.auto_submit)
def set_for_quantity(self, kwargs):
"""Qty to Manufacture of the completion dialog covers the current cycle only,
so the qty completed by the earlier cycles of this job card is kept."""
@@ -1535,7 +1525,6 @@ class JobCard(Document):
self.for_quantity = flt(self.total_completed_qty) + flt(kwargs.for_quantity)
>>>>>>> 0e1bc58b2e (fix(job_card): apply the completion dialog's qty to manufacture (#57685))
def validate_docstatus(self):
if self.docstatus == 2:
frappe.throw(_("Cancelled Job Card cannot be processed."))