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

chore: fix conflicts

Browse Source 
(cherry picked from commit d04965b6b2)
This commit is contained in:
rohitwaghchaure
2026-06-12 16:51:57 +05:30
committed by Mergify
parent 808ca06801
commit a65629da1a
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/workstation/workstation.py
View File

@@ -276,13 +276,9 @@ def get_raw_materials(job_cards):
"Job Card Item", "Job Card Item",
======= =======
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def get_raw_materials(job_card):
=======
def get_raw_materials(job_card: str): def get_raw_materials(job_card: str):
frappe.has_permission("Job Card", "read", doc=job_card, throw=True) frappe.has_permission("Job Card", "read", doc=job_card, throw=True)
>>>>>>> cf127e8900 (fix: permissions in workstation file)
raw_materials = frappe.get_all( raw_materials = frappe.get_all(
"Job Card", "Job Card",
>>>>>>> 0fea93388d (fix: permissions in workstation file) >>>>>>> 0fea93388d (fix: permissions in workstation file)
@@ -488,13 +484,9 @@ def update_job_card(job_card: str, method: str, **kwargs):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def validate_job_card(job_card, status):
=======
def validate_job_card(job_card: str, status: str): def validate_job_card(job_card: str, status: str):
frappe.has_permission("Job Card", "read", doc=job_card, throw=True) frappe.has_permission("Job Card", "read", doc=job_card, throw=True)
>>>>>>> cf127e8900 (fix: permissions in workstation file)
job_card_details = frappe.db.get_value("Job Card", job_card, ["status", "for_quantity"], as_dict=1) job_card_details = frappe.db.get_value("Job Card", job_card, ["status", "for_quantity"], as_dict=1)
current_status = job_card_details.status current_status = job_card_details.status