From 4b445e3107069fd929d43fe7f54278245d3abbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Tak=C3=A1cs?= <93127072+PeterTakacs300@users.noreply.github.com> Date: Wed, 7 Jun 2023 00:39:07 +0200 Subject: [PATCH] IDEMPIERE-5753 - Date Picker doesn't set time on first date in Quick Mode (#1873) --- .../org/adempiere/webui/window/DateRangePicker.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java index 4148102fab..8ce7f1bf01 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java @@ -474,13 +474,13 @@ public class DateRangePicker extends Popup implements EventListener, Valu if(selectedQuickListItem != null) { String unit = (String) selectedQuickListItem.getAttribute("TimeUnit"); int offset = (int) selectedQuickListItem.getAttribute("Offset"); - Date dateFrom = (Date) selectedQuickListItem.getAttribute("DateFrom"); - dates = getInterval(unit, unit, offset, false, false, dateFrom); + Date dateFromAttr = (Date) selectedQuickListItem.getAttribute("DateFrom"); + dates = getInterval(unit, unit, offset, false, false, dateFromAttr); this.dateFrom = new Timestamp(dates[0].getTime()); this.dateTo = new Timestamp(dates[1].getTime()); - dates = setTimesOnDates(dateFrom, dateTo); - dateFrom = dates[0]; - dateTo = dates[1]; + dates = setTimesOnDates(this.dateFrom, this.dateTo); + this.dateFrom = dates[0]; + this.dateTo = dates[1]; returnVal = DisplayType.getDateFormat().format(this.dateFrom) + " - " + DisplayType.getDateFormat().format(this.dateTo); } break;