midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge c353142e9541

This commit is contained in:
Heng Sin Low 2013-03-16 00:18:51 +08:00
parent a1c61ee9a8 dca7c443e2
commit a2fd9d901b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
migration/i1.0a-release/oracle/201303131539_TICKET-1002211.sql
View File

@ -1,3 +1,6 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Mar 13, 2013 2:23:27 PM SGT
-- Ticket #1002211: Create Help pane for Bizidium
INSERT INTO AD_Ref_List (AD_Client_ID,AD_Ref_List_ID,AD_Reference_ID,EntityType,Name,AD_Ref_List_UU,Value,CreatedBy,Created,Updated,UpdatedBy,IsActive,AD_Org_ID) VALUES (0,200135,200064,'D','All','298064ff-6e69-435f-aa0e-d156375339f5','A',100,TO_DATE('2013-03-13 14:23:25','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-03-13 14:23:25','YYYY-MM-DD HH24:MI:SS'),100,'Y',0)
@ -556,4 +559,4 @@ UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-03-13 14:40:37','YYYY-MM-
;
SELECT register_migration_script('201303131539_TICKET-1002211.sql') FROM dual
;
;

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
View File

@ -536,9 +536,9 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
}
// Guarantee Date
Timestamp ts = (Timestamp)guaranteeDateField.getValue();
if (ts != null)
if (guaranteeDateField.getValue() != null)
{
Timestamp ts = new Timestamp(guaranteeDateField.getValue().getTime());
sb.append(" AND TRUNC(asi.GuaranteeDate)");
int index = guaranteeDateSelection.getSelectedIndex(); // < = >
if (index == 0)