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

chore: fix conflicts

Browse Source 
Removed validation for completed quantity matching in job card.
This commit is contained in:
rohitwaghchaure
2026-06-09 14:56:39 +05:30
committed by GitHub
parent b4c850da1c
commit 60a270acd4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -864,11 +864,8 @@ class JobCard(Document):
)
)
<<<<<<< HEAD
=======
self.validate_not_on_hold()
self.validate_time_logs_present()
self.validate_completed_qty_matches_for_quantity()
def validate_not_on_hold(self):
if self.is_paused:
@@ -880,7 +877,6 @@ class JobCard(Document):
)
def validate_time_logs_present(self):
>>>>>>> 9c23229cbf (fix: don't allow to submit job card with hold status)
if not self.time_logs:
frappe.throw(
_("Time logs are required for {0} {1}").format(