(cherry picked from commit 112fc888f1)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
This commit is contained in:
@@ -1,8 +1,7 @@
|
|||||||
# Copyright (c) 2019, Frappe and Contributors
|
# Copyright (c) 2021, Frappe and Contributors
|
||||||
# License: GNU General Public License v3. See license.txt
|
# License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
import frappe
|
import frappe
|
||||||
|
from erpnext.controllers.status_updater import OverAllowanceError
|
||||||
|
|
||||||
def execute():
|
def execute():
|
||||||
frappe.reload_doc('stock', 'doctype', 'purchase_receipt')
|
frappe.reload_doc('stock', 'doctype', 'purchase_receipt')
|
||||||
@@ -14,9 +13,15 @@ def execute():
|
|||||||
for return_doc in frappe.get_all(doctype, filters={'is_return' : 1, 'docstatus' : 1}):
|
for return_doc in frappe.get_all(doctype, filters={'is_return' : 1, 'docstatus' : 1}):
|
||||||
# Update original receipt/delivery document from return
|
# Update original receipt/delivery document from return
|
||||||
return_doc = frappe.get_cached_doc(doctype, return_doc.name)
|
return_doc = frappe.get_cached_doc(doctype, return_doc.name)
|
||||||
return_doc.update_prevdoc_status()
|
try:
|
||||||
|
return_doc.update_prevdoc_status()
|
||||||
|
except OverAllowanceError:
|
||||||
|
frappe.db.rollback()
|
||||||
|
continue
|
||||||
|
|
||||||
return_against = frappe.get_doc(doctype, return_doc.return_against)
|
return_against = frappe.get_doc(doctype, return_doc.return_against)
|
||||||
return_against.update_billing_status()
|
return_against.update_billing_status()
|
||||||
|
frappe.db.commit()
|
||||||
|
|
||||||
# Set received qty in stock uom in PR, as returned qty is checked against it
|
# Set received qty in stock uom in PR, as returned qty is checked against it
|
||||||
frappe.db.sql(""" update `tabPurchase Receipt Item`
|
frappe.db.sql(""" update `tabPurchase Receipt Item`
|
||||||
|
|||||||
Reference in New Issue
Block a user