Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into qi-ux

Browse Source
This commit is contained in:
Marica 2021-01-08 20:28:28 +05:30 committed by GitHub
commit b9d5ae9285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/stock/doctype/quality_inspection/quality_inspection.py
View File

@ -67,11 +67,24 @@ class QualityInspection(Document):
doctype = 'Stock Entry Detail' doctype = 'Stock Entry Detail'
if self.reference_type and self.reference_name: if self.reference_type and self.reference_name:
conditions = ""
if self.batch_no and self.docstatus == 1:
conditions += " and t1.batch_no = '%s'"%(self.batch_no)
if self.docstatus == 2: # if cancel, then remove qi link wherever same name
conditions += " and t1.quality_inspection = '%s'"%(self.name)
frappe.db.sql(""" frappe.db.sql("""
UPDATE `tab{child_doc}` t1, `tab{parent_doc}` t2 UPDATE
SET t1.quality_inspection = %s, t2.modified = %s `tab{child_doc}` t1, `tab{parent_doc}` t2
WHERE t1.parent = %s and t1.item_code = %s and t1.parent = t2.name SET
""".format(parent_doc=self.reference_type, child_doc=doctype), t1.quality_inspection = %s, t2.modified = %s
WHERE
t1.parent = %s
and t1.item_code = %s
and t1.parent = t2.name
{conditions}
""".format(parent_doc=self.reference_type, child_doc=doctype, conditions=conditions),
(quality_inspection, self.modified, self.reference_name, self.item_code)) (quality_inspection, self.modified, self.reference_name, self.item_code))
def inspect_and_set_status(self): def inspect_and_set_status(self):