hg merge release-2.1 (merge release2.1 into development)
This commit is contained in:
commit
cd04126891
|
@ -0,0 +1,35 @@
|
||||||
|
SET SQLBLANKLINES ON
|
||||||
|
SET DEFINE OFF
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:15:04 PM COT
|
||||||
|
-- IDEMPIERE-500 Error on fields / tabs
|
||||||
|
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160, XPosition=2,Updated=TO_DATE('2015-01-10 17:15:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62871
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:36 PM COT
|
||||||
|
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=20, XPosition=4,Updated=TO_DATE('2015-01-10 17:16:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59624
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:36 PM COT
|
||||||
|
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=40, XPosition=1,Updated=TO_DATE('2015-01-10 17:16:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59629
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=60,Updated=TO_DATE('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59628
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=70,Updated=TO_DATE('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59631
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=80,Updated=TO_DATE('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59630
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=90,Updated=TO_DATE('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59626
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101717_IDEMPIERE-500.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
SET SQLBLANKLINES ON
|
||||||
|
SET DEFINE OFF
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:23:47 PM COT
|
||||||
|
-- IDEMPIERE-1413 User Substitute list must show just tenant users
|
||||||
|
UPDATE AD_Tab SET IsAdvancedTab='Y',Updated=TO_DATE('2015-01-10 17:23:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=573
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:25:45 PM COT
|
||||||
|
UPDATE AD_Column SET AD_Val_Rule_ID=200052,Updated=TO_DATE('2015-01-10 17:25:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10412
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:28:21 PM COT
|
||||||
|
UPDATE AD_Val_Rule SET Name='AD_User with role on Client',Updated=TO_DATE('2015-01-10 17:28:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200052
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:28:50 PM COT
|
||||||
|
INSERT INTO AD_Val_Rule (AD_Val_Rule_ID,Name,Type,Code,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Val_Rule_UU) VALUES (200066,'AD_User of Client with role on Client','S','AD_User.AD_Client_ID=@#AD_Client_ID@ AND AD_User.AD_User_ID IN (SELECT AD_User_ID FROM AD_User_Roles WHERE IsActive=''Y'' AND AD_User_Roles.AD_Client_ID=@#AD_Client_ID@)',0,0,'Y',TO_DATE('2015-01-10 17:28:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2015-01-10 17:28:50','YYYY-MM-DD HH24:MI:SS'),100,'D','24b4843c-bd1c-41ae-958b-0e6a86d7ff47')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:28:59 PM COT
|
||||||
|
UPDATE AD_Column SET AD_Val_Rule_ID=200066,Updated=TO_DATE('2015-01-10 17:28:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10412
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101729_IDEMPIERE-1413.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,112 @@
|
||||||
|
-- Oct 21, 2010 12:48:27 PM COT
|
||||||
|
-- Default Housekeeping for T_ tables
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50000,0,631,TO_DATE('2010-10-21 12:48:25','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Aging records preserving last week','N',TO_DATE('2010-10-21 12:48:25','YYYY-MM-DD HH24:MI:SS'),100,'T_Aging','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:49:46 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50002,0,478,TO_DATE('2010-10-21 12:49:45','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_InventoryValue records preserving last week','N',TO_DATE('2010-10-21 12:49:45','YYYY-MM-DD HH24:MI:SS'),100,'T_InventoryValue','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:50:13 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50003,0,803,TO_DATE('2010-10-21 12:50:12','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_InvoiceGL records preserving last week','N',TO_DATE('2010-10-21 12:50:12','YYYY-MM-DD HH24:MI:SS'),100,'T_InvoiceGL','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:50:40 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50004,0,364,TO_DATE('2010-10-21 12:50:40','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Replenish records preserving last week','N',TO_DATE('2010-10-21 12:50:40','YYYY-MM-DD HH24:MI:SS'),100,'T_Replenish','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:50:53 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50005,0,545,TO_DATE('2010-10-21 12:50:52','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_ReportStatement records preserving last week','N',TO_DATE('2010-10-21 12:50:52','YYYY-MM-DD HH24:MI:SS'),100,'T_ReportStatement','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:51:06 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50006,0,544,TO_DATE('2010-10-21 12:51:05','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Report records preserving last week','N',TO_DATE('2010-10-21 12:51:05','YYYY-MM-DD HH24:MI:SS'),100,'T_Report','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:51:29 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50007,0,365,TO_DATE('2010-10-21 12:51:25','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Spool records preserving last 2 days','N',TO_DATE('2010-10-21 12:51:25','YYYY-MM-DD HH24:MI:SS'),100,'T_Spool','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 2)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:51:56 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50008,0,758,TO_DATE('2010-10-21 12:51:55','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Transaction records preserving last week','N',TO_DATE('2010-10-21 12:51:55','YYYY-MM-DD HH24:MI:SS'),100,'T_Transaction','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:52:13 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50009,0,753,TO_DATE('2010-10-21 12:52:09','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_TrialBalance records preserving last week','N',TO_DATE('2010-10-21 12:52:09','YYYY-MM-DD HH24:MI:SS'),100,'T_TrialBalance','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:54:40 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50000,TO_DATE('2010-10-21 12:54:36','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Aging','N','F',0,TO_DATE('2010-10-21 12:54:36','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:02 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50002,TO_DATE('2010-10-21 12:54:58','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_InventoryValue','N','F',0,TO_DATE('2010-10-21 12:54:58','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:10 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50003,TO_DATE('2010-10-21 12:55:09','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_InvoiceGL','N','F',0,TO_DATE('2010-10-21 12:55:09','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:21 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50004,TO_DATE('2010-10-21 12:55:16','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Replenish','N','F',0,TO_DATE('2010-10-21 12:55:16','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:31 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50005,TO_DATE('2010-10-21 12:55:30','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_ReportStatement','N','F',0,TO_DATE('2010-10-21 12:55:30','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:41 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50006,TO_DATE('2010-10-21 12:55:40','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Report','N','F',0,TO_DATE('2010-10-21 12:55:40','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:48 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50007,TO_DATE('2010-10-21 12:55:48','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Spool','N','F',0,TO_DATE('2010-10-21 12:55:48','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:55 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50008,TO_DATE('2010-10-21 12:55:54','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Transaction','N','F',0,TO_DATE('2010-10-21 12:55:54','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:56:05 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (0,0,53154,50009,TO_DATE('2010-10-21 12:56:01','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_TrialBalance','N','F',0,TO_DATE('2010-10-21 12:56:01','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:56:42 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50000,TO_DATE('2010-10-21 12:56:42','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Aging','Y','50000',TO_DATE('2010-10-21 12:56:42','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:57:40 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50002,TO_DATE('2010-10-21 12:57:40','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_InventoryValue','Y','50002',TO_DATE('2010-10-21 12:57:40','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:57:58 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50003,TO_DATE('2010-10-21 12:57:58','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_InvoiceGL','Y','50003',TO_DATE('2010-10-21 12:57:58','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:58:37 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50004,TO_DATE('2010-10-21 12:58:37','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Replenish','Y','50004',TO_DATE('2010-10-21 12:58:37','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:58:58 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50006,TO_DATE('2010-10-21 12:58:58','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Report','Y','50006',TO_DATE('2010-10-21 12:58:58','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:59:17 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50005,TO_DATE('2010-10-21 12:59:17','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_ReportStatement','Y','50005',TO_DATE('2010-10-21 12:59:17','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:59:34 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50007,TO_DATE('2010-10-21 12:59:34','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Spool','Y','50007',TO_DATE('2010-10-21 12:59:34','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:59:54 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50008,TO_DATE('2010-10-21 12:59:54','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Transaction','Y','50008',TO_DATE('2010-10-21 12:59:54','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 1:00:11 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50009,TO_DATE('2010-10-21 13:00:11','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_TrialBalance','Y','50009',TO_DATE('2010-10-21 13:00:11','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101757_IDEMPIERE-1509.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
SET SQLBLANKLINES ON
|
||||||
|
SET DEFINE OFF
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:06:59 PM COT
|
||||||
|
-- IDEMPIERE-1594 Prospect defaults to Y wrongly
|
||||||
|
UPDATE AD_Column SET DefaultValue='N',Updated=TO_DATE('2015-01-10 18:06:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2918
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:07:02 PM COT
|
||||||
|
ALTER TABLE C_BPartner MODIFY IsProspect CHAR(1) DEFAULT 'N'
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:07:03 PM COT
|
||||||
|
UPDATE C_BPartner SET IsProspect='N' WHERE IsProspect IS NULL
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101807_IDEMPIERE-1594.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
SET SQLBLANKLINES ON
|
||||||
|
SET DEFINE OFF
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:09:35 PM COT
|
||||||
|
-- IDEMPIERE-1596 Interest Area cannot be subscribed/unsubscribed in zkwebui
|
||||||
|
UPDATE AD_Field SET IsReadOnly='N',Updated=TO_DATE('2015-01-10 18:09:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5880
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:09:38 PM COT
|
||||||
|
UPDATE AD_Field SET IsReadOnly='N',Updated=TO_DATE('2015-01-10 18:09:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5877
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:11:10 PM COT
|
||||||
|
UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2015-01-10 18:11:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7769
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:11:22 PM COT
|
||||||
|
UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2015-01-10 18:11:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7765
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101812_IDEMPIERE-1596.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
-- Jan 10, 2015 5:15:04 PM COT
|
||||||
|
-- IDEMPIERE-500 Error on fields / tabs
|
||||||
|
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=160, XPosition=2,Updated=TO_TIMESTAMP('2015-01-10 17:15:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62871
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:36 PM COT
|
||||||
|
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=20, XPosition=4,Updated=TO_TIMESTAMP('2015-01-10 17:16:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59624
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:36 PM COT
|
||||||
|
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=40, XPosition=1,Updated=TO_TIMESTAMP('2015-01-10 17:16:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59629
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=60,Updated=TO_TIMESTAMP('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59628
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=70,Updated=TO_TIMESTAMP('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59631
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=80,Updated=TO_TIMESTAMP('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59630
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:16:37 PM COT
|
||||||
|
UPDATE AD_Field SET SeqNo=90,Updated=TO_TIMESTAMP('2015-01-10 17:16:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59626
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101717_IDEMPIERE-500.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
-- Jan 10, 2015 5:23:47 PM COT
|
||||||
|
-- IDEMPIERE-1413 User Substitute list must show just tenant users
|
||||||
|
UPDATE AD_Tab SET IsAdvancedTab='Y',Updated=TO_TIMESTAMP('2015-01-10 17:23:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=573
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:25:45 PM COT
|
||||||
|
UPDATE AD_Column SET AD_Val_Rule_ID=200052,Updated=TO_TIMESTAMP('2015-01-10 17:25:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10412
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:28:21 PM COT
|
||||||
|
UPDATE AD_Val_Rule SET Name='AD_User with role on Client',Updated=TO_TIMESTAMP('2015-01-10 17:28:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200052
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:28:50 PM COT
|
||||||
|
INSERT INTO AD_Val_Rule (AD_Val_Rule_ID,Name,Type,Code,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Val_Rule_UU) VALUES (200066,'AD_User of Client with role on Client','S','AD_User.AD_Client_ID=@#AD_Client_ID@ AND AD_User.AD_User_ID IN (SELECT AD_User_ID FROM AD_User_Roles WHERE IsActive=''Y'' AND AD_User_Roles.AD_Client_ID=@#AD_Client_ID@)',0,0,'Y',TO_TIMESTAMP('2015-01-10 17:28:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2015-01-10 17:28:50','YYYY-MM-DD HH24:MI:SS'),100,'D','24b4843c-bd1c-41ae-958b-0e6a86d7ff47')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 5:28:59 PM COT
|
||||||
|
UPDATE AD_Column SET AD_Val_Rule_ID=200066,Updated=TO_TIMESTAMP('2015-01-10 17:28:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10412
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101729_IDEMPIERE-1413.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,112 @@
|
||||||
|
-- Oct 21, 2010 12:48:27 PM COT
|
||||||
|
-- Default Housekeeping for T_ tables
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50000,0,631,TO_TIMESTAMP('2010-10-21 12:48:25','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Aging records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:48:25','YYYY-MM-DD HH24:MI:SS'),100,'T_Aging','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:49:46 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50002,0,478,TO_TIMESTAMP('2010-10-21 12:49:45','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_InventoryValue records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:49:45','YYYY-MM-DD HH24:MI:SS'),100,'T_InventoryValue','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:50:13 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50003,0,803,TO_TIMESTAMP('2010-10-21 12:50:12','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_InvoiceGL records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:50:12','YYYY-MM-DD HH24:MI:SS'),100,'T_InvoiceGL','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:50:40 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50004,0,364,TO_TIMESTAMP('2010-10-21 12:50:40','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Replenish records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:50:40','YYYY-MM-DD HH24:MI:SS'),100,'T_Replenish','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:50:53 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50005,0,545,TO_TIMESTAMP('2010-10-21 12:50:52','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_ReportStatement records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:50:52','YYYY-MM-DD HH24:MI:SS'),100,'T_ReportStatement','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:51:06 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50006,0,544,TO_TIMESTAMP('2010-10-21 12:51:05','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Report records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:51:05','YYYY-MM-DD HH24:MI:SS'),100,'T_Report','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:51:29 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50007,0,365,TO_TIMESTAMP('2010-10-21 12:51:25','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Spool records preserving last 2 days','N',TO_TIMESTAMP('2010-10-21 12:51:25','YYYY-MM-DD HH24:MI:SS'),100,'T_Spool','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 2)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:51:56 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50008,0,758,TO_TIMESTAMP('2010-10-21 12:51:55','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_Transaction records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:51:55','YYYY-MM-DD HH24:MI:SS'),100,'T_Transaction','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:52:13 PM COT
|
||||||
|
INSERT INTO AD_HouseKeeping (AD_Client_ID,AD_HouseKeeping_ID,AD_Org_ID,AD_Table_ID,Created,CreatedBy,IsActive,IsExportXMLBackup,IsSaveInHistoric,LastDeleted,Name,Processing,Updated,UpdatedBy,Value,WhereClause) VALUES (0,50009,0,753,TO_TIMESTAMP('2010-10-21 12:52:09','YYYY-MM-DD HH24:MI:SS'),100,'Y','N','N',0,'Delete T_TrialBalance records preserving last week','N',TO_TIMESTAMP('2010-10-21 12:52:09','YYYY-MM-DD HH24:MI:SS'),100,'T_TrialBalance','AD_PInstance_ID IN (SELECT AD_PInstance_ID FROM AD_PInstance WHERE Created <= SYSDATE - 7)')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:54:40 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50000,TO_TIMESTAMP('2010-10-21 12:54:36','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Aging','N','F',0,TO_TIMESTAMP('2010-10-21 12:54:36','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:02 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50002,TO_TIMESTAMP('2010-10-21 12:54:58','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_InventoryValue','N','F',0,TO_TIMESTAMP('2010-10-21 12:54:58','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:10 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50003,TO_TIMESTAMP('2010-10-21 12:55:09','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_InvoiceGL','N','F',0,TO_TIMESTAMP('2010-10-21 12:55:09','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:21 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50004,TO_TIMESTAMP('2010-10-21 12:55:16','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Replenish','N','F',0,TO_TIMESTAMP('2010-10-21 12:55:16','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:31 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50005,TO_TIMESTAMP('2010-10-21 12:55:30','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_ReportStatement','N','F',0,TO_TIMESTAMP('2010-10-21 12:55:30','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:41 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50006,TO_TIMESTAMP('2010-10-21 12:55:40','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Report','N','F',0,TO_TIMESTAMP('2010-10-21 12:55:40','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:48 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50007,TO_TIMESTAMP('2010-10-21 12:55:48','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Spool','N','F',0,TO_TIMESTAMP('2010-10-21 12:55:48','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:55:55 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50008,TO_TIMESTAMP('2010-10-21 12:55:54','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_Transaction','N','F',0,TO_TIMESTAMP('2010-10-21 12:55:54','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:56:05 PM COT
|
||||||
|
INSERT INTO AD_Scheduler (AD_Schedule_ID, AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Scheduler_ID,Created,CreatedBy,Frequency,FrequencyType,IsActive,IsIgnoreProcessingTime,KeepLogDays,Name,Processing,ScheduleType,Supervisor_ID,Updated,UpdatedBy) VALUES (200001, 0,0,53154,50009,TO_TIMESTAMP('2010-10-21 12:56:01','YYYY-MM-DD HH24:MI:SS'),100,1,'D','Y','N',7,'Housekeeping T_TrialBalance','N','F',0,TO_TIMESTAMP('2010-10-21 12:56:01','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:56:42 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50000,TO_TIMESTAMP('2010-10-21 12:56:42','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Aging','Y','50000',TO_TIMESTAMP('2010-10-21 12:56:42','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:57:40 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50002,TO_TIMESTAMP('2010-10-21 12:57:40','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_InventoryValue','Y','50002',TO_TIMESTAMP('2010-10-21 12:57:40','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:57:58 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50003,TO_TIMESTAMP('2010-10-21 12:57:58','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_InvoiceGL','Y','50003',TO_TIMESTAMP('2010-10-21 12:57:58','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:58:37 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50004,TO_TIMESTAMP('2010-10-21 12:58:37','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Replenish','Y','50004',TO_TIMESTAMP('2010-10-21 12:58:37','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:58:58 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50006,TO_TIMESTAMP('2010-10-21 12:58:58','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Report','Y','50006',TO_TIMESTAMP('2010-10-21 12:58:58','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:59:17 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50005,TO_TIMESTAMP('2010-10-21 12:59:17','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_ReportStatement','Y','50005',TO_TIMESTAMP('2010-10-21 12:59:17','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:59:34 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50007,TO_TIMESTAMP('2010-10-21 12:59:34','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Spool','Y','50007',TO_TIMESTAMP('2010-10-21 12:59:34','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 12:59:54 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50008,TO_TIMESTAMP('2010-10-21 12:59:54','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_Transaction','Y','50008',TO_TIMESTAMP('2010-10-21 12:59:54','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Oct 21, 2010 1:00:11 PM COT
|
||||||
|
INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,Description,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53257,50009,TO_TIMESTAMP('2010-10-21 13:00:11','YYYY-MM-DD HH24:MI:SS'),100,'AD_HouseKeeping_ID=T_TrialBalance','Y','50009',TO_TIMESTAMP('2010-10-21 13:00:11','YYYY-MM-DD HH24:MI:SS'),100)
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101757_IDEMPIERE-1509.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
-- Jan 10, 2015 6:06:59 PM COT
|
||||||
|
-- IDEMPIERE-1594 Prospect defaults to Y wrongly
|
||||||
|
UPDATE AD_Column SET DefaultValue='N',Updated=TO_TIMESTAMP('2015-01-10 18:06:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=2918
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:07:02 PM COT
|
||||||
|
INSERT INTO t_alter_column values('c_bpartner','IsProspect','CHAR(1)',null,'N')
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:07:03 PM COT
|
||||||
|
UPDATE C_BPartner SET IsProspect='N' WHERE IsProspect IS NULL
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101807_IDEMPIERE-1594.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
-- Jan 10, 2015 6:09:35 PM COT
|
||||||
|
-- IDEMPIERE-1596 Interest Area cannot be subscribed/unsubscribed in zkwebui
|
||||||
|
UPDATE AD_Field SET IsReadOnly='N',Updated=TO_TIMESTAMP('2015-01-10 18:09:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5880
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:09:38 PM COT
|
||||||
|
UPDATE AD_Field SET IsReadOnly='N',Updated=TO_TIMESTAMP('2015-01-10 18:09:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5877
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:11:10 PM COT
|
||||||
|
UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2015-01-10 18:11:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7769
|
||||||
|
;
|
||||||
|
|
||||||
|
-- Jan 10, 2015 6:11:22 PM COT
|
||||||
|
UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2015-01-10 18:11:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7765
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201501101812_IDEMPIERE-1596.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -437,20 +437,23 @@ public class MJournal extends X_GL_Journal implements DocAction
|
||||||
return DocAction.STATUS_Invalid;
|
return DocAction.STATUS_Invalid;
|
||||||
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
|
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
|
||||||
|
|
||||||
// Get Period
|
// Get Period
|
||||||
MPeriod period = MPeriod.get (getCtx(), getDateAcct(), getAD_Org_ID(), get_TrxName());
|
MPeriod period = (MPeriod) getC_Period();
|
||||||
if (period == null)
|
if (! period.isInPeriod(getDateAcct())) {
|
||||||
{
|
period = MPeriod.get (getCtx(), getDateAcct(), getAD_Org_ID(), get_TrxName());
|
||||||
log.warning("No Period for " + getDateAcct());
|
if (period == null)
|
||||||
m_processMsg = "@PeriodNotFound@";
|
{
|
||||||
return DocAction.STATUS_Invalid;
|
log.warning("No Period for " + getDateAcct());
|
||||||
}
|
m_processMsg = "@PeriodNotFound@";
|
||||||
// Standard Period
|
return DocAction.STATUS_Invalid;
|
||||||
if (period.getC_Period_ID() != getC_Period_ID()
|
}
|
||||||
&& period.isStandardPeriod())
|
// Standard Period
|
||||||
{
|
if (period.getC_Period_ID() != getC_Period_ID()
|
||||||
m_processMsg = "@PeriodNotValid@";
|
&& period.isStandardPeriod())
|
||||||
return DocAction.STATUS_Invalid;
|
{
|
||||||
|
m_processMsg = "@PeriodNotValid@";
|
||||||
|
return DocAction.STATUS_Invalid;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
boolean open = period.isOpen(dt.getDocBaseType(), getDateAcct());
|
boolean open = period.isOpen(dt.getDocBaseType(), getDateAcct());
|
||||||
if (!open)
|
if (!open)
|
||||||
|
|
|
@ -28,6 +28,7 @@ import java.util.logging.Level;
|
||||||
|
|
||||||
import org.compiere.model.I_C_ValidCombination;
|
import org.compiere.model.I_C_ValidCombination;
|
||||||
import org.compiere.model.MAcctSchemaElement;
|
import org.compiere.model.MAcctSchemaElement;
|
||||||
|
import org.compiere.model.MPeriod;
|
||||||
import org.compiere.model.MReportCube;
|
import org.compiere.model.MReportCube;
|
||||||
import org.compiere.print.MPrintFormat;
|
import org.compiere.print.MPrintFormat;
|
||||||
import org.compiere.print.MPrintFormatItem;
|
import org.compiere.print.MPrintFormatItem;
|
||||||
|
@ -80,6 +81,8 @@ public class FinReport extends SvrProcess
|
||||||
private int p_PA_Hierarchy_ID = 0;
|
private int p_PA_Hierarchy_ID = 0;
|
||||||
/** Optional report cube */
|
/** Optional report cube */
|
||||||
private int p_PA_ReportCube_ID = 0;
|
private int p_PA_ReportCube_ID = 0;
|
||||||
|
/** Exclude Adjustment Period */
|
||||||
|
private String p_AdjPeriodToExclude = "";
|
||||||
|
|
||||||
/** Start Time */
|
/** Start Time */
|
||||||
private long m_start = System.currentTimeMillis();
|
private long m_start = System.currentTimeMillis();
|
||||||
|
@ -192,6 +195,24 @@ public class FinReport extends SvrProcess
|
||||||
// Load Report Definition
|
// Load Report Definition
|
||||||
m_report = new MReport (getCtx(), getRecord_ID(), null);
|
m_report = new MReport (getCtx(), getRecord_ID(), null);
|
||||||
sb.append(" - ").append(m_report);
|
sb.append(" - ").append(m_report);
|
||||||
|
|
||||||
|
/* Exclude adjustment period
|
||||||
|
* - if the report period is standard
|
||||||
|
* - and there is an adjustment period with the same end date (on the same year)
|
||||||
|
*/
|
||||||
|
if (p_C_Period_ID > 0) {
|
||||||
|
MPeriod per = MPeriod.get(getCtx(), p_C_Period_ID);
|
||||||
|
if (MPeriod.PERIODTYPE_StandardCalendarPeriod.equals(per.getPeriodType())) {
|
||||||
|
int adjPeriodToExclude_ID = DB.getSQLValue(get_TrxName(),
|
||||||
|
"SELECT C_Period_ID FROM C_Period WHERE IsActive='Y' AND PeriodType=? AND EndDate=? AND C_Year_ID=?",
|
||||||
|
MPeriod.PERIODTYPE_AdjustmentPeriod, per.getEndDate(), per.getC_Year_ID());
|
||||||
|
if (adjPeriodToExclude_ID > 0) {
|
||||||
|
p_AdjPeriodToExclude = " C_Period_ID!=" + adjPeriodToExclude_ID + " AND ";
|
||||||
|
log.warning("Will Exclude Adjustment Period -> " + p_AdjPeriodToExclude);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
setPeriods();
|
setPeriods();
|
||||||
sb.append(" - C_Period_ID=").append(p_C_Period_ID)
|
sb.append(" - C_Period_ID=").append(p_C_Period_ID)
|
||||||
|
@ -212,6 +233,15 @@ public class FinReport extends SvrProcess
|
||||||
{
|
{
|
||||||
if (log.isLoggable(Level.INFO)) log.info("C_Calendar_ID=" + m_report.getC_Calendar_ID());
|
if (log.isLoggable(Level.INFO)) log.info("C_Calendar_ID=" + m_report.getC_Calendar_ID());
|
||||||
Timestamp today = TimeUtil.getDay(System.currentTimeMillis());
|
Timestamp today = TimeUtil.getDay(System.currentTimeMillis());
|
||||||
|
|
||||||
|
// enable reporting on an adjustment period
|
||||||
|
if (p_C_Period_ID > 0) {
|
||||||
|
MPeriod per = MPeriod.get(getCtx(), p_C_Period_ID);
|
||||||
|
if (MPeriod.PERIODTYPE_AdjustmentPeriod.equals(per.getPeriodType())) {
|
||||||
|
today = per.getEndDate();
|
||||||
|
p_C_Period_ID = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
ArrayList<FinReportPeriod> list = new ArrayList<FinReportPeriod>();
|
ArrayList<FinReportPeriod> list = new ArrayList<FinReportPeriod>();
|
||||||
|
|
||||||
String sql = "SELECT p.C_Period_ID, p.Name, p.StartDate, p.EndDate, MIN(p1.StartDate) "
|
String sql = "SELECT p.C_Period_ID, p.Name, p.StartDate, p.EndDate, MIN(p1.StartDate) "
|
||||||
|
@ -370,10 +400,10 @@ public class FinReport extends SvrProcess
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p_PA_ReportCube_ID > 0)
|
if (p_PA_ReportCube_ID > 0)
|
||||||
select.append(" FROM Fact_Acct_Summary fa WHERE DateAcct ");
|
select.append(" FROM Fact_Acct_Summary fa WHERE ").append(p_AdjPeriodToExclude).append("DateAcct ");
|
||||||
else {
|
else {
|
||||||
// Get Period/Date info
|
// Get Period/Date info
|
||||||
select.append(" FROM Fact_Acct fa WHERE TRUNC(DateAcct) ");
|
select.append(" FROM Fact_Acct fa WHERE ").append(p_AdjPeriodToExclude).append("TRUNC(DateAcct) ");
|
||||||
}
|
}
|
||||||
|
|
||||||
BigDecimal relativeOffset = null; // current
|
BigDecimal relativeOffset = null; // current
|
||||||
|
@ -1314,11 +1344,11 @@ public class FinReport extends SvrProcess
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p_PA_ReportCube_ID > 0) {
|
if (p_PA_ReportCube_ID > 0) {
|
||||||
select.append(" FROM Fact_Acct_Summary fb WHERE DateAcct ");
|
select.append(" FROM Fact_Acct_Summary fb WHERE ").append(p_AdjPeriodToExclude).append("DateAcct ");
|
||||||
} //report cube
|
} //report cube
|
||||||
else {
|
else {
|
||||||
// Get Period info
|
// Get Period info
|
||||||
select.append(" FROM Fact_Acct fb WHERE TRUNC(DateAcct) ");
|
select.append(" FROM Fact_Acct fb WHERE ").append(p_AdjPeriodToExclude).append("TRUNC(DateAcct) ");
|
||||||
}
|
}
|
||||||
FinReportPeriod frp = getPeriod (m_columns[col].getRelativePeriod());
|
FinReportPeriod frp = getPeriod (m_columns[col].getRelativePeriod());
|
||||||
if (m_lines[line].getPAPeriodType() != null) // line amount type overwrites column
|
if (m_lines[line].getPAPeriodType() != null) // line amount type overwrites column
|
||||||
|
@ -1434,10 +1464,10 @@ public class FinReport extends SvrProcess
|
||||||
where.append(variable).append(" IS NOT NULL");
|
where.append(variable).append(" IS NOT NULL");
|
||||||
|
|
||||||
if (p_PA_ReportCube_ID > 0)
|
if (p_PA_ReportCube_ID > 0)
|
||||||
insert.append(" FROM Fact_Acct_Summary x WHERE ").append(where);
|
insert.append(" FROM Fact_Acct_Summary x WHERE ").append(p_AdjPeriodToExclude).append(where);
|
||||||
else
|
else
|
||||||
// FROM .. WHERE
|
// FROM .. WHERE
|
||||||
insert.append(" FROM Fact_Acct x WHERE ").append(where);
|
insert.append(" FROM Fact_Acct x WHERE ").append(p_AdjPeriodToExclude).append(where);
|
||||||
//
|
//
|
||||||
insert.append(m_parameterWhere)
|
insert.append(m_parameterWhere)
|
||||||
.append(" GROUP BY ").append(variable);
|
.append(" GROUP BY ").append(variable);
|
||||||
|
@ -1448,9 +1478,9 @@ public class FinReport extends SvrProcess
|
||||||
unionWhere.append(variable).append(" IS NOT NULL");
|
unionWhere.append(variable).append(" IS NOT NULL");
|
||||||
unionWhere.append(" AND Account_ID not in (select Account_ID ");
|
unionWhere.append(" AND Account_ID not in (select Account_ID ");
|
||||||
if (p_PA_ReportCube_ID > 0)
|
if (p_PA_ReportCube_ID > 0)
|
||||||
unionWhere.append(" from Fact_Acct_Summary x WHERE ").append(where);
|
unionWhere.append(" from Fact_Acct_Summary x WHERE ").append(p_AdjPeriodToExclude).append(where);
|
||||||
else
|
else
|
||||||
unionWhere.append(" from Fact_Acct x WHERE ").append(where);
|
unionWhere.append(" from Fact_Acct x WHERE ").append(p_AdjPeriodToExclude).append(where);
|
||||||
//
|
//
|
||||||
unionWhere.append(m_parameterWhere).append(")");
|
unionWhere.append(m_parameterWhere).append(")");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue