nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430)

Browse Source 
* fix: fail migration due to None type

* fix: incorrect key: value pair in filter.

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a)

# Conflicts:
#	erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py
This commit is contained in:
Devin Slauenwhite
2021-09-11 08:22:49 -04:00
committed by Mergify
parent 987a95d2b5
commit 78edd20466
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py
View File

@@ -13,9 +13,13 @@ def execute():
frappe.reload_doc("stock", "doctype", "stock_settings") frappe.reload_doc("stock", "doctype", "stock_settings")
def update_from_return_docs(doctype): def update_from_return_docs(doctype):
<<<<<<< HEAD
for return_doc in frappe.get_all( for return_doc in frappe.get_all(
doctype, filters={"is_return": 1, "docstatus": 1, "return_against": ("!=", "")} doctype, filters={"is_return": 1, "docstatus": 1, "return_against": ("!=", "")}
): ):
=======
for return_doc in frappe.get_all(doctype, filters={'is_return' : 1, 'docstatus' : 1, 'return_against': ('!=', '')}):
>>>>>>> becf471a3a (fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430))
# 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)
try: try: