hg merge release-1.0c (merge release1 into release2)

This commit is contained in:
Carlos Ruiz 2013-12-04 08:23:40 -05:00
commit 696c4261ff
2 changed files with 2 additions and 18 deletions

View File

@ -6,17 +6,9 @@ SET DEFINE OFF
UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-12-04 14:25:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3853 UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-12-04 14:25:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3853
; ;
-- Dec 4, 2013 2:26:09 PM SGT
UPDATE AD_Column SET IsActive='N',Updated=TO_DATE('2013-12-04 14:26:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4872
;
-- Dec 4, 2013 2:27:39 PM SGT
UPDATE AD_Column SET IsActive='N',Updated=TO_DATE('2013-12-04 14:27:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4997
;
-- Dec 4, 2013 2:27:42 PM SGT -- Dec 4, 2013 2:27:42 PM SGT
UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-12-04 14:27:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3927 UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-12-04 14:27:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3927
; ;
SELECT register_migration_script('201312041431_IDEMPIERE-362.sql') FROM dual SELECT register_migration_script('201312041431_IDEMPIERE-362.sql') FROM dual
; ;

View File

@ -3,17 +3,9 @@
UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-04 14:25:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3853 UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-04 14:25:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3853
; ;
-- Dec 4, 2013 2:26:09 PM SGT
UPDATE AD_Column SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-04 14:26:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4872
;
-- Dec 4, 2013 2:27:39 PM SGT
UPDATE AD_Column SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-04 14:27:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4997
;
-- Dec 4, 2013 2:27:42 PM SGT -- Dec 4, 2013 2:27:42 PM SGT
UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-04 14:27:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3927 UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-04 14:27:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3927
; ;
SELECT register_migration_script('201312041431_IDEMPIERE-362.sql') FROM dual SELECT register_migration_script('201312041431_IDEMPIERE-362.sql') FROM dual
; ;