Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mihir-kandoi
mihir-kandoi authored Feb 5, 2025
1 parent 401fd7f commit 3689a2d
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions erpnext/controllers/stock_controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1564,10 +1564,6 @@ def repost_required_for_queue(doc: StockController) -> bool:
return False


@frappe.whitelist()
<<<<<<< HEAD
def make_quality_inspections(doctype, docname, items):
=======
def check_item_quality_inspection(doctype, items):
if isinstance(items, str):
items = json.loads(items)
Expand All @@ -1590,8 +1586,7 @@ def check_item_quality_inspection(doctype, items):


@frappe.whitelist()
def make_quality_inspections(doctype, docname, items, inspection_type):
>>>>>>> c92ec312b9 (fix: show only items with inspection enabled on create QI dialog)
def make_quality_inspections(doctype, docname, items):
if isinstance(items, str):
items = json.loads(items)

Expand Down

1 comment on commit 3689a2d

@kittiu
Copy link
Contributor

@kittiu kittiu commented on 3689a2d Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi have got the error that def check_item_quality_inspection(doctype, items) is not whitelisted.

Image

I am not sure which PR is doing this, but can this be restored?

Please sign in to comment.