From 799788d366ec3a680d987e5d138f89bdd6bb0f61 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 5 Jul 2013 18:03:16 -0500 Subject: [PATCH 01/21] IDEMPIERE-1119 Improve error message when Model Validator is not found --- .../src/org/compiere/model/ModelValidationEngine.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java b/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java index 68fc8cdf45..e5986554e7 100644 --- a/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java +++ b/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java @@ -41,6 +41,7 @@ import org.compiere.acct.Fact; import org.compiere.util.CLogger; import org.compiere.util.Env; import org.compiere.util.KeyNamePair; +import org.compiere.util.Util; import org.osgi.service.event.Event; /** @@ -79,7 +80,7 @@ public class ModelValidationEngine /** Engine Singleton */ private static ModelValidationEngine s_engine = null; /* flag to indicate a missing model validation class */ - private static String missingModelValidationMessage = null; + private static String missingModelValidationMessage = ""; /************************************************************************** @@ -159,7 +160,7 @@ public class ModelValidationEngine if (validator == null) { - missingModelValidationMessage = missingModelValidationMessage + + missingModelValidationMessage = missingModelValidationMessage + " Missing class " + className + (client != null ? (" on client " + client.getName()) : " global") + '\n'; } else @@ -273,7 +274,7 @@ public class ModelValidationEngine if (AD_User_ID == 0 && AD_Role_ID == 0) ; // don't validate for user system on role system else - if (missingModelValidationMessage != null) { + if (! Util.isEmpty(missingModelValidationMessage)) { MSystem system = MSystem.get(Env.getCtx()); if (system.isFailOnMissingModelValidator()) return missingModelValidationMessage; From 45bda82abca970034b14c19caa8486edd1e722a1 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 6 Jul 2013 17:17:48 -0500 Subject: [PATCH 02/21] IDEMPIERE-1153 org.adempiere.pipo2.AbstractElementHandler.isProcessElement always returns false for enity types D and C / thanks to Anthony Sossah (xolali) --- .../src/org/adempiere/pipo2/AbstractElementHandler.java | 2 +- .../src/org/adempiere/pipo2/PackInHandler.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java index 11862d0340..30c7bab2ca 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java @@ -368,7 +368,7 @@ public abstract class AbstractElementHandler implements ElementHandler { */ protected boolean isProcessElement(Properties ctx, String entityType) { if ("D".equals(entityType) || "C".equals(entityType)) { - return "true".equalsIgnoreCase(getUpdateMode(ctx)); + return "Y".equalsIgnoreCase(getUpdateMode(ctx)); } else { return true; } diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java index 1010ac81c9..500f64a986 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java @@ -191,9 +191,9 @@ public class PackInHandler extends DefaultHandler { packageInst.saveEx(); } - m_ctx.ctx.put("AD_Package_Imp_ID", String.valueOf(AD_Package_Imp_ID)); - m_ctx.ctx.put("UpdateMode", m_updateDictionary); - m_ctx.ctx.put("PackageDirectory", packageDirectory); + Env.setContext(m_ctx.ctx, "AD_Package_Imp_ID", String.valueOf(AD_Package_Imp_ID)); + Env.setContext(m_ctx.ctx, "UpdateMode", m_updateDictionary); + Env.setContext(m_ctx.ctx, "PackageDirectory", packageDirectory); m_ctx.packIn = packIn; } else { Element e = new Element(uri, localName, qName, new AttributesImpl(atts)); From 68223ee9afafa2793b9ccc0bdf142f69d7070969 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Sat, 6 Jul 2013 17:44:39 -0500 Subject: [PATCH 03/21] IDEMPIERE-1127 The Name of the workflow node is not translated --- .../src/org/adempiere/webui/apps/wf/WFEditor.java | 15 +++++++++++---- .../src/org/compiere/apps/wf/WFNodeWidget.java | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java index 42bb4c74a4..1c69d95402 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java @@ -92,11 +92,18 @@ public class WFEditor extends ADForm { Borderlayout layout = new Borderlayout(); layout.setStyle("width: 100%; height: 100%; position: absolute;"); appendChild(layout); - - String sql = MRole.getDefault().addAccessSQL( - "SELECT AD_Workflow_ID, Name FROM AD_Workflow ORDER BY 2", + String sql=""; + boolean isBaseLanguage = Env.isBaseLanguage(Env.getCtx(), "AD_Workflow"); + if (isBaseLanguage) + sql = MRole.getDefault().addAccessSQL( + "SELECT AD_Workflow_ID, Name FROM AD_Workflow WHERE IsActive = 'Y' ORDER BY 2", "AD_Workflow", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); // all - KeyNamePair[] pp = DB.getKeyNamePairs(sql, true); + else + sql = MRole.getDefault().addAccessSQL( + "SELECT AD_Workflow.AD_Workflow_ID, AD_Workflow_Trl.Name FROM AD_Workflow INNER JOIN AD_Workflow_Trl ON (AD_Workflow.AD_Workflow_ID=AD_Workflow_Trl.AD_Workflow_ID) " + + " WHERE AD_Workflow.IsActive = 'Y' AND AD_Workflow_Trl.AD_Language='"+Env.getAD_Language(Env.getCtx())+"' ORDER BY 2","AD_Workflow", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); // all + + KeyNamePair[] pp = DB.getKeyNamePairs(sql, true); workflowList = ListboxFactory.newDropdownListbox(); for (KeyNamePair knp : pp) { diff --git a/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java b/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java index 63e636aa7f..d40b2f9faa 100644 --- a/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java +++ b/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java @@ -76,7 +76,7 @@ public class WFNodeWidget extends Widget { } if (image != null) { imageWidget = new ImageWidget(scene, image); - imageWidget.setToolTipText(node.getName()); + imageWidget.setToolTipText(node.getName(true)); addChild(imageWidget); } } @@ -97,7 +97,7 @@ public class WFNodeWidget extends Widget { titleWidget.addChild (titleIcon); } - String titleText = node.getName(); + String titleText = node.getName(true); if (titleText.length() > 20) titleText = titleText.substring(0, 20) + "..."; LabelWidget titleTextWidget = new LabelWidget (scene, titleText); From e7abe42baaf9e0fb506f76f74302e3425ba7a387 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 6 Jul 2013 17:45:22 -0500 Subject: [PATCH 04/21] IDEMPIERE-1127 The Name of the workflow node is not translated / peer review --- .../src/org/adempiere/webui/apps/wf/WFEditor.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java index 1c69d95402..2e768f1e36 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java @@ -92,17 +92,16 @@ public class WFEditor extends ADForm { Borderlayout layout = new Borderlayout(); layout.setStyle("width: 100%; height: 100%; position: absolute;"); appendChild(layout); - String sql=""; + String sql; boolean isBaseLanguage = Env.isBaseLanguage(Env.getCtx(), "AD_Workflow"); - if (isBaseLanguage) + if (isBaseLanguage) sql = MRole.getDefault().addAccessSQL( - "SELECT AD_Workflow_ID, Name FROM AD_Workflow WHERE IsActive = 'Y' ORDER BY 2", + "SELECT AD_Workflow_ID, Name FROM AD_Workflow WHERE IsActive='Y' ORDER BY 2", "AD_Workflow", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); // all else sql = MRole.getDefault().addAccessSQL( "SELECT AD_Workflow.AD_Workflow_ID, AD_Workflow_Trl.Name FROM AD_Workflow INNER JOIN AD_Workflow_Trl ON (AD_Workflow.AD_Workflow_ID=AD_Workflow_Trl.AD_Workflow_ID) " - + " WHERE AD_Workflow.IsActive = 'Y' AND AD_Workflow_Trl.AD_Language='"+Env.getAD_Language(Env.getCtx())+"' ORDER BY 2","AD_Workflow", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); // all - + + " WHERE AD_Workflow.IsActive='Y' AND AD_Workflow_Trl.AD_Language='"+Env.getAD_Language(Env.getCtx())+"' ORDER BY 2","AD_Workflow", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); // all KeyNamePair[] pp = DB.getKeyNamePairs(sql, true); workflowList = ListboxFactory.newDropdownListbox(); @@ -385,7 +384,7 @@ public class WFEditor extends ADForm { addMenuItem(popupMenu, Msg.getMsg(Env.getCtx(), "Properties"), node, WFPopupItem.WFPOPUPITEM_PROPERTIES); // Delete node String title = Msg.getMsg(Env.getCtx(), "DeleteNode") + - ": " + node.getName(); + ": " + node.getName(true); addMenuItem(popupMenu, title, node, WFPopupItem.WFPOPUPITEM_DELETENODE); } MWFNode[] nodes = m_wf.getNodes(true, Env.getAD_Client_ID(Env.getCtx())); @@ -419,7 +418,7 @@ public class WFEditor extends ADForm { if (!found) { String title = Msg.getMsg(Env.getCtx(), "AddLine") - + ": " + node.getName() + " -> " + nn.getName(); + + ": " + node.getName(true) + " -> " + nn.getName(true); addMenuItem(popupMenu, title, node, nn.getAD_WF_Node_ID()); } } @@ -430,7 +429,7 @@ public class WFEditor extends ADForm { continue; MWFNode next = MWFNode.get(Env.getCtx(), line.getAD_WF_Next_ID()); String title = Msg.getMsg(Env.getCtx(), "DeleteLine") - + ": " + node.getName() + " -> " + next.getName(); + + ": " + node.getName(true) + " -> " + next.getName(true); addMenuItem(popupMenu, title, line); } popupMenu.setPage(target.getPage()); From edf28d5a4a0f33b94d88f5fee23ea9e801f691c3 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Sat, 6 Jul 2013 17:49:04 -0500 Subject: [PATCH 05/21] IDEMPIERE-362 Hide things that don't work on iDempiere / Inactivate Setup Human Resource & Payroll workflow --- .../oracle/20130407174015_IDEMPIERE-632.sql | 7 +++++++ .../postgresql/20130407174015_IDEMPIERE-632.sql | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql create mode 100644 migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql diff --git a/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql b/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql new file mode 100644 index 0000000000..f33e5b3422 --- /dev/null +++ b/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql @@ -0,0 +1,7 @@ +-- Jul 4, 2013 5:39:38 PM COT +UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_DATE('2013-07-04 17:39:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50014 +; + +SELECT register_migration_script('20130407174015_IDEMPIERE-632.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql b/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql new file mode 100644 index 0000000000..c355f6d966 --- /dev/null +++ b/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql @@ -0,0 +1,9 @@ +-- Jul 4, 2013 5:39:38 PM COT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_TIMESTAMP('2013-07-04 17:39:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50014 +; + +SELECT register_migration_script('20130407174015_IDEMPIERE-632.sql') FROM dual +; + + From 0e2c5ffabdb93f7437a4cd97169fdade25ac48b6 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 6 Jul 2013 17:59:33 -0500 Subject: [PATCH 06/21] IDEMPIERE-362 Hide things that don't work on iDempiere / Inactivate other deprecated workflows - to avoid errors on Workflow Editor --- .../oracle/20130407174015_IDEMPIERE-632.sql | 57 ++++++++++++++++++ .../20130407174015_IDEMPIERE-632.sql | 58 ++++++++++++++++++- 2 files changed, 114 insertions(+), 1 deletion(-) diff --git a/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql b/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql index f33e5b3422..eecbd2079a 100644 --- a/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql +++ b/migration/i1.0c-release/oracle/20130407174015_IDEMPIERE-632.sql @@ -1,7 +1,64 @@ -- Jul 4, 2013 5:39:38 PM COT +-- Hide workflows deprecated UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_DATE('2013-07-04 17:39:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50014 ; +-- Jul 6, 2013 5:50:57 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:50:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=119 +; + +-- Jul 6, 2013 5:51:01 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:51:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50009 +; + +-- Jul 6, 2013 5:51:11 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:51:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50011 +; + +-- Jul 6, 2013 5:51:31 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:51:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50008 +; + +-- Jul 6, 2013 5:51:39 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:51:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50013 +; + +-- Jul 6, 2013 5:52:09 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:52:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50002 +; + +-- Jul 6, 2013 5:52:16 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:52:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50005 +; + +-- Jul 6, 2013 5:52:28 PM COT +UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_DATE('2013-07-06 17:52:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50007 +; + +-- Jul 6, 2013 5:52:36 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:52:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50010 +; + +-- Jul 6, 2013 5:52:41 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:52:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50006 +; + +-- Jul 6, 2013 5:53:07 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:53:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50000 +; + +-- Jul 6, 2013 5:53:11 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:53:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50001 +; + +-- Jul 6, 2013 5:53:14 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_DATE('2013-07-06 17:53:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50004 +; + +-- Jul 6, 2013 5:53:27 PM COT +UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_DATE('2013-07-06 17:53:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50003 +; + SELECT register_migration_script('20130407174015_IDEMPIERE-632.sql') FROM dual ; diff --git a/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql b/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql index c355f6d966..a9138c9c63 100644 --- a/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql +++ b/migration/i1.0c-release/postgresql/20130407174015_IDEMPIERE-632.sql @@ -1,8 +1,64 @@ -- Jul 4, 2013 5:39:38 PM COT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- Hide workflows deprecated UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_TIMESTAMP('2013-07-04 17:39:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50014 ; +-- Jul 6, 2013 5:50:57 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:50:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=119 +; + +-- Jul 6, 2013 5:51:01 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:51:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50009 +; + +-- Jul 6, 2013 5:51:11 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:51:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50011 +; + +-- Jul 6, 2013 5:51:31 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:51:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50008 +; + +-- Jul 6, 2013 5:51:39 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:51:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50013 +; + +-- Jul 6, 2013 5:52:09 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:52:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50002 +; + +-- Jul 6, 2013 5:52:16 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:52:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50005 +; + +-- Jul 6, 2013 5:52:28 PM COT +UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:52:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50007 +; + +-- Jul 6, 2013 5:52:36 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:52:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50010 +; + +-- Jul 6, 2013 5:52:41 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:52:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50006 +; + +-- Jul 6, 2013 5:53:07 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:53:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50000 +; + +-- Jul 6, 2013 5:53:11 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:53:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50001 +; + +-- Jul 6, 2013 5:53:14 PM COT +UPDATE AD_Workflow SET IsValid='Y', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:53:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50004 +; + +-- Jul 6, 2013 5:53:27 PM COT +UPDATE AD_Workflow SET IsValid='N', IsActive='N',Updated=TO_TIMESTAMP('2013-07-06 17:53:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50003 +; + SELECT register_migration_script('20130407174015_IDEMPIERE-632.sql') FROM dual ; From b45cd7b740406a702156984e706a5da5cf877d12 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Sat, 6 Jul 2013 18:15:44 -0500 Subject: [PATCH 07/21] IDEMPIERE-1116 When attachment is deleted the preview and size are not cleared + NPE --- .../src/org/adempiere/webui/panel/WAttachment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java index 2a20ebc134..efb05fd4de 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java @@ -389,6 +389,7 @@ public class WAttachment extends Window implements EventListener { bSave.setEnabled(false); bDelete.setEnabled(false); + sizeLabel.setText(""); return false; } } @@ -453,7 +454,7 @@ public class WAttachment extends Window implements EventListener { String fileName = null; - if (cbContent.getItemCount() > index) + if (index>=0 && cbContent.getItemCount() > index) { ListItem listitem = cbContent.getItemAtIndex(index); fileName = (String)listitem.getValue(); @@ -663,8 +664,11 @@ public class WAttachment extends Window implements EventListener { if (result) { - if (m_attachment.deleteEntry(index)) + if (m_attachment.deleteEntry(index)){ cbContent.removeItemAt(index); + clearPreview(); + autoPreview(index-1, true); + } m_change = true; } From 189ef8425df203ce972c004a71640214ebc1e327 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 6 Jul 2013 18:16:33 -0500 Subject: [PATCH 08/21] IDEMPIERE-1116 When attachment is deleted the preview and size are not cleared + NPE / peer review --- .../WEB-INF/src/org/adempiere/webui/panel/WAttachment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java index efb05fd4de..aaa992178e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java @@ -664,11 +664,11 @@ public class WAttachment extends Window implements EventListener { if (result) { - if (m_attachment.deleteEntry(index)){ + if (m_attachment.deleteEntry(index)) { cbContent.removeItemAt(index); clearPreview(); - autoPreview(index-1, true); - } + autoPreview (cbContent.getSelectedIndex(), true); + } m_change = true; } From d4f2d337ccd567a9bd5df67d206c94ae2c1ab703 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 9 Jul 2013 00:06:53 +0800 Subject: [PATCH 09/21] IDEMPIERE-1044 Load testing. Modify to generate uuid sequence by idspace instead of by desktop to reduce the possibilities of uuid change on subsequent run. --- .../src/org/adempiere/webui/AdempiereIdGenerator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java index 282a55aa4b..7f8b91f0a7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java @@ -88,13 +88,14 @@ public class AdempiereIdGenerator implements IdGenerator { } String number; - if ((number = (String)desktop.getAttribute("Id_Num")) == null) { + IdSpace idspace = comp.getSpaceOwner(); + if ((number = (String)idspace.getAttribute("uid.sequence")) == null) { number = "0"; - desktop.setAttribute("Id_Num", number); + idspace.setAttribute("uid.sequence", number); } int i = Integer.parseInt(number); i++;// Start from 1 - desktop.setAttribute("Id_Num", String.valueOf(i)); + idspace.setAttribute("uid.sequence", String.valueOf(i)); return uuid + "_" + i; } From ba2d798449636472cad950d78a656f7719326e47 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 9 Jul 2013 22:08:59 +0800 Subject: [PATCH 10/21] IDEMPIERE-1156 PackIn of New EntityType fails. Fixed NPE. --- .../src/org/adempiere/pipo2/AbstractElementHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java index 30c7bab2ca..d652b6d0bc 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java @@ -578,7 +578,10 @@ public abstract class AbstractElementHandler implements ElementHandler { protected boolean hasUUIDKey(PIPOContext ctx, Element element) { String tableName = element.getElementValue(); String uuidColumn = PO.getUUIDColumnName(tableName); - String uuid = element.properties.get(uuidColumn).contents.toString(); + String uuid = null; + if (element.properties.containsKey(uuidColumn)) { + uuid = element.properties.get(uuidColumn).contents.toString(); + } return (uuid != null && uuid.trim().length() == 36); } From c20b7751768b5f3a6fff14f09c8e11d9fa0676be Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 10 Jul 2013 19:05:52 -0500 Subject: [PATCH 11/21] IDEMPIERE-851 fitnesse improvements / Update Record is not resolving variables before setting --- .../src/org/idempiere/fitnesse/fixture/UpdateRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java index 4a11961e6a..91968bd5d4 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java @@ -165,7 +165,7 @@ public class UpdateRecord extends TableFixture { whereclause.append(cell_title).append("=").append(value_evaluated); } else { if (gpo != null) { - if (gpo.set_ValueOfColumnReturningBoolean(cell_title, cell_value)) { + if (gpo.set_ValueOfColumnReturningBoolean(cell_title, value_evaluated)) { if (isErrorExpected) { wrong(getCell(i, 1)); } else { From 86668972d0310c90ab4005894f11c71a28e4f5d9 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 10 Jul 2013 22:34:24 -0500 Subject: [PATCH 12/21] 1002538 fitnesse improvements: - validate ID is valid in client - validate process parameter is valid - improve updaterecord logic --- .../TestCashPosOrder/content.txt | 1 - .../FitNesseRoot/RecentChanges/content.txt | 2 +- .../src/org/compiere/model/MColumn.java | 22 ++- .../fitnesse/fixture/AssertRecord.java | 42 +++-- .../fitnesse/fixture/CreateRecord.java | 38 +++- .../fitnesse/fixture/DeleteRecord.java | 11 +- .../fitnesse/fixture/ReadRecord.java | 24 ++- .../fitnesse/fixture/RunProcess.java | 27 ++- .../fitnesse/fixture/UpdateRecord.java | 162 +++++++++++++++--- .../org/idempiere/fitnesse/fixture/Util.java | 2 + 10 files changed, 269 insertions(+), 62 deletions(-) diff --git a/fitnesse/FitNesseRoot/IdempiereSuite/TestCashPosOrder/content.txt b/fitnesse/FitNesseRoot/IdempiereSuite/TestCashPosOrder/content.txt index a46f1c1336..9402f28b2a 100644 --- a/fitnesse/FitNesseRoot/IdempiereSuite/TestCashPosOrder/content.txt +++ b/fitnesse/FitNesseRoot/IdempiereSuite/TestCashPosOrder/content.txt @@ -131,6 +131,5 @@ Check existance of cash payment (now on payment table) |*Read* | | |documentno | | |description | | -|amount | | |processed | | diff --git a/fitnesse/FitNesseRoot/RecentChanges/content.txt b/fitnesse/FitNesseRoot/RecentChanges/content.txt index 60b5d36182..6a71f1d334 100644 --- a/fitnesse/FitNesseRoot/RecentChanges/content.txt +++ b/fitnesse/FitNesseRoot/RecentChanges/content.txt @@ -1,7 +1,7 @@ +|IdempiereSuite.TestCashPosOrder||22:32:07 mié, jul 10, 2013| |IdempiereSuite.TestInitialClientSetup||17:03:35 vie, jun 28, 2013| |IdempiereSuite.TestPostInternalInventory||15:31:05 vie, jun 28, 2013| |IdempiereSuite.TestCreateReference||14:44:52 vie, jun 28, 2013| -|IdempiereSuite.TestCashPosOrder||14:42:20 vie, jun 28, 2013| |ZkSuite.ZkGardenAdminLogin||13:02:13 vie, jun 28, 2013| |ZkSuite.ZkSystemAdminLogin||13:00:38 vie, jun 28, 2013| |||12:04:00 jue, dic 20, 2012| diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java index 7fe700c099..8e41f62b01 100644 --- a/org.adempiere.base/src/org/compiere/model/MColumn.java +++ b/org.adempiere.base/src/org/compiere/model/MColumn.java @@ -681,18 +681,32 @@ public class MColumn extends X_AD_Column public String getReferenceTableName() { String foreignTable = null; - if (DisplayType.TableDir == getAD_Reference_ID() - || (DisplayType.Search == getAD_Reference_ID() && getAD_Reference_Value_ID() == 0)) { + int refid = getAD_Reference_ID(); + if (DisplayType.TableDir == refid || (DisplayType.Search == refid && getAD_Reference_Value_ID() == 0)) { foreignTable = getColumnName().substring(0, getColumnName().length()-3); - } else if (DisplayType.Table == getAD_Reference_ID() || DisplayType.Search == getAD_Reference_ID()) { + } else if (DisplayType.Table == refid || DisplayType.Search == refid) { X_AD_Reference ref = new X_AD_Reference(getCtx(), getAD_Reference_Value_ID(), get_TrxName()); if (X_AD_Reference.VALIDATIONTYPE_TableValidation.equals(ref.getValidationType())) { MRefTable rt = new MRefTable(getCtx(), getAD_Reference_Value_ID(), get_TrxName()); if (rt != null) foreignTable = rt.getAD_Table().getTableName(); } - } else if (DisplayType.List == getAD_Reference_ID()) { + } else if (DisplayType.List == refid) { foreignTable = "AD_Ref_List"; + } else if (DisplayType.Location == refid) { + foreignTable = "C_Location"; + } else if (DisplayType.Account == refid) { + foreignTable = "C_ValidCombination"; + } else if (DisplayType.Locator == refid) { + foreignTable = "M_Locator"; + } else if (DisplayType.PAttribute == refid) { + foreignTable = "M_AttributeSetInstance"; + } else if (DisplayType.Assignment == refid) { + foreignTable = "S_ResourceAssignment"; + } else if (DisplayType.Image == refid) { + foreignTable = "AD_Image"; + } else if (DisplayType.Color == refid) { + foreignTable = "AD_Color"; } return foreignTable; diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java index 56c7ed33b2..99349e0c8f 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java @@ -66,7 +66,7 @@ public class AssertRecord extends TableFixture { MTable table = null; POInfo poinfo = null; boolean alreadyread = false; - StringBuilder whereclause = new StringBuilder(""); + StringBuilder whereclause = new StringBuilder(); boolean isErrorExpected = false; for (int i = 0; i < rows; i++) { String cell_title = getText(i, 0); @@ -104,6 +104,8 @@ public class AssertRecord extends TableFixture { wrong(i, 1); return; } + whereclause.insert(0, "("); + whereclause.append(") AND AD_Client_ID IN (0,").append(Env.getAD_Client_ID(ctx)).append(")"); String sql = "SELECT * FROM " + tableName + " WHERE " + whereclause; PreparedStatement pstmt = null; ResultSet rs = null; @@ -166,28 +168,34 @@ public class AssertRecord extends TableFixture { if (! alreadyread) { // not read yet - add value to where clause String value_evaluated = Util.evaluate(ctx, windowNo, cell_value, getCell(i, 1)); - if (whereclause.length() > 0) - whereclause.append(" AND "); + if (whereclause.length() > 0) { + whereclause.insert(0, "("); + whereclause.append(") AND "); + } whereclause.append(cell_title).append("=").append(value_evaluated); } else { // already read, compare the value of db with the context variable or formula String title_evaluated = ""; if (gpo != null) { - Object result = gpo.get_Value(cell_title); - if (result != null) { - getCell(i, 0).addToBody("
" + result.toString()); - title_evaluated = result.toString(); - } - - String value_evaluated = cell_value; - if (cell_value.startsWith("@")) { - value_evaluated = Util.evaluate(ctx, windowNo,cell_value, getCell(i, 1)); - } - - if (title_evaluated.equals(value_evaluated)) { - right(i, 1); + if (poinfo.getColumnIndex(cell_title) < 0) { + wrong(i, 0); } else { - wrong(i, 1); + Object result = gpo.get_Value(cell_title); + if (result != null) { + getCell(i, 0).addToBody("
" + result.toString()); + title_evaluated = result.toString(); + } + + String value_evaluated = cell_value; + if (cell_value.startsWith("@")) { + value_evaluated = Util.evaluate(ctx, windowNo,cell_value, getCell(i, 1)); + } + + if (title_evaluated.equals(value_evaluated)) { + right(i, 1); + } else { + wrong(i, 1); + } } } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java index f1a34b5201..ebed4bd806 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java @@ -30,9 +30,12 @@ import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Properties; +import org.compiere.model.MColumn; import org.compiere.model.MTable; import org.compiere.model.PO; import org.compiere.model.POInfo; +import org.compiere.util.DB; +import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.util.ValueNamePair; @@ -65,6 +68,7 @@ public class CreateRecord extends TableFixture { boolean tableOK = false; boolean columnsOK = true; boolean isErrorExpected = "*Save*Error*".equalsIgnoreCase(getText(rows-1, 0)); + String msgerror1 = getText(rows-1, 1); MTable table = null; POInfo poinfo = null; @@ -145,7 +149,7 @@ public class CreateRecord extends TableFixture { columnName = cell_title; int idxcol = gpo.get_ColumnIndex(columnName); if (idxcol < 0) { - wrong(i,1); + wrong(i,0); // column does not exist in dictionary - anyways try custom column in case it exists in table gpo.set_CustomColumnReturningBoolean(columnName, cell_value); } else { @@ -153,8 +157,16 @@ public class CreateRecord extends TableFixture { String value_evaluated = Util.evaluate(ctx, windowNo, cell_value, getCell(i, 1)); // set value according to class Object value = null; - if (value_evaluated == null || value_evaluated.length() == 0) { + if (org.compiere.util.Util.isEmpty(cell_value)) { value = null; + } else if (org.compiere.util.Util.isEmpty(value_evaluated)) { + boolean ok = Util.evaluateError("Data not found",msgerror1,isErrorExpected); + if (ok) + right(i,1); + else + wrong(i,1); + columnsOK = false; + continue; } else if (columnClass == Boolean.class) { if ("Y".equalsIgnoreCase(value_evaluated) || "true".equalsIgnoreCase(value_evaluated)) value = new Boolean(true); @@ -166,7 +178,27 @@ public class CreateRecord extends TableFixture { } } else if (columnClass == Integer.class) { try { - value = Integer.parseInt(value_evaluated); + Integer intid = Integer.parseInt(value_evaluated); + MColumn column = table.getColumn(cell_title); + if (intid > 0 && (DisplayType.isID(column.getAD_Reference_ID()) || column.getAD_Reference_ID() != DisplayType.ID)) { + // Evaluate the ID is from the actual client or system + String foreignTable = column.getReferenceTableName(); + if (foreignTable != null) { + int foreignClient = DB.getSQLValueEx(null, + "SELECT AD_Client_ID FROM " + foreignTable + " WHERE " + foreignTable + "_ID=?", + intid); + if (foreignClient != 0 && foreignClient != Env.getAD_Client_ID(ctx)) { + boolean ok = Util.evaluateError("Data not found", msgerror1, isErrorExpected); + if (ok) + right(i, 1); + else + wrong(i, 1); + columnsOK = false; + continue; + } + } + } + value = intid; } catch (NumberFormatException e) { exception(getCell(i, 1), e); continue; diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java index 5b279938ce..ed0b4e7761 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java @@ -30,6 +30,7 @@ import java.util.Properties; import org.compiere.model.MTable; import org.compiere.model.PO; import org.compiere.util.DB; +import org.compiere.util.Env; import fitnesse.fixtures.TableFixture; @@ -65,7 +66,7 @@ public class DeleteRecord extends TableFixture { MTable table = null; boolean alreadyread = false; - StringBuilder whereclause = new StringBuilder(""); + StringBuilder whereclause = new StringBuilder(); boolean isErrorExpected = false; String msgerror = null; @@ -105,6 +106,8 @@ public class DeleteRecord extends TableFixture { wrong(i, 1); return; } + whereclause.insert(0, "("); + whereclause = whereclause.append(") AND AD_Client_ID=").append(Env.getAD_Client_ID(ctx)); String sql = "SELECT * FROM " + tableName + " WHERE "+ whereclause; PreparedStatement pstmt = null; ResultSet rs = null; @@ -159,8 +162,10 @@ public class DeleteRecord extends TableFixture { String value_evaluated = Util.evaluate(ctx, windowNo,cell_value, getCell(i, 1)); if (!alreadyread) { // not read yet - add value to where clause - if (whereclause.length() > 0) - whereclause.append(" AND "); + if (whereclause.length() > 0) { + whereclause.insert(0, "("); + whereclause.append(") AND "); + } whereclause.append(cell_title).append("=").append(value_evaluated); } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java index e6f281d0ed..4abe3e0719 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java @@ -66,7 +66,7 @@ public class ReadRecord extends TableFixture { MTable table = null; POInfo poinfo = null; boolean alreadyread = false; - String whereclause = new String(""); + StringBuilder whereclause = new StringBuilder(); boolean isErrorExpected = false; for (int i = 0; i < rows; i++) { String cell_title = getText(i, 0); @@ -90,7 +90,7 @@ public class ReadRecord extends TableFixture { exception(getCell(i, 1), new Exception("*Where* must be defined in second row")); return; } - whereclause = cell_value; + whereclause.append(cell_value); } else if (cell_title.equalsIgnoreCase("*Read*") || cell_title.equalsIgnoreCase("*Read*Error*")) { if (! tableOK) { getCell(i, 1).addToBody("Table " + tableName + " does not exist"); @@ -103,6 +103,8 @@ public class ReadRecord extends TableFixture { wrong(i, 1); return; } + whereclause.insert(0, "("); + whereclause.append(") AND AD_Client_ID IN (0,").append(Env.getAD_Client_ID(ctx)).append(")"); String sql = "SELECT * FROM " + tableName + " WHERE " + whereclause; PreparedStatement pstmt = null; ResultSet rs = null; @@ -170,15 +172,21 @@ public class ReadRecord extends TableFixture { if (! alreadyread) { // not read yet - add value to where clause String value_evaluated = Util.evaluate(ctx, windowNo, cell_value, getCell(i, 1)); - if (whereclause.length() > 0) - whereclause = whereclause + " AND "; - whereclause = whereclause + cell_title + "=" + value_evaluated; + if (whereclause.length() > 0) { + whereclause.insert(0, "("); + whereclause.append(") AND "); + } + whereclause.append(cell_title).append("=").append(value_evaluated); } else { // already read, show the value of context variable if (gpo != null) { - Object result = gpo.get_Value(cell_title); - if (result != null) - getCell(i, 1).addToBody(result.toString()); + if (poinfo.getColumnIndex(cell_title) < 0) { + wrong(i, 0); + } else { + Object result = gpo.get_Value(cell_title); + if (result != null) + getCell(i, 1).addToBody(result.toString()); + } } } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java index dc2f9b6e9f..4c1fa28c42 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java @@ -44,6 +44,7 @@ import org.compiere.model.MTable; import org.compiere.model.PO; import org.compiere.process.ProcessInfo; import org.compiere.util.CLogger; +import org.compiere.util.DB; import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.util.Msg; @@ -293,11 +294,27 @@ public class RunProcess extends TableFixture { exception(getCell(i, 1), e); continue; } - } - else if (parameterName.equalsIgnoreCase("*DocAction*")) - docAction = value_evaluated; - else - fmap.put(parameterName, value_evaluated); + } else { + if (parameterName.equalsIgnoreCase("*DocAction*")) { + docAction = value_evaluated; + } else { + String param = DB.getSQLValueStringEx(null, + "SELECT ColumnName " + + "FROM AD_Process_Para " + + "WHERE IsActive='Y' AND AD_Process_ID=? AND LOWER(ColumnName)=?", + process.getAD_Process_ID(), parameterName.toLowerCase()); + if (param == null) { + boolean ok = Util.evaluateError(msgerror1,"Parameter Not Found", isErrorExpected); + if (ok) { + right(getCell(i, 1)); + } else { + exception(getCell(i, 1), new Exception("Parameter Not Found")); + } + } else { + fmap.put(param, value_evaluated); + } + } + } } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java index 91968bd5d4..0f318fd28c 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java @@ -23,14 +23,21 @@ package org.idempiere.fitnesse.fixture; +import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Properties; +import org.compiere.model.MColumn; import org.compiere.model.MTable; import org.compiere.model.PO; +import org.compiere.model.POInfo; import org.compiere.util.DB; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.ValueNamePair; import fitnesse.fixtures.TableFixture; @@ -66,10 +73,12 @@ public class UpdateRecord extends TableFixture { PO gpo = null; String tableName = new String(""); boolean tableOK = false; + boolean columnsOK = true; MTable table = null; + POInfo poinfo = null; boolean alreadyread = false; - StringBuilder whereclause = new StringBuilder(""); + StringBuilder whereclause = new StringBuilder(); boolean isErrorExpected = false; String msgerror = null; for (int i = 0; i < rows; i++) { @@ -88,6 +97,7 @@ public class UpdateRecord extends TableFixture { } else { tableOK = true; } + poinfo = POInfo.getPOInfo(ctx, table!=null ? table.getAD_Table_ID() : 0); } else if (cell_title.equalsIgnoreCase("*Where*")) { if (i != 1) { @@ -108,6 +118,7 @@ public class UpdateRecord extends TableFixture { wrong(i, 1); return; } + whereclause = whereclause.append(" AND AD_Client_ID=").append(Env.getAD_Client_ID(ctx)); String sql = "SELECT * FROM " + tableName + " WHERE "+ whereclause; PreparedStatement pstmt = null; ResultSet rs = null; @@ -160,34 +171,145 @@ public class UpdateRecord extends TableFixture { String value_evaluated = Util.evaluate(ctx, windowNo,cell_value, getCell(i, 1)); if (!alreadyread) { // not read yet - add value to where clause - if (whereclause.length() > 0) - whereclause.append(" AND "); + if (whereclause.length() > 0) { + whereclause.insert(0, "("); + whereclause.append(") AND "); + } whereclause.append(cell_title).append("=").append(value_evaluated); } else { if (gpo != null) { - if (gpo.set_ValueOfColumnReturningBoolean(cell_title, value_evaluated)) { - if (isErrorExpected) { - wrong(getCell(i, 1)); - } else { - right(getCell(i, 1)); + String columnName = cell_title; + int idxcol = gpo.get_ColumnIndex(columnName); + if (idxcol < 0) { + wrong(i,0); + // column does not exist in dictionary - anyways try custom column in case it exists in table + gpo.set_CustomColumnReturningBoolean(columnName, cell_value); + } else { + Class columnClass = poinfo.getColumnClass(idxcol); + // set value according to class + Object value = null; + if (org.compiere.util.Util.isEmpty(cell_value)) { + value = null; + } else if (org.compiere.util.Util.isEmpty(value_evaluated)) { + boolean ok = Util.evaluateError("Data not found",msgerror,isErrorExpected); + if (ok) + right(i,1); + else + wrong(i,1); + columnsOK = false; + continue; + } else if (columnClass == Boolean.class) { + if ("Y".equalsIgnoreCase(value_evaluated) || "true".equalsIgnoreCase(value_evaluated)) + value = new Boolean(true); + else if ("N".equalsIgnoreCase(value_evaluated) || "false".equalsIgnoreCase(value_evaluated)) + value = new Boolean(false); + else { + exception(getCell(i, 1), new Exception("Wrong value for boolean, allowed Y/N/true/false")); + continue; + } + } else if (columnClass == Integer.class) { + try { + Integer intid = Integer.parseInt(value_evaluated); + MColumn column = table.getColumn(cell_title); + if (intid > 0 && (DisplayType.isID(column.getAD_Reference_ID()) || column.getAD_Reference_ID() != DisplayType.ID)) { + // Evaluate the ID is from the actual client or system + String foreignTable = column.getReferenceTableName(); + if (foreignTable != null) { + int foreignClient = DB.getSQLValueEx(null, + "SELECT AD_Client_ID FROM " + foreignTable + " WHERE " + foreignTable + "_ID=?", + intid); + if (foreignClient != 0 && foreignClient != Env.getAD_Client_ID(ctx)) { + boolean ok = Util.evaluateError("Data not found", msgerror, isErrorExpected); + if (ok) + right(i, 1); + else + wrong(i, 1); + columnsOK = false; + continue; + } + } + } + value = intid; + } catch (NumberFormatException e) { + exception(getCell(i, 1), e); + continue; + } + } else if (columnClass == BigDecimal.class) { + try { + value = new BigDecimal(value_evaluated); + } catch (Exception e) { + exception(getCell(i, 1), e); + continue; + } + } else if (columnClass == Timestamp.class) { + try { + value = Timestamp.valueOf(value_evaluated); + } catch (Exception e) { + exception(getCell(i, 1), e); + continue; + } + } else if (columnClass == byte[].class) { + exception(getCell(i, 1), new Exception("LOB not supported")); + continue; + } else { + value = value_evaluated; + } + try { + if (!gpo.set_ValueOfColumnReturningBoolean(columnName, value)) { + columnsOK = false; + boolean ok = Util.evaluateError("Cannot set value of column", cell_value, isErrorExpected); + if (ok) + right(getCell(i, 1)); + else + exception(getCell(i, 1), new Exception("Cannot set value of column")); + } + } catch (Exception e) { + columnsOK = false; + boolean ok = Util.evaluateError(e.getMessage(), cell_value, isErrorExpected); + if (ok) + right(getCell(i, 1)); + else + exception(getCell(i, 1), e); } } - - try { - gpo.saveEx(); - } catch (Exception e) { - boolean ok = Util.evaluateError(e.getMessage(),msgerror, isErrorExpected); - if (ok) - right(getCell(i, 1)); - else - exception(getCell(i, 1),e); - } - } } } } - }//end while + } //end for + if (tableOK && columnsOK && gpo != null) { + int i = rows-1; + if (!gpo.save()) { + StringBuilder msg = new StringBuilder(); + Exception e = (Exception) ctx.get("org.compiere.util.CLogger.lastException"); + if (e != null) + msg.append("Exception: "+ e.getMessage()); + else { + ValueNamePair vnp = (ValueNamePair) ctx.get("org.compiere.util.CLogger.lastError"); + if (vnp != null) + msg.append("Error: " + vnp.getName()); + } + getCell(i, 1).addToBody(msg.toString()); + boolean ok = Util.evaluateError(msg.toString(),msgerror,isErrorExpected); + if (ok) + right(i,1); + else + wrong(i,1); + } else { + if (isErrorExpected) { + wrong(i,1); + } else { + right(i, 1); + } + getCell(i, 1).addToBody(gpo.toString()); + for (int idx = 0; idx < poinfo.getColumnCount(); idx++) { + String colname = poinfo.getColumnName(idx); + Object result = gpo.get_Value(colname); + if (result != null) + Env.setContext(ctx, windowNo, poinfo.getTableName().toLowerCase() + "." + colname.toLowerCase(), result.toString()); + } + } + } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java index eb6b46f419..e222e02372 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java @@ -119,6 +119,8 @@ public class Util { String tablename = cell_value.substring(5, pos_opsqb); String where = cell_value.substring(pos_opsqb+1, pos_clsqb); String whereParsed = Env.parseContext(ctx, windowNo, where, false); + if (ctx != null) + whereParsed = "(" + whereParsed + ") AND AD_Client_ID IN (0,"+Env.getAD_Client_ID(ctx)+")"; String columnname = cell_value.substring(pos_clsqb+2); String newval = DB.getSQLValueStringEx(null, "SELECT " + columnname + " FROM " + tablename + " WHERE " + whereParsed); if (parse != null) From c1494abff4fa2ba063fdbd08a3a61cd947e75d90 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 11 Jul 2013 14:40:31 +0800 Subject: [PATCH 13/21] IDEMPIERE-1163 Web service role access control not working. --- .../oracle/201307110629_IDEMPIERE-1163.sql | 8 ++++++++ .../postgresql/201307110629_IDEMPIERE-1163.sql | 8 ++++++++ .../org/idempiere/webservices/AbstractService.java | 12 ++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201307110629_IDEMPIERE-1163.sql create mode 100644 migration/i1.0c-release/postgresql/201307110629_IDEMPIERE-1163.sql diff --git a/migration/i1.0c-release/oracle/201307110629_IDEMPIERE-1163.sql b/migration/i1.0c-release/oracle/201307110629_IDEMPIERE-1163.sql new file mode 100644 index 0000000000..6f09a58ea6 --- /dev/null +++ b/migration/i1.0c-release/oracle/201307110629_IDEMPIERE-1163.sql @@ -0,0 +1,8 @@ +-- Jul 11, 2013 2:11:52 PM MYT +-- IDEMPIERE-1163 Web service role access control not working +UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-07-11 14:11:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56679 +; + +SELECT register_migration_script('201307110629_IDEMPIERE-1163.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201307110629_IDEMPIERE-1163.sql b/migration/i1.0c-release/postgresql/201307110629_IDEMPIERE-1163.sql new file mode 100644 index 0000000000..6bd3fec1c5 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307110629_IDEMPIERE-1163.sql @@ -0,0 +1,8 @@ +-- Jul 11, 2013 2:11:52 PM MYT +-- IDEMPIERE-1163 Web service role access control not working +UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-07-11 14:11:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56679 +; + +SELECT register_migration_script('201307110629_IDEMPIERE-1163.sql') FROM dual +; + diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java index 5ded0a3177..97823999a7 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java @@ -64,6 +64,8 @@ import org.idempiere.webservices.fault.IdempiereServiceFault; */ public class AbstractService { + private static final String ROLE_ACCESS_SQL = "SELECT IsActive FROM WS_WebServiceTypeAccess WHERE AD_Role_ID=? " + + "AND WS_WebServiceType_ID=?"; private static final String COMPIERE_SERVICE = "CompiereService"; @Resource protected WebServiceContext ctx; @@ -225,7 +227,17 @@ public class AbstractService { return "Service type " + serviceTypeValue + " not configured"; req.setAttribute("MWebServiceType", m_webservicetype); + + // Check if role has access on web-service + String hasAccess = DB.getSQLValueString(null, ROLE_ACCESS_SQL, + Env.getAD_Role_ID( m_cs.getCtx()), + m_webservicetype.get_ID()); + if (!"Y".equals(hasAccess)) + { + return "Web Service Error: Login role does not have access to the service type"; + } + String ret=invokeLoginValidator(null, m_cs.getCtx(), m_webservicetype, IWSValidator.TIMING_ON_AUTHORIZATION); if(ret!=null && ret.length()>0) return ret; From 35e289c3b2f5a8892c20751019cba0dcb58aec44 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 10:31:21 -0500 Subject: [PATCH 14/21] IDEMPIERE-1165 #resolve Fitnesse and Web Services cannot run script processes --- org.adempiere.base/src/org/compiere/model/MProcess.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java index a3f87f95ee..cad10b3dad 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcess.java +++ b/org.adempiere.base/src/org/compiere/model/MProcess.java @@ -323,8 +323,12 @@ public class MProcess extends X_AD_Process private boolean startClass (ProcessInfo pi, Trx trx, boolean managedTrx) { if (log.isLoggable(Level.INFO)) log.info(pi.getClassName()); - - return ProcessUtil.startJavaProcess(getCtx(), pi, trx, managedTrx); + + if (pi.getClassName().toLowerCase().startsWith(MRule.SCRIPT_PREFIX)) { + return ProcessUtil.startScriptProcess(getCtx(), pi, trx); + } else { + return ProcessUtil.startJavaProcess(getCtx(), pi, trx, managedTrx); + } } // startClass From d9f24a308d49a5d3449d5df75f7610b64bb3b493 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 18:15:23 -0500 Subject: [PATCH 15/21] 1002538 fitnesse improvements / include Payment displaytype as suggested by Heng Sin --- org.adempiere.base/src/org/compiere/model/MColumn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java index 8e41f62b01..9efc475638 100644 --- a/org.adempiere.base/src/org/compiere/model/MColumn.java +++ b/org.adempiere.base/src/org/compiere/model/MColumn.java @@ -691,7 +691,7 @@ public class MColumn extends X_AD_Column if (rt != null) foreignTable = rt.getAD_Table().getTableName(); } - } else if (DisplayType.List == refid) { + } else if (DisplayType.List == refid || DisplayType.Payment == refid) { foreignTable = "AD_Ref_List"; } else if (DisplayType.Location == refid) { foreignTable = "C_Location"; From 193797174b391784544e44af635f6bfc45fa3235 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 18:33:12 -0500 Subject: [PATCH 16/21] IDEMPIERE-724 Make default usage of sysconfig variable ZK_BROWSER_TITLE for default theme --- org.adempiere.ui.zk/theme/default/preference.zul | 1 - 1 file changed, 1 deletion(-) diff --git a/org.adempiere.ui.zk/theme/default/preference.zul b/org.adempiere.ui.zk/theme/default/preference.zul index ddc9f3af03..d38e83039a 100644 --- a/org.adempiere.ui.zk/theme/default/preference.zul +++ b/org.adempiere.ui.zk/theme/default/preference.zul @@ -10,7 +10,6 @@ import org.compiere.util.Env; Env.setContext(Env.getCtx(), "#ZK_Toolbar_Button_Size", "24"); - Env.setContext(Env.getCtx(), "#ZK_BROWSER_TITLE", "iDempiere"); ]]> From 1f635fcbcb1e826c4fc8e32b2efb3e78a156d139 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 18:34:34 -0500 Subject: [PATCH 17/21] IDEMPIERE-1163 Web service role access control not working. --- .../WEB-INF/src/org/idempiere/webservices/AbstractService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java index 97823999a7..8e9a3e98fc 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java @@ -229,7 +229,7 @@ public class AbstractService { req.setAttribute("MWebServiceType", m_webservicetype); // Check if role has access on web-service - String hasAccess = DB.getSQLValueString(null, ROLE_ACCESS_SQL, + String hasAccess = DB.getSQLValueStringEx(null, ROLE_ACCESS_SQL, Env.getAD_Role_ID( m_cs.getCtx()), m_webservicetype.get_ID()); From c5dfae200fa065b62c2678c62d91a68709191c32 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 11 Jul 2013 23:50:56 -0500 Subject: [PATCH 18/21] IDEMPIERE-1169 WAccountDialog misbehaving if Account Combination is read/write --- .../WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java index 0ed5651d06..4e809eaa00 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java @@ -276,6 +276,9 @@ public final class WAccountDialog extends Window GridWindowVO wVO = AEnv.getMWindowVO (m_WindowNo, AD_Window_ID, 0); if (wVO == null) return false; + // Force window/tab to be read-only + wVO.WindowType = GridWindowVO.WINDOWTYPE_QUERY; + wVO.Tabs.get(0).IsReadOnly = true; m_mWindow = new GridWindow (wVO); m_mTab = m_mWindow.getTab(0); // Make sure is the tab is loaded - teo_sarca [ 1659124 ] From 2a0d47b90c83a330c184a88d68c91bf4977e8550 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Fri, 12 Jul 2013 15:26:24 +0800 Subject: [PATCH 19/21] IDEMPIERE-1164 Improve window layout of webservices. --- .../oracle/201306261433_IDEMPIERE-1164.sql | 53 +++++ .../oracle/201307031130_IDEMPIERE-1164.sql | 192 ++++++++++++++++++ .../oracle/201307111604_IDEMPIERE-1164.sql | 138 +++++++++++++ .../201306261433_IDEMPIERE-1164.sql | 53 +++++ .../201307031130_IDEMPIERE-1164.sql | 192 ++++++++++++++++++ .../201307111604_IDEMPIERE-1164.sql | 137 +++++++++++++ 6 files changed, 765 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201306261433_IDEMPIERE-1164.sql create mode 100644 migration/i1.0c-release/oracle/201307031130_IDEMPIERE-1164.sql create mode 100644 migration/i1.0c-release/oracle/201307111604_IDEMPIERE-1164.sql create mode 100644 migration/i1.0c-release/postgresql/201306261433_IDEMPIERE-1164.sql create mode 100644 migration/i1.0c-release/postgresql/201307031130_IDEMPIERE-1164.sql create mode 100644 migration/i1.0c-release/postgresql/201307111604_IDEMPIERE-1164.sql diff --git a/migration/i1.0c-release/oracle/201306261433_IDEMPIERE-1164.sql b/migration/i1.0c-release/oracle/201306261433_IDEMPIERE-1164.sql new file mode 100644 index 0000000000..5c44175ba1 --- /dev/null +++ b/migration/i1.0c-release/oracle/201306261433_IDEMPIERE-1164.sql @@ -0,0 +1,53 @@ +-- Jun 25, 2013 6:30:15 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_DATE('2013-06-25 18:30:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201369 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201366 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=201369 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=201895 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=56664 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=201367 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=201365 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=201368 +; + +-- Jun 25, 2013 6:48:01 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic='@IsIdentifier@=''Y" & @AD_Column_ID@!0',Updated=TO_DATE('2013-06-25 18:48:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201365 +; + +-- Jun 25, 2013 6:48:57 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic='@IsIdentifier@=''Y" & @AD_Column_ID@!0',Updated=TO_DATE('2013-06-25 18:48:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201368 +; + +SELECT register_migration_script('201306261433_IDEMPIERE-1164.sql') FROM dual +; + diff --git a/migration/i1.0c-release/oracle/201307031130_IDEMPIERE-1164.sql b/migration/i1.0c-release/oracle/201307031130_IDEMPIERE-1164.sql new file mode 100644 index 0000000000..306e2643cc --- /dev/null +++ b/migration/i1.0c-release/oracle/201307031130_IDEMPIERE-1164.sql @@ -0,0 +1,192 @@ +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56666 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=201366 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=201367 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=201369 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201368 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=56665 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=56664 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=201365 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=201895 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=56669 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=56667 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56663 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56659 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56657 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56660 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56661 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56658 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=56662 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=56656 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56669 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56665 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56667 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=201895 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=201365 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=56664 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56675 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56673 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56671 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56672 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56674 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56670 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56681 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56677 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56678 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56680 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56679 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56676 +; + +-- Jul 10, 2013 11:33:41 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic='@WS_WebService_ID@ !200001',Updated=TO_DATE('2013-07-10 11:33:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56652 +; + +SELECT register_migration_script('201307031130_IDEMPIERE-1164.sql') FROM dual +; diff --git a/migration/i1.0c-release/oracle/201307111604_IDEMPIERE-1164.sql b/migration/i1.0c-release/oracle/201307111604_IDEMPIERE-1164.sql new file mode 100644 index 0000000000..b722757bc3 --- /dev/null +++ b/migration/i1.0c-release/oracle/201307111604_IDEMPIERE-1164.sql @@ -0,0 +1,138 @@ +-- Jul 11, 2013 3:47:37 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=18 | @AD_Reference_ID@=30',Updated=TO_DATE('2013-07-11 15:47:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201895 +; + +-- Jul 11, 2013 3:53:23 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-07-11 15:53:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56629 +; + +-- Jul 11, 2013 3:53:28 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=4,Updated=TO_DATE('2013-07-11 15:53:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56629 +; + +-- Jul 11, 2013 3:53:49 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=1,Updated=TO_DATE('2013-07-11 15:53:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56629 +; + +-- Jul 11, 2013 3:53:57 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2, XPosition=4,Updated=TO_DATE('2013-07-11 15:53:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56633 +; + +-- Jul 11, 2013 3:54:09 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-07-11 15:54:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56634 +; + +-- Jul 11, 2013 3:54:15 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-07-11 15:54:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56632 +; + +-- Jul 11, 2013 3:54:22 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-07-11 15:54:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56631 +; + +-- Jul 11, 2013 3:54:31 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5, NumLines=3,Updated=TO_DATE('2013-07-11 15:54:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56630 +; + +-- Jul 11, 2013 3:54:37 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-07-11 15:54:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56628 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56643 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56644 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56641 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56637 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56640 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56642 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56639 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=56638 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=56636 +; + +-- Jul 11, 2013 4:01:05 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-07-11 16:01:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56637 +; + +-- Jul 11, 2013 4:01:14 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2, XPosition=4,Updated=TO_DATE('2013-07-11 16:01:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56641 +; + +-- Jul 11, 2013 4:01:21 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-07-11 16:01:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56643 +; + +-- Jul 11, 2013 4:01:28 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-07-11 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56642 +; + +-- Jul 11, 2013 4:01:35 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-07-11 16:01:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56640 +; + +-- Jul 11, 2013 4:01:45 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-07-11 16:01:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56639 +; + +-- Jul 11, 2013 4:01:52 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5, NumLines=3,Updated=TO_DATE('2013-07-11 16:01:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56638 +; + +-- Jul 11, 2013 4:02:09 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-07-11 16:02:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56636 +; + +SELECT register_migration_script('201307111604_IDEMPIERE-1164.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201306261433_IDEMPIERE-1164.sql b/migration/i1.0c-release/postgresql/201306261433_IDEMPIERE-1164.sql new file mode 100644 index 0000000000..8d36934f83 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201306261433_IDEMPIERE-1164.sql @@ -0,0 +1,53 @@ +-- Jun 25, 2013 6:30:15 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_TIMESTAMP('2013-06-25 18:30:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201369 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201366 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=201369 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=201895 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=56664 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=201367 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=201365 +; + +-- Jun 25, 2013 6:30:56 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=201368 +; + +-- Jun 25, 2013 6:48:01 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic='@IsIdentifier@=''Y" & @AD_Column_ID@!0',Updated=TO_TIMESTAMP('2013-06-25 18:48:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201365 +; + +-- Jun 25, 2013 6:48:57 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic='@IsIdentifier@=''Y" & @AD_Column_ID@!0',Updated=TO_TIMESTAMP('2013-06-25 18:48:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201368 +; + +SELECT register_migration_script('201306261433_IDEMPIERE-1164.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201307031130_IDEMPIERE-1164.sql b/migration/i1.0c-release/postgresql/201307031130_IDEMPIERE-1164.sql new file mode 100644 index 0000000000..69f1e89559 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307031130_IDEMPIERE-1164.sql @@ -0,0 +1,192 @@ +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56666 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=201366 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=201367 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=201369 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201368 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=56665 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=56664 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=201365 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=201895 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=56669 +; + +-- Jul 2, 2013 7:02:39 PM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=56667 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56663 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56659 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56657 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56660 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56661 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56658 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=56662 +; + +-- Jul 3, 2013 10:40:30 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=56656 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56669 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56665 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56667 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=201895 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=201365 +; + +-- Jul 3, 2013 10:50:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=56664 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56675 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56673 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56671 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56672 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56674 +; + +-- Jul 3, 2013 10:57:40 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56670 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56681 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56677 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56678 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56680 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56679 +; + +-- Jul 3, 2013 10:58:28 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56676 +; + +-- Jul 10, 2013 11:33:41 AM IST +-- Changes in the layout of Web Service Security window +UPDATE AD_Field SET DisplayLogic='@WS_WebService_ID@ !200001',Updated=TO_TIMESTAMP('2013-07-10 11:33:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56652 +; + +SELECT register_migration_script('201307031130_IDEMPIERE-1164.sql') FROM dual +; diff --git a/migration/i1.0c-release/postgresql/201307111604_IDEMPIERE-1164.sql b/migration/i1.0c-release/postgresql/201307111604_IDEMPIERE-1164.sql new file mode 100644 index 0000000000..844e6d7939 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307111604_IDEMPIERE-1164.sql @@ -0,0 +1,137 @@ +-- Jul 11, 2013 3:47:37 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=18 | @AD_Reference_ID@=30',Updated=TO_TIMESTAMP('2013-07-11 15:47:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201895 +; + +-- Jul 11, 2013 3:53:23 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_TIMESTAMP('2013-07-11 15:53:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56629 +; + +-- Jul 11, 2013 3:53:28 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=4,Updated=TO_TIMESTAMP('2013-07-11 15:53:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56629 +; + +-- Jul 11, 2013 3:53:49 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=1,Updated=TO_TIMESTAMP('2013-07-11 15:53:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56629 +; + +-- Jul 11, 2013 3:53:57 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2, XPosition=4,Updated=TO_TIMESTAMP('2013-07-11 15:53:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56633 +; + +-- Jul 11, 2013 3:54:09 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_TIMESTAMP('2013-07-11 15:54:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56634 +; + +-- Jul 11, 2013 3:54:15 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-07-11 15:54:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56632 +; + +-- Jul 11, 2013 3:54:22 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-07-11 15:54:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56631 +; + +-- Jul 11, 2013 3:54:31 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5, NumLines=3,Updated=TO_TIMESTAMP('2013-07-11 15:54:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56630 +; + +-- Jul 11, 2013 3:54:37 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-07-11 15:54:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56628 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56643 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56644 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56641 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=56637 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=56640 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=56642 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=56639 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=56638 +; + +-- Jul 11, 2013 4:00:47 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=56636 +; + +-- Jul 11, 2013 4:01:05 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_TIMESTAMP('2013-07-11 16:01:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56637 +; + +-- Jul 11, 2013 4:01:14 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2, XPosition=4,Updated=TO_TIMESTAMP('2013-07-11 16:01:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56641 +; + +-- Jul 11, 2013 4:01:21 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_TIMESTAMP('2013-07-11 16:01:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56643 +; + +-- Jul 11, 2013 4:01:28 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=2,Updated=TO_TIMESTAMP('2013-07-11 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56642 +; + +-- Jul 11, 2013 4:01:35 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-07-11 16:01:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56640 +; + +-- Jul 11, 2013 4:01:45 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-07-11 16:01:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56639 +; + +-- Jul 11, 2013 4:01:52 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET ColumnSpan=5, NumLines=3,Updated=TO_TIMESTAMP('2013-07-11 16:01:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56638 +; + +-- Jul 11, 2013 4:02:09 PM IST +-- Improve window layout of webservices +UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-07-11 16:02:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56636 +; + +SELECT register_migration_script('201307111604_IDEMPIERE-1164.sql') FROM dual +; From 265a24826ec744b5c20ebccaeb8ebb43feab24dd Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 12 Jul 2013 08:29:51 -0500 Subject: [PATCH 20/21] IDEMPIERE-724 Add comment on default theme for ZK_BROWSER_TITLE --- org.adempiere.ui.zk/theme/default/preference.zul | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.adempiere.ui.zk/theme/default/preference.zul b/org.adempiere.ui.zk/theme/default/preference.zul index d38e83039a..a6c6dd062e 100644 --- a/org.adempiere.ui.zk/theme/default/preference.zul +++ b/org.adempiere.ui.zk/theme/default/preference.zul @@ -10,6 +10,8 @@ import org.compiere.util.Env; Env.setContext(Env.getCtx(), "#ZK_Toolbar_Button_Size", "24"); + /* Set the next variable if you want to control browser title in theme */ + /* Env.setContext(Env.getCtx(), "#ZK_BROWSER_TITLE", "iDempiere"); */ ]]> From 26e9f707cdaeadc47aa999bd185a7f5cf29b565c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 15 Jul 2013 18:13:08 -0500 Subject: [PATCH 21/21] IDEMPIERE-370 Implement link from process ending message to next records / BankTransfer --- .../org/eevolution/process/BankTransfer.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/org.adempiere.base/src/org/eevolution/process/BankTransfer.java b/org.adempiere.base/src/org/eevolution/process/BankTransfer.java index 88364f1ef7..0703b6de0b 100644 --- a/org.adempiere.base/src/org/eevolution/process/BankTransfer.java +++ b/org.adempiere.base/src/org/eevolution/process/BankTransfer.java @@ -40,11 +40,11 @@ public class BankTransfer extends SvrProcess private String p_DocumentNo= ""; // Document No private String p_Description= ""; // Description private int p_C_BPartner_ID = 0; // Business Partner to be used as bridge - private int p_C_Currency_ID = 0; // Payment Currency + private int p_C_Currency_ID = 0; // Payment Currency private int p_C_ConversionType_ID = 0; // Payment Conversion Type - private int p_C_Charge_ID = 0; // Charge to be used as bridge + private int p_C_Charge_ID = 0; // Charge to be used as bridge - private BigDecimal p_Amount = Env.ZERO; // Amount to be transfered between the accounts + private BigDecimal p_Amount = Env.ZERO; // Amount to be transfered between the accounts private int p_From_C_BankAccount_ID = 0; // Bank Account From private int p_To_C_BankAccount_ID= 0; // Bank Account To private Timestamp p_StatementDate = null; // Date Statement @@ -153,7 +153,7 @@ public class BankTransfer extends SvrProcess paymentBankFrom.setC_BPartner_ID (p_C_BPartner_ID); paymentBankFrom.setC_Currency_ID(p_C_Currency_ID); if (p_C_ConversionType_ID > 0) - paymentBankFrom.setC_ConversionType_ID(p_C_ConversionType_ID); + paymentBankFrom.setC_ConversionType_ID(p_C_ConversionType_ID); paymentBankFrom.setPayAmt(p_Amount); paymentBankFrom.setOverUnderAmt(Env.ZERO); paymentBankFrom.setC_DocType_ID(false); @@ -164,7 +164,11 @@ public class BankTransfer extends SvrProcess throw new IllegalStateException("Payment Process Failed: " + paymentBankFrom + " - " + paymentBankFrom.getProcessMsg()); } paymentBankFrom.saveEx(); - + addLog(paymentBankFrom.getC_Payment_ID(), paymentBankFrom.getDateTrx(), + null, paymentBankFrom.getC_DocType().getName() + " " + paymentBankFrom.getDocumentNo(), + MPayment.Table_ID, paymentBankFrom.getC_Payment_ID()); + m_created++; + MPayment paymentBankTo = new MPayment(getCtx(), 0 , get_TrxName()); paymentBankTo.setC_BankAccount_ID(mBankTo.getC_BankAccount_ID()); paymentBankTo.setDocumentNo(p_DocumentNo); @@ -186,6 +190,9 @@ public class BankTransfer extends SvrProcess throw new IllegalStateException("Payment Process Failed: " + paymentBankTo + " - " + paymentBankTo.getProcessMsg()); } paymentBankTo.saveEx(); + addLog(paymentBankTo.getC_Payment_ID(), paymentBankTo.getDateTrx(), + null, paymentBankTo.getC_DocType().getName() + " " + paymentBankTo.getDocumentNo(), + MPayment.Table_ID, paymentBankTo.getC_Payment_ID()); m_created++; return;