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

Merge bug fixes in release not committed to trunk 

merge -c 11561 -c 11581 -c 11582

11561 -> Fix [2962787] Recursion in PO.set_ValueNoCheckE
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2962787

11581 -> Fix [2948897] Fixed Assets Dictionary Errors - wrong reference to column A_Depreciation_Entry.A_Type_Entry
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2948897

11582 -> Fix [2948897] Fixed Assets Dictionary Errors - wrong reference on processed columns
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2948897
This commit is contained in:
tspc 2010-03-04 23:11:37 +00:00
parent f0915477fe
commit bb529d9197
5 changed files with 241 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/PO.java
View File

@ -940,7 +940,7 @@ public abstract class PO
*/
protected final boolean set_ValueNoCheckE (String ColumnName, Object value)
{
return set_ValueNoCheckE (ColumnName, value);
return set_ValueNoCheck (ColumnName, value);
} // set_ValueNoCheckE
/**

15
migration/354a-trunk/oracle/672_BF2948897.sql Normal file
View File

@ -0,0 +1,15 @@
-- Mar 4, 2010 1:33:05 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Tab SET WhereClause='A_Depreciation_Entry.A_Entry_Type=''DIS''',Updated=TO_DATE('2010-03-04 13:33:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53141
;
-- Mar 4, 2010 1:33:13 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Tab SET WhereClause='A_Depreciation_Entry.A_Entry_Type=''SPL''',Updated=TO_DATE('2010-03-04 13:33:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53151
;
-- Mar 4, 2010 1:33:21 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Tab SET WhereClause='A_Depreciation_Entry.A_Entry_Type=''TRN''',Updated=TO_DATE('2010-03-04 13:33:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53140
;

105
migration/354a-trunk/oracle/673_BF2948897.sql Normal file
View File

@ -0,0 +1,105 @@
-- Mar 4, 2010 1:54:35 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Reference_ID=20,Updated=TO_DATE('2010-03-04 13:54:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55347
;
-- Mar 4, 2010 1:55:33 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20,Updated=TO_DATE('2010-03-04 13:55:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55557
;
-- Mar 4, 2010 1:56:07 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation MODIFY Processed CHAR(1) DEFAULT 'Y'
;
-- Mar 4, 2010 1:56:08 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation SET Processed='Y' WHERE Processed IS NULL
;
-- Mar 4, 2010 1:56:28 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET DefaultValue='N',Updated=TO_DATE('2010-03-04 13:56:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55557
;
-- Mar 4, 2010 1:56:30 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Entry MODIFY Processed CHAR(1) DEFAULT 'N'
;
-- Mar 4, 2010 1:56:31 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation_Entry SET Processed='N' WHERE Processed IS NULL
;
-- Mar 4, 2010 1:56:58 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=53111, AD_Reference_ID=28,Updated=TO_DATE('2010-03-04 13:56:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55703
;
-- Mar 4, 2010 1:57:00 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Build MODIFY Processing CHAR(1) DEFAULT NULL
;
-- Mar 4, 2010 1:57:15 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20, DefaultValue='N',Updated=TO_DATE('2010-03-04 13:57:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55700
;
-- Mar 4, 2010 1:57:19 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Build MODIFY Processed CHAR(1) DEFAULT 'N'
;
-- Mar 4, 2010 1:58:11 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,Updated,UpdatedBy,Version) VALUES (0,59065,524,0,53123,28,53125,'Processing',TO_DATE('2010-03-04 13:58:09','YYYY-MM-DD HH24:MI:SS'),100,'D',1,'Y','Y','N','N','N','N','N','Y','N','N','Y','N','Y','Process Now',TO_DATE('2010-03-04 13:58:09','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Mar 4, 2010 1:58:11 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=59065 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Mar 4, 2010 1:58:36 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2010-03-04 13:58:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=59065
;
-- Mar 4, 2010 1:58:38 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Convention ADD Processing CHAR(1) DEFAULT NULL
;
-- Mar 4, 2010 1:58:51 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20, DefaultValue='N',Updated=TO_DATE('2010-03-04 13:58:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55736
;
-- Mar 4, 2010 1:58:54 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Convention MODIFY Processed CHAR(1) DEFAULT 'N'
;
-- Mar 4, 2010 1:58:54 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation_Convention SET Processed='N' WHERE Processed IS NULL
;
-- Mar 4, 2010 1:59:46 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20,Updated=TO_DATE('2010-03-04 13:59:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55747
;
-- Mar 4, 2010 1:59:49 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Method MODIFY Processed CHAR(1) DEFAULT 'Y'
;
-- Mar 4, 2010 1:59:49 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation_Method SET Processed='Y' WHERE Processed IS NULL
;

15
migration/354a-trunk/postgresql/672_BF2948897.sql Normal file
View File

@ -0,0 +1,15 @@
-- Mar 4, 2010 1:33:05 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Tab SET WhereClause='A_Depreciation_Entry.A_Entry_Type=''DIS''',Updated=TO_TIMESTAMP('2010-03-04 13:33:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53141
;
-- Mar 4, 2010 1:33:13 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Tab SET WhereClause='A_Depreciation_Entry.A_Entry_Type=''SPL''',Updated=TO_TIMESTAMP('2010-03-04 13:33:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53151
;
-- Mar 4, 2010 1:33:21 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Tab SET WhereClause='A_Depreciation_Entry.A_Entry_Type=''TRN''',Updated=TO_TIMESTAMP('2010-03-04 13:33:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53140
;

105
migration/354a-trunk/postgresql/673_BF2948897.sql Normal file
View File

@ -0,0 +1,105 @@
-- Mar 4, 2010 1:54:35 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Reference_ID=20,Updated=TO_TIMESTAMP('2010-03-04 13:54:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55347
;
-- Mar 4, 2010 1:55:33 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20,Updated=TO_TIMESTAMP('2010-03-04 13:55:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55557
;
-- Mar 4, 2010 1:56:07 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO t_alter_column values('a_depreciation','Processed','CHAR(1)',null,'Y')
;
-- Mar 4, 2010 1:56:08 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation SET Processed='Y' WHERE Processed IS NULL
;
-- Mar 4, 2010 1:56:28 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET DefaultValue='N',Updated=TO_TIMESTAMP('2010-03-04 13:56:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55557
;
-- Mar 4, 2010 1:56:30 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO t_alter_column values('a_depreciation_entry','Processed','CHAR(1)',null,'N')
;
-- Mar 4, 2010 1:56:31 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation_Entry SET Processed='N' WHERE Processed IS NULL
;
-- Mar 4, 2010 1:56:58 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=53111, AD_Reference_ID=28,Updated=TO_TIMESTAMP('2010-03-04 13:56:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55703
;
-- Mar 4, 2010 1:57:00 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO t_alter_column values('a_depreciation_build','Processing','CHAR(1)',null,'NULL')
;
-- Mar 4, 2010 1:57:15 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20, DefaultValue='N',Updated=TO_TIMESTAMP('2010-03-04 13:57:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55700
;
-- Mar 4, 2010 1:57:19 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO t_alter_column values('a_depreciation_build','Processed','CHAR(1)',null,'N')
;
-- Mar 4, 2010 1:58:11 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,Updated,UpdatedBy,Version) VALUES (0,59065,524,0,53123,28,53125,'Processing',TO_TIMESTAMP('2010-03-04 13:58:09','YYYY-MM-DD HH24:MI:SS'),100,'D',1,'Y','Y','N','N','N','N','N','Y','N','N','Y','N','Y','Process Now',TO_TIMESTAMP('2010-03-04 13:58:09','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Mar 4, 2010 1:58:11 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=59065 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Mar 4, 2010 1:58:36 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2010-03-04 13:58:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=59065
;
-- Mar 4, 2010 1:58:38 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
ALTER TABLE A_Depreciation_Convention ADD COLUMN Processing CHAR(1) DEFAULT NULL
;
-- Mar 4, 2010 1:58:51 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20, DefaultValue='N',Updated=TO_TIMESTAMP('2010-03-04 13:58:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55736
;
-- Mar 4, 2010 1:58:54 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO t_alter_column values('a_depreciation_convention','Processed','CHAR(1)',null,'N')
;
-- Mar 4, 2010 1:58:54 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation_Convention SET Processed='N' WHERE Processed IS NULL
;
-- Mar 4, 2010 1:59:46 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE AD_Column SET AD_Process_ID=NULL, AD_Reference_ID=20,Updated=TO_TIMESTAMP('2010-03-04 13:59:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55747
;
-- Mar 4, 2010 1:59:49 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
INSERT INTO t_alter_column values('a_depreciation_method','Processed','CHAR(1)',null,'Y')
;
-- Mar 4, 2010 1:59:49 PM COT
-- BF2948897_Fixed Assets Dictionary Errors
UPDATE A_Depreciation_Method SET Processed='Y' WHERE Processed IS NULL
;