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

fix: date_unchanged calculation in "Update Items" (#26992)

Browse Source 
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 d8a7abcd02)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
This commit is contained in:
Türker Tunalı
2021-08-18 15:13:58 +03:00
committed by Mergify
parent 41fe30ea6e
commit 4a61438f9c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/accounts_controller.py
View File

@@ -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 fg_qty_unchanged = prev_fg_qty == new_fg_qty
uom_unchanged = prev_uom == new_uom uom_unchanged = prev_uom == new_uom
conversion_factor_unchanged = prev_con_fac == new_con_fac conversion_factor_unchanged = prev_con_fac == new_con_fac
<<<<<<< HEAD
any_conversion_factor_changed |= not conversion_factor_unchanged any_conversion_factor_changed |= not conversion_factor_unchanged
date_unchanged = ( date_unchanged = (
prev_date == getdate(new_date) if prev_date and new_date else False 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 uom_unchanged
and date_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 continue
validate_quantity(child_item, d) validate_quantity(child_item, d)