From d45171652413cc6822e89c5a5752b7fc2f08e77e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 25 Apr 2015 10:25:02 -0500 Subject: [PATCH 01/13] IDEMPIERE-2596 Lost changes when attachment window is closed / reorganized the if/then/else for readability - helped to discover some dead code --- .../adempiere/webui/panel/WAttachment.java | 66 +++++-------------- 1 file changed, 17 insertions(+), 49 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 f6136ff8f8..d61c8f0998 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 @@ -159,6 +159,7 @@ public class WAttachment extends Window implements EventListener if (log.isLoggable(Level.CONFIG)) log.config("ID=" + AD_Attachment_ID + ", Table=" + AD_Table_ID + ", Record=" + Record_ID); m_WindowNo = WindowNo; + this.addEventListener(DialogEvents.ON_WINDOW_CLOSE, this); if (eventListener != null) { this.addEventListener(DialogEvents.ON_WINDOW_CLOSE, eventListener); @@ -472,85 +473,52 @@ public class WAttachment extends Window implements EventListener public void onEvent(Event e) { // Save and Close - - if (e instanceof UploadEvent) - { + if (e instanceof UploadEvent) { preview.setVisible(false); UploadEvent ue = (UploadEvent) e; processUploadMedia(ue.getMedia()); - } - else if (e.getTarget() == bOk) - { + } else if (e.getTarget() == bOk || DialogEvents.ON_WINDOW_CLOSE.equals(e.getName())) { String newText = text.getText(); - if (newText == null) newText = ""; - String oldText = m_attachment.getTextMsg(); - if (oldText == null) oldText = ""; if (!m_change) m_change = !newText.equals(oldText); - if (newText.length() > 0 || m_attachment.getEntryCount() > 0) - { - if (m_change) - { + if (newText.length() > 0 || m_attachment.getEntryCount() > 0) { + if (m_change) { m_attachment.setBinaryData(new byte[0]); // ATTENTION! HEAVY HACK HERE... Else it will not save :( m_attachment.setTextMsg(text.getText()); m_attachment.saveEx(); } - } - else - { + } else { m_attachment.delete(true); m_attachment = null; } dispose(); - } - - // Cancel - - else if (e.getTarget() == bCancel) - { + } else if (e.getTarget() == bCancel) { + // Cancel dispose(); - } - - // Delete Attachment - - else if (e.getTarget() == bDeleteAll) - { + } else if (e.getTarget() == bDeleteAll) { + // Delete Attachment deleteAttachment(); dispose(); - } - - // Delete individual entry and Return - - else if (e.getTarget() == bDelete) + } else if (e.getTarget() == bDelete) { + // Delete individual entry and Return deleteAttachmentEntry(); - - // Show Data - - else if (e.getTarget() == cbContent) - { + } else if (e.getTarget() == cbContent) { + // Show Data clearPreview(); autoPreview (cbContent.getSelectedIndex(), false); - } - - // Open Attachment - - else if (e.getTarget() == bSave) + } else if (e.getTarget() == bSave) { + // Open Attachment saveAttachmentToFile(); - - else if (e.getTarget() == bRefresh) + } else if (e.getTarget() == bRefresh) { displayData(cbContent.getSelectedIndex(), true); - else if (e instanceof UploadEvent) - { - UploadEvent ue = (UploadEvent) e; - processUploadMedia(ue.getMedia()); } } // onEvent From 6fa47971fd65f97c88dbc895b5bbe1c27b38b569 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 25 Apr 2015 10:48:20 -0500 Subject: [PATCH 02/13] IDEMPIERE-2597 WhereClause of report view can cause issues --- org.adempiere.base/src/org/compiere/print/DataEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java index e8c8e2c11d..2e56ebdb6b 100644 --- a/org.adempiere.base/src/org/compiere/print/DataEngine.java +++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java @@ -170,7 +170,7 @@ public class DataEngine tableName = rs.getString(2); // TableName reportName = rs.getString(3); // Add WhereClause restriction from AD_ReportView - teo_sarca BF [ 1761891 ] - String whereClause = rs.getString(4); + String whereClause = "(" + rs.getString(4) + ")"; if (!Util.isEmpty(whereClause)) { if (whereClause.indexOf("@") == -1) { queryCopy.addRestriction(whereClause); From a0aef406d89b6704c7f7a2949fdb47336ace6aa4 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 25 Apr 2015 12:48:37 -0500 Subject: [PATCH 03/13] IDEMPIERE-2598 minor dictionary improvements --- .../oracle/201504251243_IDEMPIERE-2598.sql | 155 ++++++++++++++++++ .../201504251243_IDEMPIERE-2598.sql | 152 +++++++++++++++++ 2 files changed, 307 insertions(+) create mode 100644 migration/i2.1/oracle/201504251243_IDEMPIERE-2598.sql create mode 100644 migration/i2.1/postgresql/201504251243_IDEMPIERE-2598.sql diff --git a/migration/i2.1/oracle/201504251243_IDEMPIERE-2598.sql b/migration/i2.1/oracle/201504251243_IDEMPIERE-2598.sql new file mode 100644 index 0000000000..d9511e1540 --- /dev/null +++ b/migration/i2.1/oracle/201504251243_IDEMPIERE-2598.sql @@ -0,0 +1,155 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-2598 minor dictionary improvements +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Element SET Name='Drop Ship Business Partner', PrintName='Drop Ship Business Partner',Updated=TO_DATE('2015-04-25 10:50:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=53458 +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Column SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Element_ID=53458 +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Process_Para SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.', AD_Element_ID=53458 WHERE UPPER(ColumnName)='DROPSHIP_BPARTNER_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Process_Para SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Element_ID=53458 AND IsCentrallyMaintained='Y' +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_InfoColumn SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Element_ID=53458 AND IsCentrallyMaintained='Y' +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Field SET Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=53458) AND IsCentrallyMaintained='Y' +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_PrintFormatItem SET PrintName='Drop Ship Business Partner', Name='Drop Ship Business Partner' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=53458) +; + +-- Apr 25, 2015 10:52:36 AM COT +UPDATE AD_OrgInfo SET M_Warehouse_ID=103,Updated=TO_DATE('2015-04-25 10:52:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Org_ID=11 +; + +-- Apr 25, 2015 10:52:49 AM COT +UPDATE AD_OrgInfo SET M_Warehouse_ID=50001,Updated=TO_DATE('2015-04-25 10:52:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Org_ID=50000 +; + +-- Apr 25, 2015 10:52:58 AM COT +UPDATE AD_OrgInfo SET M_Warehouse_ID=50002,Updated=TO_DATE('2015-04-25 10:52:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Org_ID=50001 +; + +-- Apr 25, 2015 11:01:37 AM COT +UPDATE AD_Column SET IsUpdateable='N', FKConstraintType='C',Updated=TO_DATE('2015-04-25 11:01:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208569 +; + +-- Apr 25, 2015 11:01:39 AM COT +ALTER TABLE AD_CtxHelpMsg_Trl MODIFY AD_CtxHelpMsg_ID NUMBER(10) +; + +-- Apr 25, 2015 11:01:39 AM COT +ALTER TABLE AD_CtxHelpMsg_Trl DROP CONSTRAINT adctxhelpmsg_adctxhelpmsgtrl +; + +-- Apr 25, 2015 11:01:39 AM COT +ALTER TABLE AD_CtxHelpMsg_Trl ADD CONSTRAINT adctxhelpmsg_adctxhelpmsgtrl FOREIGN KEY (AD_CtxHelpMsg_ID) REFERENCES ad_ctxhelpmsg(ad_ctxhelpmsg_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +; + +-- Apr 25, 2015 11:02:18 AM COT +UPDATE AD_Column SET IsUpdateable='N', FKConstraintType='M',Updated=TO_DATE('2015-04-25 11:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208566 +; + +-- Apr 25, 2015 11:04:18 AM COT +UPDATE AD_Field SET DisplayLogic='@Processed@=N',Updated=TO_DATE('2015-04-25 11:04:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4244 +; + +-- Apr 25, 2015 11:04:54 AM COT +UPDATE AD_Field SET DisplayLogic='@Processed@=N',Updated=TO_DATE('2015-04-25 11:04:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4246 +; + +-- Apr 25, 2015 11:07:45 AM COT +UPDATE AD_Table SET AD_Window_ID=53165,Updated=TO_DATE('2015-04-25 11:07:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=53325 +; + +-- Apr 25, 2015 11:08:52 AM COT +UPDATE AD_Table SET AD_Window_ID=139,Updated=TO_DATE('2015-04-25 11:08:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=329 +; + +-- Apr 25, 2015 11:10:22 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2015-04-25 11:10:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4922 +; + +-- Apr 25, 2015 11:11:21 AM COT +UPDATE AD_SysConfig SET Description='Define the start value for C_BPartner_Location.Name (possible values 0 to 4) - complete definition here http://wiki.idempiere.org/en/System_Configurator_(Window_ID-50006)#START_VALUE_BPLOCATION_NAME',Updated=TO_DATE('2015-04-25 11:11:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50017 +; + +-- Apr 25, 2015 11:13:10 AM COT +UPDATE AD_Column SET FKConstraintType='N',Updated=TO_DATE('2015-04-25 11:13:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6949 +; + +-- Apr 25, 2015 11:13:44 AM COT +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2015-04-25 11:13:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6949 +; + +-- Apr 25, 2015 11:13:47 AM COT +ALTER TABLE AD_PrintFormatItem MODIFY AD_Column_ID NUMBER(10) DEFAULT NULL +; + +-- Apr 25, 2015 11:13:47 AM COT +ALTER TABLE AD_PrintFormatItem DROP CONSTRAINT adcolumn_adprintformatitem +; + +-- Apr 25, 2015 11:13:47 AM COT +ALTER TABLE AD_PrintFormatItem ADD CONSTRAINT adcolumn_adprintformatitem FOREIGN KEY (AD_Column_ID) REFERENCES ad_column(ad_column_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Apr 25, 2015 11:20:55 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2015-04-25 11:20:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6652 +; + +-- Apr 25, 2015 11:20:58 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2015-04-25 11:20:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6653 +; + +-- Apr 25, 2015 11:24:36 AM COT +UPDATE AD_Val_Rule SET Code='DocStatus NOT IN (''DR'',''IP'',''IN'') AND EXISTS (SELECT * FROM C_OrderLine WHERE C_Order.C_Order_ID=C_OrderLine.C_Order_ID AND QtyOrdered <> QtyInvoiced) AND IsSOTrx=''Y'' AND NOT EXISTS (SELECT * FROM C_Invoice i WHERE i.C_Order_ID=C_Order.C_Order_ID AND i.DocStatus IN (''IP'', ''CO'', ''CL''))',Updated=TO_DATE('2015-04-25 11:24:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=134 +; + +-- Apr 25, 2015 11:31:42 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2015-04-25 11:31:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2919 +; + +-- Apr 25, 2015 11:32:31 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2015-04-25 11:32:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12533 +; + +-- Apr 25, 2015 11:42:12 AM COT +UPDATE AD_Column SET IsUpdateable='N', FKConstraintType='C',Updated=TO_DATE('2015-04-25 11:42:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5385 +; + +-- Apr 25, 2015 11:42:14 AM COT +ALTER TABLE AD_FieldGroup_Trl MODIFY AD_FieldGroup_ID NUMBER(10) +; + +-- Apr 25, 2015 11:42:14 AM COT +ALTER TABLE AD_FieldGroup_Trl DROP CONSTRAINT adfieldgroup_trl +; + +-- Apr 25, 2015 11:42:14 AM COT +ALTER TABLE AD_FieldGroup_Trl ADD CONSTRAINT adfieldgroup_trl FOREIGN KEY (AD_FieldGroup_ID) REFERENCES ad_fieldgroup(ad_fieldgroup_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +; + +-- Apr 25, 2015 11:46:29 AM COT +UPDATE AD_Field SET IsAdvancedField='Y',Updated=TO_DATE('2015-04-25 11:46:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12131 +; + +-- Apr 25, 2015 11:48:48 AM COT +UPDATE AD_Field SET IsAdvancedField='Y',Updated=TO_DATE('2015-04-25 11:48:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8944 +; + +SELECT register_migration_script('201504251243_IDEMPIERE-2598.sql') FROM dual +; + diff --git a/migration/i2.1/postgresql/201504251243_IDEMPIERE-2598.sql b/migration/i2.1/postgresql/201504251243_IDEMPIERE-2598.sql new file mode 100644 index 0000000000..62028bcbb2 --- /dev/null +++ b/migration/i2.1/postgresql/201504251243_IDEMPIERE-2598.sql @@ -0,0 +1,152 @@ +-- IDEMPIERE-2598 minor dictionary improvements +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Element SET Name='Drop Ship Business Partner', PrintName='Drop Ship Business Partner',Updated=TO_TIMESTAMP('2015-04-25 10:50:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=53458 +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Column SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Element_ID=53458 +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Process_Para SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.', AD_Element_ID=53458 WHERE UPPER(ColumnName)='DROPSHIP_BPARTNER_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Process_Para SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Element_ID=53458 AND IsCentrallyMaintained='Y' +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_InfoColumn SET ColumnName='DropShip_BPartner_ID', Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Element_ID=53458 AND IsCentrallyMaintained='Y' +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_Field SET Name='Drop Ship Business Partner', Description='Business Partner to ship to', Help='If empty the business partner will be shipped to.' WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=53458) AND IsCentrallyMaintained='Y' +; + +-- Apr 25, 2015 10:50:33 AM COT +UPDATE AD_PrintFormatItem SET PrintName='Drop Ship Business Partner', Name='Drop Ship Business Partner' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=53458) +; + +-- Apr 25, 2015 10:52:36 AM COT +UPDATE AD_OrgInfo SET M_Warehouse_ID=103,Updated=TO_TIMESTAMP('2015-04-25 10:52:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Org_ID=11 +; + +-- Apr 25, 2015 10:52:49 AM COT +UPDATE AD_OrgInfo SET M_Warehouse_ID=50001,Updated=TO_TIMESTAMP('2015-04-25 10:52:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Org_ID=50000 +; + +-- Apr 25, 2015 10:52:58 AM COT +UPDATE AD_OrgInfo SET M_Warehouse_ID=50002,Updated=TO_TIMESTAMP('2015-04-25 10:52:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Org_ID=50001 +; + +-- Apr 25, 2015 11:01:37 AM COT +UPDATE AD_Column SET IsUpdateable='N', FKConstraintType='C',Updated=TO_TIMESTAMP('2015-04-25 11:01:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208569 +; + +-- Apr 25, 2015 11:01:39 AM COT +INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','AD_CtxHelpMsg_ID','NUMERIC(10)',null,null) +; + +-- Apr 25, 2015 11:01:39 AM COT +ALTER TABLE AD_CtxHelpMsg_Trl DROP CONSTRAINT adctxhelpmsg_adctxhelpmsgtrl +; + +-- Apr 25, 2015 11:01:39 AM COT +ALTER TABLE AD_CtxHelpMsg_Trl ADD CONSTRAINT adctxhelpmsg_adctxhelpmsgtrl FOREIGN KEY (AD_CtxHelpMsg_ID) REFERENCES ad_ctxhelpmsg(ad_ctxhelpmsg_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +; + +-- Apr 25, 2015 11:02:18 AM COT +UPDATE AD_Column SET IsUpdateable='N', FKConstraintType='M',Updated=TO_TIMESTAMP('2015-04-25 11:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=208566 +; + +-- Apr 25, 2015 11:04:18 AM COT +UPDATE AD_Field SET DisplayLogic='@Processed@=N',Updated=TO_TIMESTAMP('2015-04-25 11:04:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4244 +; + +-- Apr 25, 2015 11:04:54 AM COT +UPDATE AD_Field SET DisplayLogic='@Processed@=N',Updated=TO_TIMESTAMP('2015-04-25 11:04:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4246 +; + +-- Apr 25, 2015 11:07:45 AM COT +UPDATE AD_Table SET AD_Window_ID=53165,Updated=TO_TIMESTAMP('2015-04-25 11:07:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=53325 +; + +-- Apr 25, 2015 11:08:52 AM COT +UPDATE AD_Table SET AD_Window_ID=139,Updated=TO_TIMESTAMP('2015-04-25 11:08:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=329 +; + +-- Apr 25, 2015 11:10:22 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2015-04-25 11:10:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4922 +; + +-- Apr 25, 2015 11:11:21 AM COT +UPDATE AD_SysConfig SET Description='Define the start value for C_BPartner_Location.Name (possible values 0 to 4) - complete definition here http://wiki.idempiere.org/en/System_Configurator_(Window_ID-50006)#START_VALUE_BPLOCATION_NAME',Updated=TO_TIMESTAMP('2015-04-25 11:11:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50017 +; + +-- Apr 25, 2015 11:13:10 AM COT +UPDATE AD_Column SET FKConstraintType='N',Updated=TO_TIMESTAMP('2015-04-25 11:13:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6949 +; + +-- Apr 25, 2015 11:13:44 AM COT +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2015-04-25 11:13:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6949 +; + +-- Apr 25, 2015 11:13:47 AM COT +INSERT INTO t_alter_column values('ad_printformatitem','AD_Column_ID','NUMERIC(10)',null,'NULL') +; + +-- Apr 25, 2015 11:13:47 AM COT +ALTER TABLE AD_PrintFormatItem DROP CONSTRAINT adcolumn_adprintformatitem +; + +-- Apr 25, 2015 11:13:47 AM COT +ALTER TABLE AD_PrintFormatItem ADD CONSTRAINT adcolumn_adprintformatitem FOREIGN KEY (AD_Column_ID) REFERENCES ad_column(ad_column_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Apr 25, 2015 11:20:55 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2015-04-25 11:20:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6652 +; + +-- Apr 25, 2015 11:20:58 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2015-04-25 11:20:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6653 +; + +-- Apr 25, 2015 11:24:36 AM COT +UPDATE AD_Val_Rule SET Code='DocStatus NOT IN (''DR'',''IP'',''IN'') AND EXISTS (SELECT * FROM C_OrderLine WHERE C_Order.C_Order_ID=C_OrderLine.C_Order_ID AND QtyOrdered <> QtyInvoiced) AND IsSOTrx=''Y'' AND NOT EXISTS (SELECT * FROM C_Invoice i WHERE i.C_Order_ID=C_Order.C_Order_ID AND i.DocStatus IN (''IP'', ''CO'', ''CL''))',Updated=TO_TIMESTAMP('2015-04-25 11:24:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=134 +; + +-- Apr 25, 2015 11:31:42 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2015-04-25 11:31:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2919 +; + +-- Apr 25, 2015 11:32:31 AM COT +UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2015-04-25 11:32:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12533 +; + +-- Apr 25, 2015 11:42:12 AM COT +UPDATE AD_Column SET IsUpdateable='N', FKConstraintType='C',Updated=TO_TIMESTAMP('2015-04-25 11:42:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5385 +; + +-- Apr 25, 2015 11:42:14 AM COT +INSERT INTO t_alter_column values('ad_fieldgroup_trl','AD_FieldGroup_ID','NUMERIC(10)',null,null) +; + +-- Apr 25, 2015 11:42:14 AM COT +ALTER TABLE AD_FieldGroup_Trl DROP CONSTRAINT adfieldgroup_trl +; + +-- Apr 25, 2015 11:42:14 AM COT +ALTER TABLE AD_FieldGroup_Trl ADD CONSTRAINT adfieldgroup_trl FOREIGN KEY (AD_FieldGroup_ID) REFERENCES ad_fieldgroup(ad_fieldgroup_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +; + +-- Apr 25, 2015 11:46:29 AM COT +UPDATE AD_Field SET IsAdvancedField='Y',Updated=TO_TIMESTAMP('2015-04-25 11:46:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12131 +; + +-- Apr 25, 2015 11:48:48 AM COT +UPDATE AD_Field SET IsAdvancedField='Y',Updated=TO_TIMESTAMP('2015-04-25 11:48:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8944 +; + +SELECT register_migration_script('201504251243_IDEMPIERE-2598.sql') FROM dual +; + From 632b19b75c8b04dd9275255e1c377cd9c1021b01 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 27 Apr 2015 09:04:19 -0500 Subject: [PATCH 04/13] IDEMPIERE-2597 WhereClause of report view can cause issues / thanks to Armen Rizal for reporting issue with previous commit --- org.adempiere.base/src/org/compiere/print/DataEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java index 2e56ebdb6b..62be2fd693 100644 --- a/org.adempiere.base/src/org/compiere/print/DataEngine.java +++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java @@ -170,8 +170,9 @@ public class DataEngine tableName = rs.getString(2); // TableName reportName = rs.getString(3); // Add WhereClause restriction from AD_ReportView - teo_sarca BF [ 1761891 ] - String whereClause = "(" + rs.getString(4) + ")"; + String whereClause = rs.getString(4); if (!Util.isEmpty(whereClause)) { + whereClause = "(" + whereClause + ")"; // IDEMPIERE-2597 if (whereClause.indexOf("@") == -1) { queryCopy.addRestriction(whereClause); } else { // replace context variables From c237e3bd0a8cf33c5fe5ff6ec2be705943b05129 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Mon, 27 Apr 2015 14:34:02 -0500 Subject: [PATCH 05/13] IDEMPIERE-2131 List Validation allow same Name --- .../oracle/2015042711234_IDEMPIERE-2131.sql | 46 +++++++++++++++++++ .../2015042711234_IDEMPIERE-2131.sql | 43 +++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql create mode 100644 migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql diff --git a/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql b/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql new file mode 100644 index 0000000000..0dccf61edb --- /dev/null +++ b/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql @@ -0,0 +1,46 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE 2131 - List Validation allow same Name +-- Apr 27, 2015 12:23:21 PM CEST +INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex_UU,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,AD_Table_ID,IsCreateConstraint,IsUnique,Processing,TableIndexDrop,IsKey) VALUES (0,0,201034,'6ce794ab-6190-4691-a97c-a76abf645e23',TO_DATE('2015-04-27 12:23:20','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','ad_ref_list_name',TO_DATE('2015-04-27 12:23:20','YYYY-MM-DD HH24:MI:SS'),100,104,'N','Y','N','N','N') +; + +-- Apr 27, 2015 12:23:36 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201260,'815e5b09-1d18-40a4-8318-0f61812aa56b',TO_DATE('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_DATE('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,151,201034,10) +; + +-- Apr 27, 2015 12:23:42 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201261,'d4fb4782-2768-4897-b0b4-e8daee756311',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20) +; + +-- Apr 27, 2015 12:24:37 PM CEST +INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex_UU,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,AD_Table_ID,IsCreateConstraint,IsUnique,Processing,TableIndexDrop,IsKey) VALUES (0,0,201035,'2b1a6eed-7a54-44ef-85a7-c5f40836db2d',TO_DATE('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','ad_ref_list_trl_name',TO_DATE('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,136,'N','Y','N','N','N') +; + +-- Apr 27, 2015 12:24:48 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201262,'72671b8e-722e-4f2a-9788-ea3cfd90adaa',TO_DATE('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_DATE('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,336,201035,10) +; + +-- Apr 27, 2015 12:24:57 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201263,'c8f21da7-96f7-4daf-8c2b-a935c67deadb',TO_DATE('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_DATE('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,337,201035,20) +; + +-- Apr 27, 2015 12:25:04 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201264,'c33d3433-8fd7-44a2-b5a8-ccac81357cb4',TO_DATE('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_DATE('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,338,201035,30) +; + +-- Apr 27, 2015 12:25:07 PM CEST +UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_DATE('2015-04-27 12:25:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201262 +; + +-- Apr 27, 2015 12:29:37 PM CEST +UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_DATE('2015-04-27 12:29:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201260 +; + +-- Apr 27, 2015 12:29:40 PM CEST +UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_DATE('2015-04-27 12:29:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201261 +; + +SELECT register_migration_script('2015042711234_IDEMPIERE-2131.sql') FROM dual +; \ No newline at end of file diff --git a/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql b/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql new file mode 100644 index 0000000000..8921075e29 --- /dev/null +++ b/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql @@ -0,0 +1,43 @@ +-- IDEMPIERE 2131 - List Validation allow same Name +-- Apr 27, 2015 12:23:21 PM CEST +INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex_UU,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,AD_Table_ID,IsCreateConstraint,IsUnique,Processing,TableIndexDrop,IsKey) VALUES (0,0,201034,'6ce794ab-6190-4691-a97c-a76abf645e23',TO_TIMESTAMP('2015-04-27 12:23:20','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','ad_ref_list_name',TO_TIMESTAMP('2015-04-27 12:23:20','YYYY-MM-DD HH24:MI:SS'),100,104,'N','Y','N','N','N') +; + +-- Apr 27, 2015 12:23:36 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201260,'815e5b09-1d18-40a4-8318-0f61812aa56b',TO_TIMESTAMP('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_TIMESTAMP('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,151,201034,10) +; + +-- Apr 27, 2015 12:23:42 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201261,'d4fb4782-2768-4897-b0b4-e8daee756311',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20) +; + +-- Apr 27, 2015 12:24:37 PM CEST +INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex_UU,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,AD_Table_ID,IsCreateConstraint,IsUnique,Processing,TableIndexDrop,IsKey) VALUES (0,0,201035,'2b1a6eed-7a54-44ef-85a7-c5f40836db2d',TO_TIMESTAMP('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','ad_ref_list_trl_name',TO_TIMESTAMP('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,136,'N','Y','N','N','N') +; + +-- Apr 27, 2015 12:24:48 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201262,'72671b8e-722e-4f2a-9788-ea3cfd90adaa',TO_TIMESTAMP('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_TIMESTAMP('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,336,201035,10) +; + +-- Apr 27, 2015 12:24:57 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201263,'c8f21da7-96f7-4daf-8c2b-a935c67deadb',TO_TIMESTAMP('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_TIMESTAMP('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,337,201035,20) +; + +-- Apr 27, 2015 12:25:04 PM CEST +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201264,'c33d3433-8fd7-44a2-b5a8-ccac81357cb4',TO_TIMESTAMP('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_TIMESTAMP('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,338,201035,30) +; + +-- Apr 27, 2015 12:25:07 PM CEST +UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_TIMESTAMP('2015-04-27 12:25:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201262 +; + +-- Apr 27, 2015 12:29:37 PM CEST +UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_TIMESTAMP('2015-04-27 12:29:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201260 +; + +-- Apr 27, 2015 12:29:40 PM CEST +UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_TIMESTAMP('2015-04-27 12:29:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201261 +; + +SELECT register_migration_script('2015042711234_IDEMPIERE-2131.sql') FROM dual +; \ No newline at end of file From 2c5da3594b236b4af28ec44e4a46f0e88316e37e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 27 Apr 2015 14:35:10 -0500 Subject: [PATCH 06/13] IDEMPIERE-2131 List Validation allow same Name / peer review --- .../oracle/2015042711234_IDEMPIERE-2131.sql | 34 +++---------------- .../2015042711234_IDEMPIERE-2131.sql | 34 +++---------------- 2 files changed, 10 insertions(+), 58 deletions(-) diff --git a/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql b/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql index 0dccf61edb..ffa0ada44d 100644 --- a/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql +++ b/migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql @@ -7,40 +7,16 @@ INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex ; -- Apr 27, 2015 12:23:36 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201260,'815e5b09-1d18-40a4-8318-0f61812aa56b',TO_DATE('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_DATE('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,151,201034,10) +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201260,'815e5b09-1d18-40a4-8318-0f61812aa56b',TO_DATE('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_DATE('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,151,201034,10) ; -- Apr 27, 2015 12:23:42 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201261,'d4fb4782-2768-4897-b0b4-e8daee756311',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20) +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201261,'d4fb4782-2768-4897-b0b4-e8daee756311',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20) ; --- Apr 27, 2015 12:24:37 PM CEST -INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex_UU,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,AD_Table_ID,IsCreateConstraint,IsUnique,Processing,TableIndexDrop,IsKey) VALUES (0,0,201035,'2b1a6eed-7a54-44ef-85a7-c5f40836db2d',TO_DATE('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','ad_ref_list_trl_name',TO_DATE('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,136,'N','Y','N','N','N') -; - --- Apr 27, 2015 12:24:48 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201262,'72671b8e-722e-4f2a-9788-ea3cfd90adaa',TO_DATE('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_DATE('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,336,201035,10) -; - --- Apr 27, 2015 12:24:57 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201263,'c8f21da7-96f7-4daf-8c2b-a935c67deadb',TO_DATE('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_DATE('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,337,201035,20) -; - --- Apr 27, 2015 12:25:04 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201264,'c33d3433-8fd7-44a2-b5a8-ccac81357cb4',TO_DATE('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_DATE('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,338,201035,30) -; - --- Apr 27, 2015 12:25:07 PM CEST -UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_DATE('2015-04-27 12:25:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201262 -; - --- Apr 27, 2015 12:29:37 PM CEST -UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_DATE('2015-04-27 12:29:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201260 -; - --- Apr 27, 2015 12:29:40 PM CEST -UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_DATE('2015-04-27 12:29:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201261 +-- Apr 27, 2015 2:24:31 PM COT +CREATE UNIQUE INDEX ad_ref_list_name ON AD_Ref_List (AD_Reference_ID,Name) ; SELECT register_migration_script('2015042711234_IDEMPIERE-2131.sql') FROM dual -; \ No newline at end of file +; diff --git a/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql b/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql index 8921075e29..8c1c02c510 100644 --- a/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql +++ b/migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql @@ -4,40 +4,16 @@ INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex ; -- Apr 27, 2015 12:23:36 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201260,'815e5b09-1d18-40a4-8318-0f61812aa56b',TO_TIMESTAMP('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_TIMESTAMP('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,151,201034,10) +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201260,'815e5b09-1d18-40a4-8318-0f61812aa56b',TO_TIMESTAMP('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_TIMESTAMP('2015-04-27 12:23:36','YYYY-MM-DD HH24:MI:SS'),100,151,201034,10) ; -- Apr 27, 2015 12:23:42 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201261,'d4fb4782-2768-4897-b0b4-e8daee756311',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20) +INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201261,'d4fb4782-2768-4897-b0b4-e8daee756311',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20) ; --- Apr 27, 2015 12:24:37 PM CEST -INSERT INTO AD_TableIndex (AD_Client_ID,AD_Org_ID,AD_TableIndex_ID,AD_TableIndex_UU,Created,CreatedBy,EntityType,IsActive,Name,Updated,UpdatedBy,AD_Table_ID,IsCreateConstraint,IsUnique,Processing,TableIndexDrop,IsKey) VALUES (0,0,201035,'2b1a6eed-7a54-44ef-85a7-c5f40836db2d',TO_TIMESTAMP('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','ad_ref_list_trl_name',TO_TIMESTAMP('2015-04-27 12:24:37','YYYY-MM-DD HH24:MI:SS'),100,136,'N','Y','N','N','N') -; - --- Apr 27, 2015 12:24:48 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201262,'72671b8e-722e-4f2a-9788-ea3cfd90adaa',TO_TIMESTAMP('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,'U','Y',TO_TIMESTAMP('2015-04-27 12:24:48','YYYY-MM-DD HH24:MI:SS'),100,336,201035,10) -; - --- Apr 27, 2015 12:24:57 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201263,'c8f21da7-96f7-4daf-8c2b-a935c67deadb',TO_TIMESTAMP('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_TIMESTAMP('2015-04-27 12:24:56','YYYY-MM-DD HH24:MI:SS'),100,337,201035,20) -; - --- Apr 27, 2015 12:25:04 PM CEST -INSERT INTO AD_IndexColumn (AD_Client_ID,AD_Org_ID,AD_IndexColumn_ID,AD_IndexColumn_UU,Created,CreatedBy,EntityType,IsActive,Updated,UpdatedBy,AD_Column_ID,AD_TableIndex_ID,SeqNo) VALUES (0,0,201264,'c33d3433-8fd7-44a2-b5a8-ccac81357cb4',TO_TIMESTAMP('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,'D','Y',TO_TIMESTAMP('2015-04-27 12:25:03','YYYY-MM-DD HH24:MI:SS'),100,338,201035,30) -; - --- Apr 27, 2015 12:25:07 PM CEST -UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_TIMESTAMP('2015-04-27 12:25:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201262 -; - --- Apr 27, 2015 12:29:37 PM CEST -UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_TIMESTAMP('2015-04-27 12:29:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201260 -; - --- Apr 27, 2015 12:29:40 PM CEST -UPDATE AD_IndexColumn SET EntityType='D',Updated=TO_TIMESTAMP('2015-04-27 12:29:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_IndexColumn_ID=201261 +-- Apr 27, 2015 2:24:31 PM COT +CREATE UNIQUE INDEX ad_ref_list_name ON AD_Ref_List (AD_Reference_ID,Name) ; SELECT register_migration_script('2015042711234_IDEMPIERE-2131.sql') FROM dual -; \ No newline at end of file +; From 9f0809eb8dab946e1235cbb99b9d8091191ffdfb Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 29 Apr 2015 06:58:33 -0500 Subject: [PATCH 07/13] IDEMPIERE-581 Store divider location for window per user / fix issue with System user - thanks to Nicolas Micoud (nmicoud) --- .../WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index 96806e1772..36e078ced1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -1747,7 +1747,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer if (preference == null || preference.getAD_Preference_ID() <= 0) { preference = new MPreference(Env.getCtx(), 0, null); preference.setAD_Window_ID(windowId); - preference.setAD_User_ID(userId); + preference.set_ValueOfColumn("AD_User_ID", userId); // required set_Value for System=0 user preference.setAttribute(adTabId+"|DetailPane.Height"); } preference.setValue(height); From 75026fc7e5be21f6e7d998f4a35ecab70e340b12 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 4 May 2015 11:18:02 -0500 Subject: [PATCH 08/13] minor fix for start scripts in linux - Thanks to Juan Pablo Jaramillo Pineda for reporting https://groups.google.com/d/msg/idempiere-es/gs9WIeFwWF0/ixcWtWmbMWwJ --- .../utils.unix/unix/idempiere_Debian.sh | 2 +- org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh index a01fa9c198..431a703d7b 100644 --- a/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh +++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh @@ -47,7 +47,7 @@ start () { cd $IDEMPIERE_HOME/utils . $ENVFILE export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log - su $IDEMPIEREUSER -c "mkdir -p IDEMPIERE_HOME/log" + su $IDEMPIEREUSER -c "mkdir -p $IDEMPIERE_HOME/log" su $IDEMPIEREUSER -c "cd $IDEMPIERE_HOME;$IDEMPIERE_HOME/idempiere-server.sh &> $LOGFILE &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then diff --git a/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh index 2a9c7874e9..14b63b532f 100644 --- a/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh +++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh @@ -73,7 +73,7 @@ start () { cd $IDEMPIERE_HOME/utils . $ENVFILE export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log - su $IDEMPIEREUSER -c "mkdir -p IDEMPIERE_HOME/log" + su $IDEMPIEREUSER -c "mkdir -p $IDEMPIERE_HOME/log" su $IDEMPIEREUSER -c "cd $IDEMPIERE_HOME;$IDEMPIERE_HOME/idempiere-server.sh &> $LOGFILE &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then From 416b1ff658bab1d7c571e0707608160f98a249d0 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 May 2015 09:01:05 -0500 Subject: [PATCH 09/13] IDEMPIERE-581 Store divider location for window per user / IDEMPIERE-369 / thanks to Nicolas Micoud (nmicoud) --- .../WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index 36e078ced1..1fa2cc729f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -1113,7 +1113,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer if (preference == null || preference.getAD_Preference_ID() <= 0) { preference = new MPreference(Env.getCtx(), 0, null); preference.setAD_Window_ID(windowId); - preference.setAD_User_ID(userId); + preference.set_ValueOfColumn("AD_User_ID", userId); // required set_Value for System=0 user preference.setAttribute(adTabId+"|DetailPane.IsOpen"); } preference.setValue(value ? "Y" : "N"); From e79ca200a90fab8e2e1367fd53d648bf6fd41954 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 May 2015 12:03:01 -0500 Subject: [PATCH 10/13] IDEMPIERE-965 the create table process must also create the unique index for the UU column when found - fix issue with oracle index names longer than 30 char --- org.adempiere.base/src/org/compiere/model/MColumn.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java index d8b9e45c67..ba2a38bc85 100644 --- a/org.adempiere.base/src/org/compiere/model/MColumn.java +++ b/org.adempiere.base/src/org/compiere/model/MColumn.java @@ -604,9 +604,8 @@ public class MColumn extends X_AD_Column if (getColumnName().equals(PO.getUUIDColumnName(tableName))) { StringBuilder indexName = new StringBuilder().append(getColumnName()).append("_idx"); if (indexName.length() > 30) { - int i = indexName.length() - 31; - indexName = new StringBuilder().append(getColumnName().substring(0, getColumnName().length() - i)); - indexName.append("_uu_idx"); + indexName = new StringBuilder().append(getColumnName().substring(0, 25)); + indexName.append("uuidx"); } StringBuilder msgreturn = new StringBuilder("CONSTRAINT ").append(indexName).append(" UNIQUE (").append(getColumnName()).append(")"); return msgreturn.toString(); From aec225230da6c47b5e20ebed6cf92ebe48301421 Mon Sep 17 00:00:00 2001 From: sauljabin Date: Wed, 6 May 2015 12:19:39 -0500 Subject: [PATCH 11/13] IDEMPIERE-2609 WebServices - error to Complete Transaction in Composite Interface --- .../WEB-INF/src/org/idempiere/webservices/AbstractService.java | 3 ++- 1 file changed, 2 insertions(+), 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 63e577d11c..55073142c4 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 @@ -339,7 +339,8 @@ public class AbstractService { lookup.refresh(); NamePair pair = lookup.getDirect(po.get_Value(indCol), false, false); - outField.setText(pair.getName()); + if (pair != null) + outField.setText(pair.getName()); } } } From 686131b0f79fff1abee87e45a8e050b70d5fe073 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 May 2015 16:39:02 -0500 Subject: [PATCH 12/13] IDEMPIERE-1770 Allowing manual entry from Attributes tab on shipment/MR line - fix issue not allowing negative shipments --- org.adempiere.base/src/org/compiere/model/MInOut.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java index 705e327516..453297e100 100644 --- a/org.adempiere.base/src/org/compiere/model/MInOut.java +++ b/org.adempiere.base/src/org/compiere/model/MInOut.java @@ -1328,9 +1328,9 @@ public class MInOut extends X_M_InOut implements DocAction { BigDecimal movementQty = sLine.getMovementQty(); BigDecimal qtyOnLineMA = MInOutLineMA.getManualQty(sLine.getM_InOutLine_ID(), get_TrxName()); - - if(qtyOnLineMA.compareTo(movementQty)>0) - { + + if ( (movementQty.signum() != 0 && qtyOnLineMA.signum() != 0 && movementQty.signum() != qtyOnLineMA.signum()) // must have same sign + || (qtyOnLineMA.abs().compareTo(movementQty.abs())>0)) { // compare absolute values // More then line qty on attribute tab for line 10 m_processMsg = "@Over_Qty_On_Attribute_Tab@ " + sLine.getLine(); return DOCSTATUS_Invalid; From 395d6c5411f52f975c87150e547337a0b5ebf469 Mon Sep 17 00:00:00 2001 From: sauljabin Date: Wed, 6 May 2015 17:25:10 -0500 Subject: [PATCH 13/13] IDEMPIERE-2604 Use LIKE sentence in webservice queryData / integrate code by Jan Thielemann (jthielemann) https://www.youtube.com/watch?v=04V459i0vR4 --- .../idempiere/adinterface/ModelADServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java index a319536563..7e370c3ff0 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java @@ -44,6 +44,7 @@ import javax.xml.ws.WebServiceContext; import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.xmlbeans.StringEnumAbstractBase.Table; +import org.compiere.model.I_AD_Column; import org.compiere.model.Lookup; import org.compiere.model.MColumn; import org.compiere.model.MLookup; @@ -1454,7 +1455,16 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic { for (DataField field : modelCRUD.getDataRow().getFieldArray()) { if (m_webservicetype.isInputColumnNameAllowed(field.getColumn())) { - sqlquery += " AND " + field.getColumn() + "=?"; + + // Jan Thielemann Solution for query using the sentence like + X_WS_WebServiceFieldInput inputField = m_webservicetype.getFieldInput(field.getColumn()); + I_AD_Column col = inputField.getAD_Column(); + String sqlType = DisplayType.getSQLDataType(col.getAD_Reference_ID(), col.getColumnName(), col.getFieldLength()); + if(sqlType.contains("CHAR")) + sqlquery += " AND " + field.getColumn() + " LIKE ?"; + else + sqlquery += " AND " + field.getColumn() + "=?"; + // End Jan Thielemann Solution for query using the sentence like } else { throw new IdempiereServiceFault("Web service type " + m_webservicetype.getValue() + ": input column "