From 78edd2046666f29cf5668760884b2b575f798173 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Sat, 11 Sep 2021 08:22:49 -0400 Subject: [PATCH] fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) * fix: fail migration due to None type * fix: incorrect key: value pair in filter. Co-authored-by: Ankush Menat (cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2) # Conflicts: # erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py --- erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py b/erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py index 9b5845f494d..93ef7b7a9c0 100644 --- a/erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py +++ b/erpnext/patches/v13_0/update_returned_qty_in_pr_dn.py @@ -13,9 +13,13 @@ def execute(): frappe.reload_doc("stock", "doctype", "stock_settings") def update_from_return_docs(doctype): +<<<<<<< HEAD for return_doc in frappe.get_all( 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 return_doc = frappe.get_cached_doc(doctype, return_doc.name) try: