From 16d2cf6d8a05fa33a96b26a0006c98b64d5a4033 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 2 Jul 2012 13:56:37 -0700 Subject: [PATCH 1/2] IDEMPIERE-323 Migration script log AD_Document_Action_Access --- .../src/org/compiere/dbPort/Convert.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/dbPort/Convert.java b/org.adempiere.base/src/org/compiere/dbPort/Convert.java index 8ac61c2e8e..aa1274c8e5 100644 --- a/org.adempiere.base/src/org/compiere/dbPort/Convert.java +++ b/org.adempiere.base/src/org/compiere/dbPort/Convert.java @@ -478,10 +478,13 @@ public abstract class Convert } private static boolean dontLog(String statement) { + // Do not log *Access records - teo_Sarca BF [ 2782095 ] + // IDEMPIERE-323 Migration script log AD_Document_Action_Access (nmicoud / CarlosRuiz_globalqss) String [] exceptionTables = new String[] { "AD_ACCESSLOG", "AD_ALERTPROCESSORLOG", "AD_CHANGELOG", + "AD_DOCUMENT_ACTION_ACCESS", "AD_ISSUE", "AD_LDAPPROCESSORLOG", "AD_PACKAGE_IMP", @@ -492,10 +495,13 @@ public abstract class Convert "AD_PINSTANCE", "AD_PINSTANCE_LOG", "AD_PINSTANCE_PARA", + "AD_PROCESS_ACCESS", "AD_RECENTITEM", "AD_REPLICATION_LOG", "AD_SCHEDULERLOG", "AD_SESSION", + "AD_WINDOW_ACCESS", + "AD_WORKFLOW_ACCESS", "AD_WORKFLOWPROCESSORLOG", "CM_WEBACCESSLOG", "C_ACCTPROCESSORLOG", @@ -513,13 +519,7 @@ public abstract class Convert "T_SELECTION2", "T_SPOOL", "T_TRANSACTION", - "T_TRIALBALANCE", - // Do not log *Access records - teo_Sarca BF [ 2782095 ] - "AD_PROCESS_ACCESS", - "AD_WINDOW_ACCESS", - "AD_WORKFLOW_ACCESS", - "AD_FORM_ACCESS", - // + "T_TRIALBALANCE" }; String uppStmt = statement.toUpperCase().trim(); // don't log selects From b60cb7394b92b87623a883f92b8f71c93ad3bc74 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 3 Jul 2012 18:22:59 -0700 Subject: [PATCH 2/2] IDEMPIERE-322 Process param YesNo with Display Logic => NPE --- .../src/org/compiere/apps/ProcessParameterPanel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java index c61b110224..4bbfde4afd 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java @@ -458,7 +458,8 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe if (!comp.isVisible()) { changedSize = true; comp.setVisible(true); // visibility - m_labels.get(index).setVisible(true); + if (m_labels.get(index) != null) + m_labels.get(index).setVisible(true); if (m_mFields.get(index).getVO().isRange) m_separators.get(index).setText(" - "); } @@ -470,7 +471,8 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe if (comp.isVisible()) { changedSize = true; comp.setVisible(false); - m_labels.get(index).setVisible(false); + if (m_labels.get(index) != null) + m_labels.get(index).setVisible(false); if (m_mFields.get(index).getVO().isRange) m_separators.get(index).setText(""); }