IDEMPIERE-4152 : Payment Allocation : notify user when date changes

This commit is contained in:
Nicolas Micoud 2020-01-21 14:10:09 +01:00 committed by Carlos Ruiz
parent ce7121ae85
commit 940d33bc66
3 changed files with 26 additions and 3 deletions

View File

@ -0,0 +1,10 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-4152 - Payment Allocation : notify user when date changes
-- 2020-01-21 02:03:32
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Allocation date updated',0,0,'Y',TO_DATE('2020-01-21 14:03:32','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-01-21 14:03:32','YYYY-MM-DD HH24:MI:SS'),100,200592,'AllocationDateUpdated','D','c5cb7231-9ccc-4219-aaab-46ac3de8a372')
;
SELECT register_migration_script('202001211400_IDEMPIERE-4152.sql') FROM dual
;

View File

@ -0,0 +1,7 @@
-- IDEMPIERE-4152 - Payment Allocation : notify user when date changes
-- 2020-01-21 02:03:32
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Allocation date updated',0,0,'Y',TO_TIMESTAMP('2020-01-21 14:03:32','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-01-21 14:03:32','YYYY-MM-DD HH24:MI:SS'),100,200592,'AllocationDateUpdated','D','c5cb7231-9ccc-4219-aaab-46ac3de8a372')
;
SELECT register_migration_script('202001211400_IDEMPIERE-4152.sql') FROM dual
;

View File

@ -66,6 +66,7 @@ import org.compiere.util.TrxRunnable;
import org.compiere.util.Util;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Div;
@ -703,10 +704,15 @@ public class WAllocation extends Allocation
paymentInfo.setText(calculatePayment(paymentTable, multiCurrency.isSelected()));
invoiceInfo.setText(calculateInvoice(invoiceTable, multiCurrency.isSelected()));
// Set AllocationDate
if (allocDate != null)
dateField.setValue(allocDate);
if (allocDate != null) {
if (! allocDate.equals(dateField.getValue())) {
Clients.showNotification(Msg.getMsg(Env.getCtx(), "AllocationDateUpdated"), Clients.NOTIFICATION_TYPE_INFO, dateField.getComponent(), "start_before", -1, true);
dateField.setValue(allocDate);
}
}
// Set Allocation Currency
allocCurrencyLabel.setText(currencyPick.getDisplay());
// Difference