From 19246fe68a123927198d59fabecf2ed1766fc625 Mon Sep 17 00:00:00 2001 From: hieplq Date: Wed, 4 Feb 2015 23:36:02 +0700 Subject: [PATCH 1/8] IDEMPIERE-2440:lengh of org name in session active is wrong --- .../i2.1/oracle/201502031604_IDEMPIERE-2440.sql | 14 ++++++++++++++ .../postgresql/201502031604_IDEMPIERE-2440.sql | 11 +++++++++++ 2 files changed, 25 insertions(+) create mode 100644 migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql create mode 100644 migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql diff --git a/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql b/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql new file mode 100644 index 0000000000..50ef716c37 --- /dev/null +++ b/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql @@ -0,0 +1,14 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Feb 3, 2015 1:45:55 PM ICT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2015-02-03 13:45:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200706 +; + +-- Feb 3, 2015 2:02:04 PM ICT +UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2015-02-03 14:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200599 +; + +-- Feb 3, 2015 2:02:04 PM ICT +UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2015-02-03 14:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200705 diff --git a/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql b/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql new file mode 100644 index 0000000000..45e2d13e9f --- /dev/null +++ b/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql @@ -0,0 +1,11 @@ +-- Feb 3, 2015 1:45:55 PM ICT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2015-02-03 13:45:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200706 +; + +-- Feb 3, 2015 2:02:04 PM ICT +UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2015-02-03 14:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200599 +; + +-- Feb 3, 2015 2:02:04 PM ICT +UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2015-02-03 14:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200705 From 45a716dd960cfbe8849f094c380e79bbd166585a Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 5 Feb 2015 13:38:47 +0700 Subject: [PATCH 2/8] IDEMPIERE-2446:PopupMenu to move tree node disappear very fast --- .../adempiere/webui/adwindow/AbstractADWindowContent.java | 2 +- .../adempiere/webui/component/ADTreeOnDropListener.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index 1c29c454a3..e8aba39a00 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -866,7 +866,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements public void onCallback(Boolean result) { if (result) { adTabbox.getSelectedGridTab().navigate(rowIndex); - focusToActivePanel(); + //focusToActivePanel(); } } }; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java index 665b3a3ddb..0afecfa669 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java @@ -102,8 +102,8 @@ public class ADTreeOnDropListener implements EventListener { int path[] = treeModel.getPath(toNode); Treeitem toItem = tree.renderItemByPath(path); - tree.setSelectedItem(toItem); - Events.sendEvent(tree, new Event(Events.ON_SELECT, tree)); + //tree.setSelectedItem(toItem); + //Events.sendEvent(tree, new Event(Events.ON_SELECT, tree)); MenuListener listener = new MenuListener(movingNode, toNode); @@ -154,8 +154,8 @@ public class ADTreeOnDropListener implements EventListener { tree.onInitRender(); } Treeitem movingItem = tree.renderItemByPath(path); - tree.setSelectedItem(movingItem); - Events.sendEvent(tree, new Event(Events.ON_SELECT, tree)); + //tree.setSelectedItem(movingItem); + //Events.sendEvent(tree, new Event(Events.ON_SELECT, tree)); // *** Save changes to disk Trx trx = Trx.get (Trx.createTrxName("ADTree"), true); From c0dad6aa82d921247eca9a15df160993929337b6 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 7 Feb 2015 22:32:00 -0500 Subject: [PATCH 3/8] IDEMPIERE-393 Setup wizards / translation issue --- .../src/org/adempiere/webui/apps/form/WSetupWizard.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java index f0153de01e..f8ac50774c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java @@ -373,15 +373,15 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL bZoom.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "Zoom")); bZoom.addEventListener(Events.ON_CLICK, this); - bExpand.setLabel("Expand Tree"); + bExpand.setLabel(Msg.getCleanMsg(Env.getCtx(), "ExpandTree")); bExpand.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "ExpandTree")); bExpand.addEventListener(Events.ON_CLICK, this); - justmine.setLabel("Just Mine"); + justmine.setLabel(Msg.getCleanMsg(Env.getCtx(), "JustMine")); justmine.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "JustMine")); justmine.addEventListener(Events.ON_CHECK,this); - showColors.setLabel("Show Colors"); + showColors.setLabel(Msg.getCleanMsg(Env.getCtx(), "ShowColors")); showColors.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "ShowColors")); showColors.addEventListener(Events.ON_CHECK,this); From ee48288fdadcbb469a7b607f3cc31f353faab3c8 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 18 Feb 2015 10:09:58 -0500 Subject: [PATCH 4/8] IDEMPIERE-2452 Country list doesn't support multiple translations --- .../src/org/compiere/model/MCountry.java | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MCountry.java b/org.adempiere.base/src/org/compiere/model/MCountry.java index 3fad08c014..c2516d1b02 100644 --- a/org.adempiere.base/src/org/compiere/model/MCountry.java +++ b/org.adempiere.base/src/org/compiere/model/MCountry.java @@ -47,7 +47,7 @@ public class MCountry extends X_C_Country /** * */ - private static final long serialVersionUID = -4015127112992493778L; + private static final long serialVersionUID = -4966707939803861163L; /** * Get Country (cached) @@ -163,17 +163,6 @@ public class MCountry extends X_C_Country + " - Default=" + s_default); } - /** - * Return Language - * @return Name - */ - private String getEnvLanguage() { - String lang = Env.getAD_Language(Env.getCtx()); - if (Language.isBaseLanguage(lang)) - return null; - return lang; - } - /** * Set the Language for Display (toString) * @param AD_Language language or null @@ -232,22 +221,13 @@ public class MCountry extends X_C_Country super(ctx, rs, trxName); } // MCountry - /** Translated Name */ - private String m_trlName = null; - /** * Return Name - translated if DisplayLanguage is set. * @return Name */ public String toString() { - if (getEnvLanguage() != null) - { - String nn = getTrlName(); - if (nn != null) - return nn; - } - return getName(); + return getTrlName(); } // toString /** @@ -256,13 +236,7 @@ public class MCountry extends X_C_Country */ public String getTrlName() { - if (m_trlName == null && getEnvLanguage() != null) - { - m_trlName = get_Translation(COLUMNNAME_Name, getEnvLanguage()); - if (m_trlName == null) - m_trlName = getName(); - } - return m_trlName; + return getTrlName(Env.getAD_Language(Env.getCtx())); } // getTrlName /** @@ -272,11 +246,7 @@ public class MCountry extends X_C_Country */ public String getTrlName(String language) { - if ( language != null) - { - m_trlName = get_Translation(COLUMNNAME_Name, language); - } - return m_trlName; + return get_Translation(COLUMNNAME_Name, language); } // getTrlName From 300d2babc67442a9d32ed007e1acfda316a8a645 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 18 Feb 2015 12:02:00 -0500 Subject: [PATCH 5/8] IDEMPIERE-2475 Some lists not ordered in translated languages --- .../oracle/201502181200_IDEMPIERE-2475.sql | 43 +++++++++++++++++++ .../201502181200_IDEMPIERE-2475.sql | 40 +++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 migration/i2.1/oracle/201502181200_IDEMPIERE-2475.sql create mode 100644 migration/i2.1/postgresql/201502181200_IDEMPIERE-2475.sql diff --git a/migration/i2.1/oracle/201502181200_IDEMPIERE-2475.sql b/migration/i2.1/oracle/201502181200_IDEMPIERE-2475.sql new file mode 100644 index 0000000000..00cd7126ba --- /dev/null +++ b/migration/i2.1/oracle/201502181200_IDEMPIERE-2475.sql @@ -0,0 +1,43 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-2475 Some lists not ordered in translated languages +-- 18/02/2015 11:55:02 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:55:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=284 +; + +-- 18/02/2015 11:55:16 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:55:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=251 +; + +-- 18/02/2015 11:55:33 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:55:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=102 +; + +-- 18/02/2015 11:55:49 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:55:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=156 +; + +-- 18/02/2015 11:56:01 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:56:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=257 +; + +-- 18/02/2015 11:56:15 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:56:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=258 +; + +-- 18/02/2015 11:56:29 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:56:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=1 +; + +-- 18/02/2015 11:56:41 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:56:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=269 +; + +-- 18/02/2015 11:56:56 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_DATE('2015-02-18 11:56:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=163 +; + +SELECT register_migration_script('201502181200_IDEMPIERE-2475.sql') FROM dual +; + diff --git a/migration/i2.1/postgresql/201502181200_IDEMPIERE-2475.sql b/migration/i2.1/postgresql/201502181200_IDEMPIERE-2475.sql new file mode 100644 index 0000000000..a93e3a7577 --- /dev/null +++ b/migration/i2.1/postgresql/201502181200_IDEMPIERE-2475.sql @@ -0,0 +1,40 @@ +-- IDEMPIERE-2475 Some lists not ordered in translated languages +-- 18/02/2015 11:55:02 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:55:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=284 +; + +-- 18/02/2015 11:55:16 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:55:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=251 +; + +-- 18/02/2015 11:55:33 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:55:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=102 +; + +-- 18/02/2015 11:55:49 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:55:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=156 +; + +-- 18/02/2015 11:56:01 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:56:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=257 +; + +-- 18/02/2015 11:56:15 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:56:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=258 +; + +-- 18/02/2015 11:56:29 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:56:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=1 +; + +-- 18/02/2015 11:56:41 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:56:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=269 +; + +-- 18/02/2015 11:56:56 AM COT +UPDATE AD_Ref_Table SET OrderByClause=NULL,Updated=TO_TIMESTAMP('2015-02-18 11:56:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Reference_ID=163 +; + +SELECT register_migration_script('201502181200_IDEMPIERE-2475.sql') FROM dual +; + From 34a1e631f4aa31791ef8133bb0c690f530156eff Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 18 Feb 2015 12:13:13 -0500 Subject: [PATCH 6/8] IDEMPIERE-2451 Region list is not correctly sorted on location panel --- org.adempiere.base/src/org/compiere/model/MCity.java | 4 +++- org.adempiere.base/src/org/compiere/model/MCountry.java | 4 +++- org.adempiere.base/src/org/compiere/model/MRegion.java | 4 +++- org.adempiere.base/src/org/compiere/model/PO.java | 6 ++++-- org.adempiere.base/src/org/compiere/util/NamePair.java | 4 +++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MCity.java b/org.adempiere.base/src/org/compiere/model/MCity.java index abcc27ee4b..ada89eebbc 100644 --- a/org.adempiere.base/src/org/compiere/model/MCity.java +++ b/org.adempiere.base/src/org/compiere/model/MCity.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.io.Serializable; import java.sql.ResultSet; +import java.text.Collator; import java.util.Comparator; import java.util.Properties; @@ -127,7 +128,8 @@ public class MCity extends X_C_City String s2 = o2.toString(); if (s2 == null) s2 = ""; - return s1.compareTo(s2); + Collator collator = Collator.getInstance(); + return collator.compare(s1, s2); } // compare } // MCity diff --git a/org.adempiere.base/src/org/compiere/model/MCountry.java b/org.adempiere.base/src/org/compiere/model/MCountry.java index c2516d1b02..5ed796dc90 100644 --- a/org.adempiere.base/src/org/compiere/model/MCountry.java +++ b/org.adempiere.base/src/org/compiere/model/MCountry.java @@ -20,6 +20,7 @@ import static org.compiere.model.SystemIDs.COUNTRY_US; import java.io.Serializable; import java.sql.ResultSet; +import java.text.Collator; import java.util.Arrays; import java.util.Comparator; import java.util.List; @@ -289,7 +290,8 @@ public class MCountry extends X_C_Country String s2 = o2.toString(); if (s2 == null) s2 = ""; - return s1.compareTo(s2); + Collator collator = Collator.getInstance(); + return collator.compare(s1, s2); } // compare /** diff --git a/org.adempiere.base/src/org/compiere/model/MRegion.java b/org.adempiere.base/src/org/compiere/model/MRegion.java index 71612c8471..903608acb3 100644 --- a/org.adempiere.base/src/org/compiere/model/MRegion.java +++ b/org.adempiere.base/src/org/compiere/model/MRegion.java @@ -20,6 +20,7 @@ import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; @@ -227,7 +228,8 @@ public class MRegion extends X_C_Region String s2 = o2.toString(); if (s2 == null) s2 = ""; - return s1.compareTo(s2); + Collator collator = Collator.getInstance(); + return collator.compare(s1, s2); } // compare /** diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java index 50c8af2a14..93e76913d2 100644 --- a/org.adempiere.base/src/org/compiere/model/PO.java +++ b/org.adempiere.base/src/org/compiere/model/PO.java @@ -28,6 +28,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Savepoint; import java.sql.Timestamp; +import java.text.Collator; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -344,6 +345,7 @@ public abstract class PO if (!(o2 instanceof PO)) throw new ClassCastException ("Not PO -2- " + o2); // same class + Collator collator = Collator.getInstance(); if (o1.getClass().equals(o2.getClass())) { int index = get_ColumnIndex("DocumentNo"); @@ -363,10 +365,10 @@ public abstract class PO return -1; else if (comp2 == null) return 1; - return comp1.toString().compareTo(comp2.toString()); + return collator.compare(comp1.toString(), comp2.toString()); } } - return o1.toString().compareTo(o2.toString()); + return collator.compare(o1.toString(), o2.toString()); } // compare /** diff --git a/org.adempiere.base/src/org/compiere/util/NamePair.java b/org.adempiere.base/src/org/compiere/util/NamePair.java index 2e8aa1be86..72bef355b3 100644 --- a/org.adempiere.base/src/org/compiere/util/NamePair.java +++ b/org.adempiere.base/src/org/compiere/util/NamePair.java @@ -17,6 +17,7 @@ package org.compiere.util; import java.io.Serializable; +import java.text.Collator; import java.util.Comparator; /** @@ -84,7 +85,8 @@ public abstract class NamePair implements Comparator, Serializable, Comp { String s1 = o1 == null ? "" : o1.toString(); String s2 = o2 == null ? "" : o2.toString(); - return s1.compareTo (s2); // sort order ?? + Collator collator = Collator.getInstance(); + return collator.compare(s1, s2); } // compare /** From 32d63d54b4c2ae8388368a992ab5a5b45c0f513d Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Thu, 12 Feb 2015 14:53:13 +0530 Subject: [PATCH 7/8] IDEMPIERE-2466 Creating new record on detail tab move focus on parent tab --- .../WEB-INF/src/org/adempiere/webui/adwindow/GridView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java index 54bae2690f..34f0c871f4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java @@ -828,7 +828,11 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi ADWindow adwindow = ADWindow.findADWindow(adtabpanel); if (adwindow != null) { IADTabpanel selectedADTabpanel = adwindow.getADWindowContent().getADTab().getSelectedTabpanel(); - if (selectedADTabpanel != adtabpanel) + IADTabpanel selectedADDetailTabpanel = null ; + if(selectedADTabpanel.getDetailPane() != null) + selectedADDetailTabpanel = selectedADTabpanel.getDetailPane().getSelectedADTabpanel(); + + if (selectedADTabpanel != adtabpanel && selectedADDetailTabpanel != null && selectedADDetailTabpanel != adtabpanel) setFocus = false; } } From 6386646199b88c5227c0dc14164d323dc8ab80de Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 20 Feb 2015 18:28:42 -0500 Subject: [PATCH 8/8] IDEMPIERE-2440 - fix problem reported by Adam Tang at https://groups.google.com/d/msg/idempiere/WVjWIqZ4U94/KR81iPrsndIJ --- migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql | 7 ++++++- migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql b/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql index 50ef716c37..b7c857df7c 100644 --- a/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql +++ b/migration/i2.1/oracle/201502031604_IDEMPIERE-2440.sql @@ -2,7 +2,7 @@ SET SQLBLANKLINES ON SET DEFINE OFF -- Feb 3, 2015 1:45:55 PM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-2440 lengh of org name in session active is wrong UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2015-02-03 13:45:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200706 ; @@ -12,3 +12,8 @@ UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2015-02-03 14:02:04','YYYY- -- Feb 3, 2015 2:02:04 PM ICT UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2015-02-03 14:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200705 +; + +SELECT register_migration_script('201502031604_IDEMPIERE-2440.sql') FROM dual +; + diff --git a/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql b/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql index 45e2d13e9f..77ade761c4 100644 --- a/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql +++ b/migration/i2.1/postgresql/201502031604_IDEMPIERE-2440.sql @@ -1,5 +1,5 @@ -- Feb 3, 2015 1:45:55 PM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-2440 lengh of org name in session active is wrong UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2015-02-03 13:45:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200706 ; @@ -9,3 +9,8 @@ UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2015-02-03 14:02:04',' -- Feb 3, 2015 2:02:04 PM ICT UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2015-02-03 14:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200705 +; + +SELECT register_migration_script('201502031604_IDEMPIERE-2440.sql') FROM dual +; +