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

hg merge release-2.1 (merge release2.1 into development)

This commit is contained in:
Carlos Ruiz 2015-05-06 19:55:36 -05:00
parent 272fbea5e2 395d6c5411
commit e2ea5989e3
13 changed files with 388 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
migration/i2.1/oracle/201504251243_IDEMPIERE-2598.sql Normal file
View File

@ -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
;

22
migration/i2.1/oracle/2015042711234_IDEMPIERE-2131.sql Normal file
View File

@ -0,0 +1,22 @@
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,'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,'D','Y',TO_DATE('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20)
;
-- 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
;

152
migration/i2.1/postgresql/201504251243_IDEMPIERE-2598.sql Normal file
View File

@ -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
;

19
migration/i2.1/postgresql/2015042711234_IDEMPIERE-2131.sql Normal file
View File

@ -0,0 +1,19 @@
-- 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,'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,'D','Y',TO_TIMESTAMP('2015-04-27 12:23:41','YYYY-MM-DD HH24:MI:SS'),100,149,201034,20)
;
-- 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
;

5
org.adempiere.base/src/org/compiere/model/MColumn.java
View File

@ -604,9 +604,8 @@ public class MColumn extends X_AD_Column
if (getColumnName().equals(PO.getUUIDColumnName(tableName))) { if (getColumnName().equals(PO.getUUIDColumnName(tableName))) {
StringBuilder indexName = new StringBuilder().append(getColumnName()).append("_idx"); StringBuilder indexName = new StringBuilder().append(getColumnName()).append("_idx");
if (indexName.length() > 30) { if (indexName.length() > 30) {
int i = indexName.length() - 31; indexName = new StringBuilder().append(getColumnName().substring(0, 25));
indexName = new StringBuilder().append(getColumnName().substring(0, getColumnName().length() - i)); indexName.append("uuidx");
indexName.append("_uu_idx");
} }
StringBuilder msgreturn = new StringBuilder("CONSTRAINT ").append(indexName).append(" UNIQUE (").append(getColumnName()).append(")"); StringBuilder msgreturn = new StringBuilder("CONSTRAINT ").append(indexName).append(" UNIQUE (").append(getColumnName()).append(")");
return msgreturn.toString(); return msgreturn.toString();

6
org.adempiere.base/src/org/compiere/model/MInOut.java
View File

@ -1328,9 +1328,9 @@ public class MInOut extends X_M_InOut implements DocAction
{ {
BigDecimal movementQty = sLine.getMovementQty(); BigDecimal movementQty = sLine.getMovementQty();
BigDecimal qtyOnLineMA = MInOutLineMA.getManualQty(sLine.getM_InOutLine_ID(), get_TrxName()); 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 // More then line qty on attribute tab for line 10
m_processMsg = "@Over_Qty_On_Attribute_Tab@ " + sLine.getLine(); m_processMsg = "@Over_Qty_On_Attribute_Tab@ " + sLine.getLine();
return DOCSTATUS_Invalid; return DOCSTATUS_Invalid;

1
org.adempiere.base/src/org/compiere/print/DataEngine.java
View File

@ -172,6 +172,7 @@ public class DataEngine
// Add WhereClause restriction from AD_ReportView - teo_sarca BF [ 1761891 ] // 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 (!Util.isEmpty(whereClause)) {
whereClause = "(" + whereClause + ")"; // IDEMPIERE-2597
if (whereClause.indexOf("@") == -1) { if (whereClause.indexOf("@") == -1) {
queryCopy.addRestriction(whereClause); queryCopy.addRestriction(whereClause);
} else { // replace context variables } else { // replace context variables

2
org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh
View File

@ -47,7 +47,7 @@ start () {
cd $IDEMPIERE_HOME/utils cd $IDEMPIERE_HOME/utils
. $ENVFILE . $ENVFILE
export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log 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 &" su $IDEMPIEREUSER -c "cd $IDEMPIERE_HOME;$IDEMPIERE_HOME/idempiere-server.sh &> $LOGFILE &"
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ] ; then if [ $RETVAL -eq 0 ] ; then

2
org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh
View File

@ -73,7 +73,7 @@ start () {
cd $IDEMPIERE_HOME/utils cd $IDEMPIERE_HOME/utils
. $ENVFILE . $ENVFILE
export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log 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 &" su $IDEMPIEREUSER -c "cd $IDEMPIERE_HOME;$IDEMPIERE_HOME/idempiere-server.sh &> $LOGFILE &"
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ] ; then if [ $RETVAL -eq 0 ] ; then

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -1114,7 +1114,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
if (preference == null || preference.getAD_Preference_ID() <= 0) { if (preference == null || preference.getAD_Preference_ID() <= 0) {
preference = new MPreference(Env.getCtx(), 0, null); preference = new MPreference(Env.getCtx(), 0, null);
preference.setAD_Window_ID(windowId); 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.setAttribute(adTabId+"|DetailPane.IsOpen");
} }
preference.setValue(value ? "Y" : "N"); preference.setValue(value ? "Y" : "N");
@ -1752,7 +1752,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
if (preference == null || preference.getAD_Preference_ID() <= 0) { if (preference == null || preference.getAD_Preference_ID() <= 0) {
preference = new MPreference(Env.getCtx(), 0, null); preference = new MPreference(Env.getCtx(), 0, null);
preference.setAD_Window_ID(windowId); 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.setAttribute(adTabId+"|DetailPane.Height");
} }
preference.setValue(height); preference.setValue(height);

66
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
View File

@ -159,6 +159,7 @@ public class WAttachment extends Window implements EventListener<Event>
if (log.isLoggable(Level.CONFIG)) log.config("ID=" + AD_Attachment_ID + ", Table=" + AD_Table_ID + ", Record=" + Record_ID); if (log.isLoggable(Level.CONFIG)) log.config("ID=" + AD_Attachment_ID + ", Table=" + AD_Table_ID + ", Record=" + Record_ID);
m_WindowNo = WindowNo; m_WindowNo = WindowNo;
this.addEventListener(DialogEvents.ON_WINDOW_CLOSE, this);
if (eventListener != null) if (eventListener != null)
{ {
this.addEventListener(DialogEvents.ON_WINDOW_CLOSE, eventListener); this.addEventListener(DialogEvents.ON_WINDOW_CLOSE, eventListener);
@ -474,85 +475,52 @@ public class WAttachment extends Window implements EventListener<Event>
public void onEvent(Event e) public void onEvent(Event e)
{ {
// Save and Close // Save and Close
if (e instanceof UploadEvent) {
if (e instanceof UploadEvent)
{
preview.setVisible(false); preview.setVisible(false);
UploadEvent ue = (UploadEvent) e; UploadEvent ue = (UploadEvent) e;
processUploadMedia(ue.getMedia()); processUploadMedia(ue.getMedia());
} } else if (e.getTarget() == bOk || DialogEvents.ON_WINDOW_CLOSE.equals(e.getName())) {
else if (e.getTarget() == bOk)
{
String newText = text.getText(); String newText = text.getText();
if (newText == null) if (newText == null)
newText = ""; newText = "";
String oldText = m_attachment.getTextMsg(); String oldText = m_attachment.getTextMsg();
if (oldText == null) if (oldText == null)
oldText = ""; oldText = "";
if (!m_change) if (!m_change)
m_change = !newText.equals(oldText); m_change = !newText.equals(oldText);
if (newText.length() > 0 || m_attachment.getEntryCount() > 0) if (newText.length() > 0 || m_attachment.getEntryCount() > 0) {
{ if (m_change) {
if (m_change)
{
m_attachment.setBinaryData(new byte[0]); // ATTENTION! HEAVY HACK HERE... Else it will not save :( m_attachment.setBinaryData(new byte[0]); // ATTENTION! HEAVY HACK HERE... Else it will not save :(
m_attachment.setTextMsg(text.getText()); m_attachment.setTextMsg(text.getText());
m_attachment.saveEx(); m_attachment.saveEx();
} }
} } else {
else
{
m_attachment.delete(true); m_attachment.delete(true);
m_attachment = null; m_attachment = null;
} }
dispose(); dispose();
} } else if (e.getTarget() == bCancel) {
// Cancel
// Cancel
else if (e.getTarget() == bCancel)
{
dispose(); dispose();
} } else if (e.getTarget() == bDeleteAll) {
// Delete Attachment
// Delete Attachment
else if (e.getTarget() == bDeleteAll)
{
deleteAttachment(); deleteAttachment();
dispose(); dispose();
} } else if (e.getTarget() == bDelete) {
// Delete individual entry and Return
// Delete individual entry and Return
else if (e.getTarget() == bDelete)
deleteAttachmentEntry(); deleteAttachmentEntry();
} else if (e.getTarget() == cbContent) {
// Show Data // Show Data
else if (e.getTarget() == cbContent)
{
clearPreview(); clearPreview();
autoPreview (cbContent.getSelectedIndex(), false); autoPreview (cbContent.getSelectedIndex(), false);
} } else if (e.getTarget() == bSave) {
// Open Attachment
// Open Attachment
else if (e.getTarget() == bSave)
saveAttachmentToFile(); saveAttachmentToFile();
} else if (e.getTarget() == bRefresh) {
else if (e.getTarget() == bRefresh)
displayData(cbContent.getSelectedIndex(), true); displayData(cbContent.getSelectedIndex(), true);
else if (e instanceof UploadEvent)
{
UploadEvent ue = (UploadEvent) e;
processUploadMedia(ue.getMedia());
} }
} // onEvent } // onEvent

12
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java
View File

@ -44,6 +44,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.xmlbeans.StringEnumAbstractBase.Table; import org.apache.xmlbeans.StringEnumAbstractBase.Table;
import org.compiere.model.I_AD_Column;
import org.compiere.model.Lookup; import org.compiere.model.Lookup;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MLookup; import org.compiere.model.MLookup;
@ -1454,7 +1455,16 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
{ {
for (DataField field : modelCRUD.getDataRow().getFieldArray()) { for (DataField field : modelCRUD.getDataRow().getFieldArray()) {
if (m_webservicetype.isInputColumnNameAllowed(field.getColumn())) { 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 { } else {
throw new IdempiereServiceFault("Web service type " throw new IdempiereServiceFault("Web service type "
+ m_webservicetype.getValue() + ": input column " + m_webservicetype.getValue() + ": input column "

3
org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
View File

@ -339,7 +339,8 @@ public class AbstractService {
lookup.refresh(); lookup.refresh();
NamePair pair = lookup.getDirect(po.get_Value(indCol), false, false); NamePair pair = lookup.getDirect(po.get_Value(indCol), false, false);
outField.setText(pair.getName()); if (pair != null)
outField.setText(pair.getName());
} }
} }
} }