From 4a61438f9c5f66b94330cf19a61aca7128d6826c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrker=20Tunal=C4=B1?= Date: Wed, 18 Aug 2021 15:13:58 +0300 Subject: [PATCH] fix: date_unchanged calculation in "Update Items" (#26992) Branch corrected https://github.com/frappe/erpnext/pull/26058 ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items". "date_unchanged" variable gets false value because of new_date is string. "getdate(new_date)" corrects the date comparison. ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif) (cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140) # Conflicts: # erpnext/controllers/accounts_controller.py --- erpnext/controllers/accounts_controller.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index d53a67eff70..9386e1b1293 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -3620,6 +3620,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil fg_qty_unchanged = prev_fg_qty == new_fg_qty uom_unchanged = prev_uom == new_uom conversion_factor_unchanged = prev_con_fac == new_con_fac +<<<<<<< HEAD any_conversion_factor_changed |= not conversion_factor_unchanged date_unchanged = ( prev_date == getdate(new_date) if prev_date and new_date else False @@ -3632,6 +3633,10 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil and uom_unchanged and date_unchanged ): +======= + date_unchanged = prev_date == getdate(new_date) if prev_date and new_date else False # in case of delivery note etc + if rate_unchanged and qty_unchanged and conversion_factor_unchanged and uom_unchanged and date_unchanged: +>>>>>>> d8a7abcd02 (fix: date_unchanged calculation in "Update Items" (#26992)) continue validate_quantity(child_item, d)