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

Merge with default

This commit is contained in:
hieplq 2018-11-13 12:05:45 +07:00
parent c03d0d233d 2e1200bcaf
commit 7b25f92010
2275 changed files with 11736 additions and 5477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -8,6 +8,7 @@ alpn-boot.jar
org.adempiere.webstore/bin
org.idempiere.hazelcast.service.config/bin
*/target
runtime-server.product
syntax: regexp
^adempiere$
^org\.adempiere\.install/lib$

19
migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql Normal file
View File

@ -0,0 +1,19 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2621 Assign default warehouse from Org on inventory docs
-- Sep 8, 2018 3:47:28 PM CEST
UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3523
;
-- Sep 8, 2018 3:48:02 PM CEST
UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:48:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3544
;
-- Sep 8, 2018 3:48:30 PM CEST
UPDATE AD_Column SET AD_Val_Rule_ID=130, Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:48:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11469
;
SELECT register_migration_script('201809081552_IDEMPIERE-2621.sql') FROM dual
;

15
migration/i5.1/oracle/201809081618_IDEMPIERE-2652.sql Normal file
View File

@ -0,0 +1,15 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2652 default value of ad_ctxhelpmsg_trl.create and ad_ctxhelpmsg_trl.update should now()
-- Sep 8, 2018 4:14:56 PM CEST
ALTER TABLE AD_CtxHelpMsg_Trl MODIFY Created DATE DEFAULT SYSDATE
;
-- Sep 8, 2018 4:15:28 PM CEST
ALTER TABLE AD_CtxHelpMsg_Trl MODIFY Updated DATE DEFAULT SYSDATE
;
SELECT register_migration_script('201809081618_IDEMPIERE-2652.sql') FROM dual
;

159
migration/i5.1/oracle/201810062307_IDEMPIERE-2395.sql Normal file
View File

@ -0,0 +1,159 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2395 NoteDelete leaving orphan attachments
-- Oct 6, 2018 11:05:15 PM CEST
INSERT INTO AD_Process (AD_Process_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Help,IsReport,Value,IsDirectPrint,Classname,AccessLevel,EntityType,Statistic_Count,Statistic_Seconds,IsBetaFunctionality,IsServerProcess,ShowHelp,CopyFromProcess,AD_Process_UU) VALUES (200102,0,0,'Y',TO_DATE('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,'Clean Orphan Cascade Records','Some processes accessing directly the database can leave orphan records, this process clean those orphan records deleting them','N','CleanOrphanCascade','N','org.idempiere.process.CleanOrphanCascade','4','D',0,0,'N','N','Y','N','d3826a84-1467-4d6e-931b-e395f349f60c')
;
-- Oct 6, 2018 11:05:55 PM CEST
INSERT INTO AD_Menu (AD_Menu_ID,Name,Action,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSummary,AD_Process_ID,IsSOTrx,IsReadOnly,EntityType,IsCentrallyMaintained,AD_Menu_UU) VALUES (200161,'Clean Orphan Cascade Records','P',0,0,'Y',TO_DATE('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,'N',200102,'Y','N','D','Y','67e5ec6c-93d0-47f9-bd45-f0d60d552b16')
;
-- Oct 6, 2018 11:05:55 PM CEST
INSERT INTO AD_TreeNodeMM (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNodeMM_UU) SELECT t.AD_Client_ID, 0, 'Y', SysDate, 100, SysDate, 100,t.AD_Tree_ID, 200161, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='MM' AND NOT EXISTS (SELECT * FROM AD_TreeNodeMM e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200161)
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=218
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=153
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=263
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=166
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=203
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53242
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=236
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=183
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=160
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=278
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=345
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53296
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53014
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53108
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=161
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=367
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=456
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=501
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=326
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=566
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=392
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=113
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=220
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=351
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=289
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=302
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=303
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=200047
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=14, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=200048
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=15, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=321
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=16, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=461
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=17, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53193
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=18, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53322
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=19, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=383
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=20, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=200161
;
SELECT register_migration_script('201810062307_IDEMPIERE-2395.sql') FROM dual
;

16
migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql Normal file
View File

@ -0,0 +1,16 @@
-- IDEMPIERE-2621 Assign default warehouse from Org on inventory docs
-- Sep 8, 2018 3:47:28 PM CEST
UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3523
;
-- Sep 8, 2018 3:48:02 PM CEST
UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:48:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3544
;
-- Sep 8, 2018 3:48:30 PM CEST
UPDATE AD_Column SET AD_Val_Rule_ID=130, Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:48:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11469
;
SELECT register_migration_script('201809081552_IDEMPIERE-2621.sql') FROM dual
;

12
migration/i5.1/postgresql/201809081618_IDEMPIERE-2652.sql Normal file
View File

@ -0,0 +1,12 @@
-- IDEMPIERE-2652 default value of ad_ctxhelpmsg_trl.create and ad_ctxhelpmsg_trl.update should now()
-- Sep 8, 2018 4:14:56 PM CEST
INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','Created','TIMESTAMP',null,'statement_timestamp()')
;
-- Sep 8, 2018 4:15:28 PM CEST
INSERT INTO t_alter_column values('ad_ctxhelpmsg_trl','Updated','TIMESTAMP',null,'statement_timestamp()')
;
SELECT register_migration_script('201809081618_IDEMPIERE-2652.sql') FROM dual
;

156
migration/i5.1/postgresql/201810062307_IDEMPIERE-2395.sql Normal file
View File

@ -0,0 +1,156 @@
-- IDEMPIERE-2395 NoteDelete leaving orphan attachments
-- Oct 6, 2018 11:05:15 PM CEST
INSERT INTO AD_Process (AD_Process_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,Help,IsReport,Value,IsDirectPrint,Classname,AccessLevel,EntityType,Statistic_Count,Statistic_Seconds,IsBetaFunctionality,IsServerProcess,ShowHelp,CopyFromProcess,AD_Process_UU) VALUES (200102,0,0,'Y',TO_TIMESTAMP('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-10-06 23:05:15','YYYY-MM-DD HH24:MI:SS'),100,'Clean Orphan Cascade Records','Some processes accessing directly the database can leave orphan records, this process clean those orphan records deleting them','N','CleanOrphanCascade','N','org.idempiere.process.CleanOrphanCascade','4','D',0,0,'N','N','Y','N','d3826a84-1467-4d6e-931b-e395f349f60c')
;
-- Oct 6, 2018 11:05:55 PM CEST
INSERT INTO AD_Menu (AD_Menu_ID,Name,"action",AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSummary,AD_Process_ID,IsSOTrx,IsReadOnly,EntityType,IsCentrallyMaintained,AD_Menu_UU) VALUES (200161,'Clean Orphan Cascade Records','P',0,0,'Y',TO_TIMESTAMP('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-10-06 23:05:55','YYYY-MM-DD HH24:MI:SS'),100,'N',200102,'Y','N','D','Y','67e5ec6c-93d0-47f9-bd45-f0d60d552b16')
;
-- Oct 6, 2018 11:05:55 PM CEST
INSERT INTO AD_TreeNodeMM (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNodeMM_UU) SELECT t.AD_Client_ID, 0, 'Y', statement_timestamp(), 100, statement_timestamp(), 100,t.AD_Tree_ID, 200161, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='MM' AND NOT EXISTS (SELECT * FROM AD_TreeNodeMM e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200161)
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=218
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=1, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=153
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=2, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=263
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=3, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=166
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=4, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=203
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=5, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53242
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=6, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=236
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=7, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=183
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=8, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=160
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=9, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=278
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=10, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=345
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=11, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53296
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=12, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53014
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=13, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53108
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=0, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=161
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=1, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=367
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=2, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=456
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=3, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=501
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=4, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=326
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=5, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=566
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=6, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=392
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=7, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=113
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=8, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=220
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=9, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=351
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=10, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=289
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=11, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=302
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=12, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=303
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=13, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=200047
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=14, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=200048
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=15, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=321
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=16, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=461
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=17, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53193
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=18, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=53322
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=19, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=383
;
-- Oct 6, 2018 11:07:01 PM CEST
UPDATE AD_TreeNodeMM SET Parent_ID=155, SeqNo=20, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=200161
;
SELECT register_migration_script('201810062307_IDEMPIERE-2395.sql') FROM dual
;

6
migration/i5.1z/oracle/201807251833_IDEMPIERE-3760.sql
View File

@ -7,8 +7,10 @@ UPDATE AD_Column SET FieldLength=4000,Updated=TO_DATE('2018-07-25 18:02:03','YYY
;
-- Jul 25, 2018 6:02:05 PM CEST
ALTER TABLE AD_Column MODIFY ColumnSQL VARCHAR2(4000) DEFAULT NULL
;
ALTER TABLE AD_Column ADD Tmp_ColumnSQL VARCHAR2(4000) DEFAULT NULL;
UPDATE AD_Column SET Tmp_ColumnSQL = ColumnSQL;
ALTER TABLE AD_Column DROP COLUMN ColumnSQL;
ALTER TABLE AD_Column RENAME COLUMN Tmp_ColumnSQL TO ColumnSQL;
-- Jul 25, 2018 6:02:36 PM CEST
UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, NumLines=2, IsToolbarButton=NULL,Updated=TO_DATE('2018-07-25 18:02:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11264

95
migration/i5.1z/oracle/201809271702_IDEMPIERE-3794.sql Normal file
View File

@ -0,0 +1,95 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-3794 Improvement to Housekeeping
-- Sep 27, 2018 4:49:40 PM CEST
UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2018-09-27 16:49:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
;
-- Sep 27, 2018 4:49:43 PM CEST
ALTER TABLE AD_HouseKeeping MODIFY AD_Table_ID NUMBER(10) DEFAULT NULL
;
-- Sep 27, 2018 4:49:43 PM CEST
ALTER TABLE AD_HouseKeeping MODIFY AD_Table_ID NULL
;
-- Sep 27, 2018 4:51:05 PM CEST
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,MandatoryLogic,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213696,0,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53147,'TableName',40,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_DATE('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,587,'Y','N','D','N','N','@AD_Table_ID@=0','N','Y','60eaa9cd-381b-4385-b4a4-245510ad0718','Y',0,'N','N')
;
-- Sep 27, 2018 4:51:16 PM CEST
UPDATE AD_Column SET MandatoryLogic='@TableName@=''''',Updated=TO_DATE('2018-09-27 16:51:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
;
-- Sep 27, 2018 4:51:23 PM CEST
ALTER TABLE AD_HouseKeeping ADD TableName VARCHAR2(40) DEFAULT NULL
;
-- Sep 27, 2018 4:51:59 PM CEST
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (205834,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53178,213696,'Y',40,160,'N','N','N','N',0,0,'Y',TO_DATE('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','bbc73a31-615b-4045-92f9-e37a64fc5b6c','Y',160,2)
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56367
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56365
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56364
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56361
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56360
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56353
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204515
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56359
;
-- Sep 27, 2018 4:53:13 PM CEST
UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:53:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
;
-- Sep 27, 2018 4:53:21 PM CEST
UPDATE AD_Field SET DisplayLogic='@IsExportXMLBackup@=Y & @AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:53:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
;
-- Sep 27, 2018 4:56:14 PM CEST
UPDATE AD_Field SET DisplayLogic='@TableName@=''''', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:56:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56368
;
-- Sep 27, 2018 4:56:32 PM CEST
UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@=0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-09-27 16:56:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
;
SELECT register_migration_script('201809271702_IDEMPIERE-3794.sql') FROM dual
;

104
migration/i5.1z/oracle/201810021745_IDEMPIERE-2816.sql Normal file
View File

@ -0,0 +1,104 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Oct 2, 2018 5:20:14 PM CEST
-- IDEMPIERE-2816/IDEMPIERE-2351 Force background/foreground based on parameters
INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203268,'ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_DATE('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),'Execution Type','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','0132dcc1-96b3-427f-a057-de8a7616b2c4','Y',TO_DATE('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
;
-- Oct 2, 2018 5:22:04 PM CEST
INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200157,'AD_Process Execution Type','1acef8a3-44b6-49c1-9309-d848829e3898','N','Report/Process Execution Type','L',NULL,TO_DATE('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_DATE('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'D',0)
;
-- Oct 2, 2018 5:22:47 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200438,'It forces the report/process to always run on background. This can be useful for slow reports.','24e2cb33-193c-45ca-9281-fea9752bf59f','Force Background','Y',100,100,0,TO_DATE('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),'D',200157,'B',0)
;
-- Oct 2, 2018 5:23:25 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200439,'It forces the report/process to always run on foreground.','9a4c7179-17f7-4fc0-9ccb-bdcdf36488a4','Force Foreground','Y',100,100,0,TO_DATE('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),'D',200157,'F',0)
;
-- Oct 2, 2018 5:24:15 PM CEST
INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213698,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','11fe0ed8-bdfb-47b6-9683-2acdc05f64f7',TO_DATE('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'Y','ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.','Execution Type','Y','Y',100,100,'Y',0,TO_DATE('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203268,200157,284,17,'N',0)
;
-- Oct 2, 2018 5:28:15 PM CEST
ALTER TABLE AD_Process ADD ExecutionType CHAR(1) DEFAULT NULL
;
-- Oct 2, 2018 5:28:56 PM CEST
INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205836,'N',22,'N','N',270,'Y','N','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_DATE('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),'Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','6283412f-702d-4a39-ae95-67a25ada2228','Y','N',100,100,'Y','Y',230,2,'N',0,TO_DATE('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),2,1,'N','N',213698,'D',245,0)
;
-- Oct 2, 2018 5:29:18 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
;
-- Oct 2, 2018 5:29:18 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
;
SELECT register_migration_script('201810021745_IDEMPIERE-2816.sql') FROM dual
;

124
migration/i5.1z/oracle/201810041316_IDEMPIERE-3799.sql Normal file
View File

@ -0,0 +1,124 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Oct 2, 2018 6:52:02 PM CEST
-- IDEMPIERE-3799 Avoid users re-running a report that is already being processed
INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203269,'AllowMultipleExecution','1. Disallow multiple executions: Never allow to execute a process that is already running.
2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
3. When blank: Always allow to execute a process multiple times.',TO_DATE('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),'Multiple Execution','Allow or disallow executing a process/report multiple times.','Multiple Execution','f8a79725-bf46-4682-aba8-4c1191ba9ddc','Y',TO_DATE('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
;
-- Oct 2, 2018 6:53:12 PM CEST
INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200158,'AD_Process Multiple Execution','e08cde11-cfd5-45e8-9813-0e3005269c97','N','Multiple execution rule list','L',NULL,TO_DATE('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_DATE('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'D',0)
;
-- Oct 2, 2018 6:53:40 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200440,'Never allow to execute a process that is already running','cd374cc2-e928-4e76-a376-9021ec5f31e7','Disallow multiple executions','Y',100,100,0,TO_DATE('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),'D',200158,'N',0)
;
-- Oct 2, 2018 6:53:58 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200441,'Allow to execute a process multiple times with different parameters.','1dcb3178-d9f5-449e-9592-5e6e29453cf1','Disallow multiple executions with the same parameters','Y',100,100,0,TO_DATE('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),'D',200158,'P',0)
;
-- Oct 2, 2018 6:58:23 PM CEST
INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213699,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','2996d521-d5f3-4b8f-b93d-fab92a71b406',TO_DATE('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'Y','AllowMultipleExecution','Allow or disallow executing a process/report multiple times.','P','1. Disallow multiple executions: Never allow to execute a process that is already running.
2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
3. When blank: Always allow to execute a process multiple times.','Multiple Execution','Y','Y',100,100,'Y',0,TO_DATE('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203269,200158,284,17,'N',0)
;
-- Oct 2, 2018 6:58:37 PM CEST
ALTER TABLE AD_Process ADD AllowMultipleExecution CHAR(1) DEFAULT 'P'
;
-- Oct 2, 2018 7:00:24 PM CEST
INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205837,'N',0,'N','N',270,'Y','N','1. Disallow multiple executions: Never allow to execute a process that is already running.
2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
3. When blank: Always allow to execute a process multiple times.',TO_DATE('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),'Allow or disallow executing a process/report multiple times.','Multiple Execution','f4a81a10-57ca-459f-bb21-a17812a75381','Y','N',100,100,'Y','Y',240,1,'N',0,TO_DATE('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),1,1,'N','N',213699,'D',245,0)
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, ColumnSpan=2, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205837
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=270, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
;
-- Oct 2, 2018 7:05:07 PM CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Updated,IsActive,CreatedBy,AD_Client_ID,Created,UpdatedBy,EntityType,Value,AD_Org_ID) VALUES ('I','Another instance of this process is already running, please wait until it finishes to run it again.',200483,'db33903f-5eb2-4585-be6f-9a6bcae3940e',TO_DATE('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),'Y',100,0,TO_DATE('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),100,'D','ProcessAlreadyRunning',0)
;
-- Oct 4, 2018 4:52:16 PM CEST
UPDATE AD_Process SET allowMultipleExecution = NULL WHERE isReport ='N'
;
-- Oct 4, 2018 4:52:16 PM CEST
UPDATE AD_Process SET allowMultipleExecution = 'P' WHERE isReport ='Y'
;
SELECT register_migration_script('201810041316_IDEMPIERE-3799.sql') FROM dual
;

11
migration/i5.1z/oracle/201810121201_IDEMPIERE-2754.sql Normal file
View File

@ -0,0 +1,11 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2754 remove wrong test data.
-- Oct 12, 2018 12:00:11 PM CEST
DELETE FROM AD_Image WHERE AD_Image_ID=108
;
SELECT register_migration_script('201810121201_IDEMPIERE-2754.sql') FROM dual
;

1595
migration/i5.1z/oracle/201811031833_GardenYear2019.sql Normal file
View File

File diff suppressed because it is too large Load Diff

12
migration/i5.1z/oracle/201811041439_Version.sql Normal file
View File

@ -0,0 +1,12 @@
UPDATE AD_SYSTEM
SET releaseno = '6.1',
VERSION = '2018-11-04'
WHERE ad_system_id = 0 AND ad_client_id = 0
;
COMMIT
;
SELECT register_migration_script('201811041439_Version.sql') FROM dual
;

92
migration/i5.1z/postgresql/201809271702_IDEMPIERE-3794.sql Normal file
View File

@ -0,0 +1,92 @@
-- IDEMPIERE-3794 Improvement to Housekeeping
-- Sep 27, 2018 4:49:40 PM CEST
UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2018-09-27 16:49:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
;
-- Sep 27, 2018 4:49:43 PM CEST
INSERT INTO t_alter_column values('ad_housekeeping','AD_Table_ID','NUMERIC(10)',null,'NULL')
;
-- Sep 27, 2018 4:49:43 PM CEST
INSERT INTO t_alter_column values('ad_housekeeping','AD_Table_ID',null,'NULL',null)
;
-- Sep 27, 2018 4:51:05 PM CEST
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,MandatoryLogic,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213696,0,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53147,'TableName',40,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_TIMESTAMP('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-09-27 16:51:04','YYYY-MM-DD HH24:MI:SS'),100,587,'Y','N','D','N','N','@AD_Table_ID@=0','N','Y','60eaa9cd-381b-4385-b4a4-245510ad0718','Y',0,'N','N')
;
-- Sep 27, 2018 4:51:16 PM CEST
UPDATE AD_Column SET MandatoryLogic='@TableName@=''''',Updated=TO_TIMESTAMP('2018-09-27 16:51:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56346
;
-- Sep 27, 2018 4:51:23 PM CEST
ALTER TABLE AD_HouseKeeping ADD COLUMN TableName VARCHAR(40) DEFAULT NULL
;
-- Sep 27, 2018 4:51:59 PM CEST
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (205834,'DB Table Name','Name of the table in the database','The DB Table Name indicates the name of the table in database.',53178,213696,'Y',40,160,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2018-09-27 16:51:59','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','bbc73a31-615b-4045-92f9-e37a64fc5b6c','Y',160,2)
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56367
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56365
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56364
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56361
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56360
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56353
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204515
;
-- Sep 27, 2018 4:52:20 PM CEST
UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:52:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56359
;
-- Sep 27, 2018 4:53:13 PM CEST
UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:53:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56358
;
-- Sep 27, 2018 4:53:21 PM CEST
UPDATE AD_Field SET DisplayLogic='@IsExportXMLBackup@=Y & @AD_Table_ID@>0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:53:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56354
;
-- Sep 27, 2018 4:56:14 PM CEST
UPDATE AD_Field SET DisplayLogic='@TableName@=''''', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:56:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56368
;
-- Sep 27, 2018 4:56:32 PM CEST
UPDATE AD_Field SET DisplayLogic='@AD_Table_ID@=0', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-09-27 16:56:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205834
;
SELECT register_migration_script('201809271702_IDEMPIERE-3794.sql') FROM dual
;

101
migration/i5.1z/postgresql/201810021745_IDEMPIERE-2816.sql Normal file
View File

@ -0,0 +1,101 @@
-- Oct 2, 2018 5:20:14 PM CEST
-- IDEMPIERE-2816/IDEMPIERE-2351 Force background/foreground based on parameters
INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203268,'ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_TIMESTAMP('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),'Execution Type','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','0132dcc1-96b3-427f-a057-de8a7616b2c4','Y',TO_TIMESTAMP('2018-10-02 17:20:14','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
;
-- Oct 2, 2018 5:22:04 PM CEST
INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200157,'AD_Process Execution Type','1acef8a3-44b6-49c1-9309-d848829e3898','N','Report/Process Execution Type','L',NULL,TO_TIMESTAMP('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_TIMESTAMP('2018-10-02 17:22:04','YYYY-MM-DD HH24:MI:SS'),'D',0)
;
-- Oct 2, 2018 5:22:47 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200438,'It forces the report/process to always run on background. This can be useful for slow reports.','24e2cb33-193c-45ca-9281-fea9752bf59f','Force Background','Y',100,100,0,TO_TIMESTAMP('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 17:22:46','YYYY-MM-DD HH24:MI:SS'),'D',200157,'B',0)
;
-- Oct 2, 2018 5:23:25 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200439,'It forces the report/process to always run on foreground.','9a4c7179-17f7-4fc0-9ccb-bdcdf36488a4','Force Foreground','Y',100,100,0,TO_TIMESTAMP('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 17:23:24','YYYY-MM-DD HH24:MI:SS'),'D',200157,'F',0)
;
-- Oct 2, 2018 5:24:15 PM CEST
INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213698,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','11fe0ed8-bdfb-47b6-9683-2acdc05f64f7',TO_TIMESTAMP('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'Y','ExecutionType','Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.','Execution Type','Y','Y',100,100,'Y',0,TO_TIMESTAMP('2018-10-02 17:24:14','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203268,200157,284,17,'N',0)
;
-- Oct 2, 2018 5:28:15 PM CEST
ALTER TABLE AD_Process ADD COLUMN ExecutionType CHAR(1) DEFAULT NULL
;
-- Oct 2, 2018 5:28:56 PM CEST
INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205836,'N',22,'N','N',270,'Y','N','Execution Type defines whether the report/process will always run in background or foreground. The System Configurator "BACKGROUND_JOB_ALLOWED" has greater precedence.',TO_TIMESTAMP('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),'Execution Type defines whether the report/process will always run in background or foreground. ','Execution Type','6283412f-702d-4a39-ae95-67a25ada2228','Y','N',100,100,'Y','Y',230,2,'N',0,TO_TIMESTAMP('2018-10-02 17:28:55','YYYY-MM-DD HH24:MI:SS'),2,1,'N','N',213698,'D',245,0)
;
-- Oct 2, 2018 5:29:18 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
;
-- Oct 2, 2018 5:29:18 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 17:29:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
;
-- Oct 2, 2018 2:31:45 PM CEST
UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 14:31:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
;
SELECT register_migration_script('201810021745_IDEMPIERE-2816.sql') FROM dual
;

121
migration/i5.1z/postgresql/201810041316_IDEMPIERE-3799.sql Normal file
View File

@ -0,0 +1,121 @@
-- Oct 2, 2018 6:52:02 PM CEST
-- IDEMPIERE-3799 Avoid users re-running a report that is already being processed
INSERT INTO AD_Element (AD_Element_ID,ColumnName,Help,Updated,Name,Description,PrintName,AD_Element_UU,IsActive,Created,CreatedBy,UpdatedBy,AD_Client_ID,EntityType,AD_Org_ID) VALUES (203269,'AllowMultipleExecution','1. Disallow multiple executions: Never allow to execute a process that is already running.
2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
3. When blank: Always allow to execute a process multiple times.',TO_TIMESTAMP('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),'Multiple Execution','Allow or disallow executing a process/report multiple times.','Multiple Execution','f8a79725-bf46-4682-aba8-4c1191ba9ddc','Y',TO_TIMESTAMP('2018-10-02 18:52:01','YYYY-MM-DD HH24:MI:SS'),100,100,0,'D',0)
;
-- Oct 2, 2018 6:53:12 PM CEST
INSERT INTO AD_Reference (AD_Reference_ID,Name,AD_Reference_UU,IsOrderByValue,Description,ValidationType,VFormat,Updated,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,EntityType,AD_Org_ID) VALUES (200158,'AD_Process Multiple Execution','e08cde11-cfd5-45e8-9813-0e3005269c97','N','Multiple execution rule list','L',NULL,TO_TIMESTAMP('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'Y',100,100,0,TO_TIMESTAMP('2018-10-02 18:53:11','YYYY-MM-DD HH24:MI:SS'),'D',0)
;
-- Oct 2, 2018 6:53:40 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200440,'Never allow to execute a process that is already running','cd374cc2-e928-4e76-a376-9021ec5f31e7','Disallow multiple executions','Y',100,100,0,TO_TIMESTAMP('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 18:53:39','YYYY-MM-DD HH24:MI:SS'),'D',200158,'N',0)
;
-- Oct 2, 2018 6:53:58 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Description,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200441,'Allow to execute a process multiple times with different parameters.','1dcb3178-d9f5-449e-9592-5e6e29453cf1','Disallow multiple executions with the same parameters','Y',100,100,0,TO_TIMESTAMP('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-10-02 18:53:57','YYYY-MM-DD HH24:MI:SS'),'D',200158,'P',0)
;
-- Oct 2, 2018 6:58:23 PM CEST
INSERT INTO AD_Column (AD_Column_ID,IsSyncDatabase,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,Updated,IsUpdateable,ColumnName,Description,DefaultValue,Help,Name,IsAllowCopy,IsActive,CreatedBy,UpdatedBy,IsAlwaysUpdateable,AD_Client_ID,Created,IsSecure,EntityType,IsEncrypted,AD_Element_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Reference_ID,IsToolbarButton,AD_Org_ID) VALUES (213699,'N',0,'N','N','N',0,'N',1,'N','N','N','Y','2996d521-d5f3-4b8f-b93d-fab92a71b406',TO_TIMESTAMP('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'Y','AllowMultipleExecution','Allow or disallow executing a process/report multiple times.','P','1. Disallow multiple executions: Never allow to execute a process that is already running.
2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
3. When blank: Always allow to execute a process multiple times.','Multiple Execution','Y','Y',100,100,'Y',0,TO_TIMESTAMP('2018-10-02 18:58:23','YYYY-MM-DD HH24:MI:SS'),'N','D','N',203269,200158,284,17,'N',0)
;
-- Oct 2, 2018 6:58:37 PM CEST
ALTER TABLE AD_Process ADD COLUMN AllowMultipleExecution CHAR(1) DEFAULT 'P'
;
-- Oct 2, 2018 7:00:24 PM CEST
INSERT INTO AD_Field (SortNo,AD_Field_ID,IsEncrypted,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,IsReadOnly,Help,Updated,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,CreatedBy,UpdatedBy,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,Created,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,AD_Tab_ID,AD_Org_ID) VALUES (0,205837,'N',0,'N','N',270,'Y','N','1. Disallow multiple executions: Never allow to execute a process that is already running.
2. Disallow multiple executions with the same parameters: Allow to execute a process multiple times with different parameters.
3. When blank: Always allow to execute a process multiple times.',TO_TIMESTAMP('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),'Allow or disallow executing a process/report multiple times.','Multiple Execution','f4a81a10-57ca-459f-bb21-a17812a75381','Y','N',100,100,'Y','Y',240,1,'N',0,TO_TIMESTAMP('2018-10-02 19:00:23','YYYY-MM-DD HH24:MI:SS'),1,1,'N','N',213699,'D',245,0)
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Val_Rule_ID=NULL, IsDisplayed='Y', XPosition=4, ColumnSpan=2, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205837
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4540
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205836
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2571
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12100
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3703
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2534
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=170, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10235
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=180, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56497
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=190, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3278
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=200, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3219
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=210, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5849
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=220, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50155
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=230, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5850
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=240, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5851
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=250, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50156
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=260, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201809
;
-- Oct 2, 2018 7:03:16 PM CEST
UPDATE AD_Field SET SeqNo=270, AD_Val_Rule_ID=NULL, AD_Reference_Value_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2018-10-02 19:03:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57342
;
-- Oct 2, 2018 7:05:07 PM CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Updated,IsActive,CreatedBy,AD_Client_ID,Created,UpdatedBy,EntityType,Value,AD_Org_ID) VALUES ('I','Another instance of this process is already running, please wait until it finishes to run it again.',200483,'db33903f-5eb2-4585-be6f-9a6bcae3940e',TO_TIMESTAMP('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),'Y',100,0,TO_TIMESTAMP('2018-10-02 19:05:06','YYYY-MM-DD HH24:MI:SS'),100,'D','ProcessAlreadyRunning',0)
;
-- Oct 4, 2018 4:52:16 PM CEST
UPDATE AD_Process SET allowMultipleExecution = NULL WHERE isReport ='N'
;
-- Oct 4, 2018 4:52:16 PM CEST
UPDATE AD_Process SET allowMultipleExecution = 'P' WHERE isReport ='Y'
;
SELECT register_migration_script('201810041316_IDEMPIERE-3799.sql') FROM dual
;

8
migration/i5.1z/postgresql/201810121201_IDEMPIERE-2754.sql Normal file
View File

@ -0,0 +1,8 @@
-- IDEMPIERE-2754 remove wrong test data.
-- Oct 12, 2018 12:00:11 PM CEST
DELETE FROM AD_Image WHERE AD_Image_ID=108
;
SELECT register_migration_script('201810121201_IDEMPIERE-2754.sql') FROM dual
;

1592
migration/i5.1z/postgresql/201811031833_GardenYear2019.sql Normal file
View File

File diff suppressed because it is too large Load Diff

9
migration/i5.1z/postgresql/201811041439_Version.sql Normal file
View File

@ -0,0 +1,9 @@
UPDATE AD_SYSTEM
SET releaseno = '6.1',
VERSION = '2018-11-04'
WHERE ad_system_id = 0 AND ad_client_id = 0
;
SELECT register_migration_script('201811041439_Version.sql') FROM dual
;

0
migration/i5.1/oracle/build.xml → migration/i6.1/oracle/build.xml
View File

0
migration/i5.1/postgresql/build.xml → migration/i6.1/postgresql/build.xml
View File

222
org.adempiere.base-feature/feature.xml
View File

@ -2,7 +2,8 @@
<feature
id="org.adempiere.base.feature"
label="Adempiere Base"
version="5.1.0.qualifier">
version="6.1.0.qualifier"
provider-name="iDempiere Community">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@ -99,13 +100,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.jms"
download-size="0"
@ -162,20 +156,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.management.j2ee-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.logging"
download-size="0"
@ -183,34 +163,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.ejb"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.rpc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.soap"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.bind"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.stream"
download-size="0"
@ -336,13 +288,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="groovy-all"
download-size="0"
install-size="0"
version="2.4.13"
unpack="false"/>
<plugin
id="com.ibm.icu"
download-size="0"
@ -378,14 +323,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.apache.commons.commons-collections4"
download-size="0"
@ -393,13 +330,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.configuration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.net"
download-size="0"
@ -421,4 +351,152 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jaxb-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.interceptor-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.enterprise.cdi-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.inject"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.annotation-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="groovy"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.commons-configuration2"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-console"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-datetime"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-json"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-jsr223"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-nio"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-swing"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="groovy-xml"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="javax.jws"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

64
org.adempiere.base-feature/model.generator.launch
View File

File diff suppressed because one or more lines are too long

2
org.adempiere.base-feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent>
<artifactId>org.adempiere.base.feature</artifactId>

61
org.adempiere.base-feature/sign.database.build.launch
View File

File diff suppressed because one or more lines are too long

61
org.adempiere.base-feature/synchronize-terminology.app.launch
View File

File diff suppressed because one or more lines are too long

61
org.adempiere.base-feature/translation.app.launch
View File

File diff suppressed because one or more lines are too long

6
org.adempiere.base.callout/.classpath
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>

6
org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
View File

@ -1,7 +1,3 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.release=enabled

5
org.adempiere.base.callout/META-INF/MANIFEST.MF
View File

@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Callout
Bundle-SymbolicName: org.adempiere.base.callout
Bundle-Version: 5.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Version: 6.1.0.qualifier
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Eclipse-RegisterBuddy: org.adempiere.base
Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml
@ -11,4 +11,5 @@ Bundle-ActivationPolicy: lazy
Export-Package: org.compiere.model
Bundle-ClassPath: .
Automatic-Module-Name: org.adempiere.base.callout
Bundle-Vendor: iDempiere Community

2
org.adempiere.base.callout/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent>
<artifactId>org.adempiere.base.callout</artifactId>

9
org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
View File

@ -18,6 +18,7 @@
package org.adempiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Properties;
import org.adempiere.base.Core;
@ -101,7 +102,7 @@ public class CalloutRMA extends CalloutEngine {
BigDecimal lineNetAmt = invoiceLine.getQtyEntered().multiply(invoiceLine.getPriceEntered());
int precision = invoiceLine.getPrecision();
if (lineNetAmt.scale() > precision)
lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
}
else if (iol.getC_OrderLine_ID() != 0)
@ -122,7 +123,7 @@ public class CalloutRMA extends CalloutEngine {
BigDecimal lineNetAmt = orderLine.getQtyEntered().multiply(orderLine.getPriceEntered());
int precision = orderLine.getPrecision();
if (lineNetAmt.scale() > precision)
lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
}
@ -193,7 +194,7 @@ public class CalloutRMA extends CalloutEngine {
BigDecimal lineNetAmt = Env.ONE.multiply(pp.getPriceStd());
if (lineNetAmt.scale() > precision)
lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
return "";
@ -246,7 +247,7 @@ public class CalloutRMA extends CalloutEngine {
BigDecimal lineNetAmt = Env.ONE.multiply(charge.getChargeAmt());
if (lineNetAmt.scale() > precision)
lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP);
lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP);
mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt);
return "";

2
org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
View File

@ -92,7 +92,7 @@ public class CalloutAssignment extends CalloutEngine
if (log.isLoggable(Level.FINE)) log.fine("S_ResourceAssignment_ID=" + S_ResourceAssignment_ID + " - M_Product_ID=" + M_Product_ID);
if (M_Product_ID != 0)
{
mTab.setValue ("M_Product_ID", new Integer (M_Product_ID));
mTab.setValue ("M_Product_ID", Integer.valueOf(M_Product_ID));
if (Description != null)
Name += " (" + Description + ")";
if (!".".equals(Name))

2
org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java
View File

@ -84,7 +84,7 @@ public class CalloutCashJournal extends CalloutEngine
rs = pstmt.executeQuery();
if (rs.next())
{
mTab.setValue("C_Currency_ID", new Integer(rs.getInt(2)));
mTab.setValue("C_Currency_ID", Integer.valueOf(rs.getInt(2)));
BigDecimal PayAmt = rs.getBigDecimal(3);
BigDecimal DiscountAmt = rs.getBigDecimal(5);
boolean isSOTrx = "Y".equals(rs.getString(4));

7
org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -103,7 +104,7 @@ public class CalloutGLJournal extends CalloutEngine
pstmt = null;
}
if (C_Period_ID != 0)
mTab.setValue("C_Period_ID", new Integer(C_Period_ID));
mTab.setValue("C_Period_ID", Integer.valueOf(C_Period_ID));
}
// When C_Period_ID is changed, check if in DateAcct range and set to end date if not
@ -222,10 +223,10 @@ public class CalloutGLJournal extends CalloutEngine
AmtSourceCr = Env.ZERO;
BigDecimal AmtAcctDr = AmtSourceDr.multiply(CurrencyRate);
AmtAcctDr = AmtAcctDr.setScale(Precision, BigDecimal.ROUND_HALF_UP);
AmtAcctDr = AmtAcctDr.setScale(Precision, RoundingMode.HALF_UP);
mTab.setValue("AmtAcctDr", AmtAcctDr);
BigDecimal AmtAcctCr = AmtSourceCr.multiply(CurrencyRate);
AmtAcctCr = AmtAcctCr.setScale(Precision, BigDecimal.ROUND_HALF_UP);
AmtAcctCr = AmtAcctCr.setScale(Precision, RoundingMode.HALF_UP);
mTab.setValue("AmtAcctCr", AmtAcctCr);
return "";

123
org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -61,28 +62,28 @@ public class CalloutInOut extends CalloutEngine
{
mTab.setValue("DateOrdered", order.getDateOrdered());
mTab.setValue("POReference", order.getPOReference());
mTab.setValue("AD_Org_ID", new Integer(order.getAD_Org_ID()));
mTab.setValue("AD_OrgTrx_ID", new Integer(order.getAD_OrgTrx_ID()));
mTab.setValue("C_Activity_ID", new Integer(order.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", new Integer(order.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", new Integer(order.getC_Project_ID()));
mTab.setValue("User1_ID", new Integer(order.getUser1_ID()));
mTab.setValue("User2_ID", new Integer(order.getUser2_ID()));
mTab.setValue("M_Warehouse_ID", new Integer(order.getM_Warehouse_ID()));
mTab.setValue("AD_Org_ID", Integer.valueOf(order.getAD_Org_ID()));
mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(order.getAD_OrgTrx_ID()));
mTab.setValue("C_Activity_ID", Integer.valueOf(order.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", Integer.valueOf(order.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", Integer.valueOf(order.getC_Project_ID()));
mTab.setValue("User1_ID", Integer.valueOf(order.getUser1_ID()));
mTab.setValue("User2_ID", Integer.valueOf(order.getUser2_ID()));
mTab.setValue("M_Warehouse_ID", Integer.valueOf(order.getM_Warehouse_ID()));
//
mTab.setValue("DeliveryRule", order.getDeliveryRule());
mTab.setValue("DeliveryViaRule", order.getDeliveryViaRule());
mTab.setValue("M_Shipper_ID", new Integer(order.getM_Shipper_ID()));
mTab.setValue("M_Shipper_ID", Integer.valueOf(order.getM_Shipper_ID()));
mTab.setValue("FreightCostRule", order.getFreightCostRule());
mTab.setValue("FreightAmt", order.getFreightAmt());
mTab.setValue("C_BPartner_ID", new Integer(order.getC_BPartner_ID()));
mTab.setValue("C_BPartner_ID", Integer.valueOf(order.getC_BPartner_ID()));
//[ 1867464 ]
mTab.setValue("C_BPartner_Location_ID", new Integer(order.getC_BPartner_Location_ID()));
mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(order.getC_BPartner_Location_ID()));
if (order.getAD_User_ID() > 0)
mTab.setValue("AD_User_ID", new Integer(order.getAD_User_ID()));
mTab.setValue("AD_User_ID", Integer.valueOf(order.getAD_User_ID()));
else
mTab.setValue("AD_User_ID", null);
}
@ -128,28 +129,28 @@ public class CalloutInOut extends CalloutEngine
{
mTab.setValue("DateOrdered", originalReceipt.getDateOrdered());
mTab.setValue("POReference", originalReceipt.getPOReference());
mTab.setValue("AD_Org_ID", new Integer(originalReceipt.getAD_Org_ID()));
mTab.setValue("AD_OrgTrx_ID", new Integer(originalReceipt.getAD_OrgTrx_ID()));
mTab.setValue("C_Activity_ID", new Integer(originalReceipt.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", new Integer(originalReceipt.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", new Integer(originalReceipt.getC_Project_ID()));
mTab.setValue("User1_ID", new Integer(originalReceipt.getUser1_ID()));
mTab.setValue("User2_ID", new Integer(originalReceipt.getUser2_ID()));
mTab.setValue("M_Warehouse_ID", new Integer(originalReceipt.getM_Warehouse_ID()));
mTab.setValue("AD_Org_ID", Integer.valueOf(originalReceipt.getAD_Org_ID()));
mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(originalReceipt.getAD_OrgTrx_ID()));
mTab.setValue("C_Activity_ID", Integer.valueOf(originalReceipt.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", Integer.valueOf(originalReceipt.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", Integer.valueOf(originalReceipt.getC_Project_ID()));
mTab.setValue("User1_ID", Integer.valueOf(originalReceipt.getUser1_ID()));
mTab.setValue("User2_ID", Integer.valueOf(originalReceipt.getUser2_ID()));
mTab.setValue("M_Warehouse_ID", Integer.valueOf(originalReceipt.getM_Warehouse_ID()));
//
mTab.setValue("DeliveryRule", originalReceipt.getDeliveryRule());
mTab.setValue("DeliveryViaRule", originalReceipt.getDeliveryViaRule());
mTab.setValue("M_Shipper_ID", new Integer(originalReceipt.getM_Shipper_ID()));
mTab.setValue("M_Shipper_ID", Integer.valueOf(originalReceipt.getM_Shipper_ID()));
mTab.setValue("FreightCostRule", originalReceipt.getFreightCostRule());
mTab.setValue("FreightAmt", originalReceipt.getFreightAmt());
mTab.setValue("C_BPartner_ID", new Integer(originalReceipt.getC_BPartner_ID()));
mTab.setValue("C_BPartner_ID", Integer.valueOf(originalReceipt.getC_BPartner_ID()));
//[ 1867464 ]
mTab.setValue("C_BPartner_Location_ID", new Integer(originalReceipt.getC_BPartner_Location_ID()));
mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(originalReceipt.getC_BPartner_Location_ID()));
if (originalReceipt.getAD_User_ID() > 0)
mTab.setValue("AD_User_ID", new Integer(originalReceipt.getAD_User_ID()));
mTab.setValue("AD_User_ID", Integer.valueOf(originalReceipt.getAD_User_ID()));
else
mTab.setValue("AD_User_ID", null);
}
@ -290,13 +291,13 @@ public class CalloutInOut extends CalloutEngine
if (!IsSOTrx)
{
// Location
Integer ii = new Integer(rs.getInt("C_BPartner_Location_ID"));
Integer ii = Integer.valueOf(rs.getInt("C_BPartner_Location_ID"));
if (rs.wasNull())
mTab.setValue("C_BPartner_Location_ID", null);
else
mTab.setValue("C_BPartner_Location_ID", ii);
// Contact
ii = new Integer(rs.getInt("AD_User_ID"));
ii = Integer.valueOf(rs.getInt("AD_User_ID"));
if (rs.wasNull())
mTab.setValue("AD_User_ID", null);
else
@ -361,12 +362,12 @@ public class CalloutInOut extends CalloutEngine
if (rs.next())
{
// Org
Integer ii = new Integer(rs.getInt(1));
Integer ii = Integer.valueOf(rs.getInt(1));
int AD_Org_ID = Env.getContextAsInt(ctx, WindowNo, "AD_Org_ID");
if (AD_Org_ID != ii.intValue())
mTab.setValue("AD_Org_ID", ii);
// Locator
ii = new Integer(rs.getInt(2));
ii = Integer.valueOf(rs.getInt(2));
if (rs.wasNull())
Env.setContext(ctx, WindowNo, 0, "M_Locator_ID", null);
else
@ -416,17 +417,17 @@ public class CalloutInOut extends CalloutEngine
if (ol.get_ID() != 0)
{
if (ol.getC_Charge_ID() > 0 && ol.getM_Product_ID() <= 0) {
mTab.setValue("C_Charge_ID", new Integer(ol.getC_Charge_ID()));
mTab.setValue("C_Charge_ID", Integer.valueOf(ol.getC_Charge_ID()));
mTab.setValue("M_Product_ID", null);
mTab.setValue("M_AttributeSetInstance_ID", null);
}
else {
mTab.setValue("M_Product_ID", new Integer(ol.getM_Product_ID()));
mTab.setValue("M_AttributeSetInstance_ID", new Integer(ol.getM_AttributeSetInstance_ID()));
mTab.setValue("M_Product_ID", Integer.valueOf(ol.getM_Product_ID()));
mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(ol.getM_AttributeSetInstance_ID()));
mTab.setValue("C_Charge_ID", null);
}
//
mTab.setValue("C_UOM_ID", new Integer(ol.getC_UOM_ID()));
mTab.setValue("C_UOM_ID", Integer.valueOf(ol.getC_UOM_ID()));
BigDecimal MovementQty = ol.getQtyOrdered().subtract(ol.getQtyDelivered());
BigDecimal runningqty = DB.getSQLValueBDEx(null, "SELECT SUM(MovementQty) FROM M_InOutLine WHERE M_InOut_ID=? AND M_InOutLine_ID!=? AND C_OrderLine_ID=?",
Env.getContextAsInt(ctx, WindowNo, "M_InOut_ID"),
@ -439,17 +440,17 @@ public class CalloutInOut extends CalloutEngine
BigDecimal QtyEntered = MovementQty;
if (ol.getQtyEntered().compareTo(ol.getQtyOrdered()) != 0)
QtyEntered = QtyEntered.multiply(ol.getQtyEntered())
.divide(ol.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP);
.divide(ol.getQtyOrdered(), 12, RoundingMode.HALF_UP);
mTab.setValue("QtyEntered", QtyEntered);
//
mTab.setValue("C_Activity_ID", new Integer(ol.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", new Integer(ol.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", new Integer(ol.getC_Project_ID()));
mTab.setValue("C_ProjectPhase_ID", new Integer(ol.getC_ProjectPhase_ID()));
mTab.setValue("C_ProjectTask_ID", new Integer(ol.getC_ProjectTask_ID()));
mTab.setValue("AD_OrgTrx_ID", new Integer(ol.getAD_OrgTrx_ID()));
mTab.setValue("User1_ID", new Integer(ol.getUser1_ID()));
mTab.setValue("User2_ID", new Integer(ol.getUser2_ID()));
mTab.setValue("C_Activity_ID", Integer.valueOf(ol.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", Integer.valueOf(ol.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", Integer.valueOf(ol.getC_Project_ID()));
mTab.setValue("C_ProjectPhase_ID", Integer.valueOf(ol.getC_ProjectPhase_ID()));
mTab.setValue("C_ProjectTask_ID", Integer.valueOf(ol.getC_ProjectTask_ID()));
mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(ol.getAD_OrgTrx_ID()));
mTab.setValue("User1_ID", Integer.valueOf(ol.getUser1_ID()));
mTab.setValue("User2_ID", Integer.valueOf(ol.getUser2_ID()));
}
return "";
} // orderLine
@ -474,30 +475,30 @@ public class CalloutInOut extends CalloutEngine
if (rl.get_ID() != 0)
{
if (rl.getC_Charge_ID() > 0 && rl.getM_Product_ID() <= 0) {
mTab.setValue("C_Charge_ID", new Integer(rl.getC_Charge_ID()));
mTab.setValue("C_Charge_ID", Integer.valueOf(rl.getC_Charge_ID()));
mTab.setValue("M_Product_ID", null);
mTab.setValue("M_AttributeSetInstance_ID", null);
}
else {
mTab.setValue("M_Product_ID", new Integer(rl.getM_Product_ID()));
mTab.setValue("M_AttributeSetInstance_ID", new Integer(rl.getM_AttributeSetInstance_ID()));
mTab.setValue("M_Product_ID", Integer.valueOf(rl.getM_Product_ID()));
mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(rl.getM_AttributeSetInstance_ID()));
mTab.setValue("C_Charge_ID", null);
}
//
mTab.setValue("C_UOM_ID", new Integer(rl.getC_UOM_ID()));
mTab.setValue("C_UOM_ID", Integer.valueOf(rl.getC_UOM_ID()));
BigDecimal MovementQty = rl.getQty().subtract(rl.getQtyDelivered());
mTab.setValue("MovementQty", MovementQty);
BigDecimal QtyEntered = MovementQty;
mTab.setValue("QtyEntered", QtyEntered);
//
mTab.setValue("C_Activity_ID", new Integer(rl.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", new Integer(rl.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", new Integer(rl.getC_Project_ID()));
mTab.setValue("C_ProjectPhase_ID", new Integer(rl.getC_ProjectPhase_ID()));
mTab.setValue("C_ProjectTask_ID", new Integer(rl.getC_ProjectTask_ID()));
mTab.setValue("AD_OrgTrx_ID", new Integer(rl.getAD_OrgTrx_ID()));
mTab.setValue("User1_ID", new Integer(rl.getUser1_ID()));
mTab.setValue("User2_ID", new Integer(rl.getUser2_ID()));
mTab.setValue("C_Activity_ID", Integer.valueOf(rl.getC_Activity_ID()));
mTab.setValue("C_Campaign_ID", Integer.valueOf(rl.getC_Campaign_ID()));
mTab.setValue("C_Project_ID", Integer.valueOf(rl.getC_Project_ID()));
mTab.setValue("C_ProjectPhase_ID", Integer.valueOf(rl.getC_ProjectPhase_ID()));
mTab.setValue("C_ProjectTask_ID", Integer.valueOf(rl.getC_ProjectTask_ID()));
mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(rl.getAD_OrgTrx_ID()));
mTab.setValue("User1_ID", Integer.valueOf(rl.getUser1_ID()));
mTab.setValue("User2_ID", Integer.valueOf(rl.getUser2_ID()));
}
return "";
} // rmaLine
@ -525,10 +526,10 @@ public class CalloutInOut extends CalloutEngine
&& Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID") != 0)
{
mTab.setValue("M_AttributeSetInstance_ID",
new Integer(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
Integer.valueOf(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
M_Locator_ID = Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_Locator_ID");
if (M_Locator_ID != 0)
mTab.setValue("M_Locator_ID", new Integer(M_Locator_ID));
mTab.setValue("M_Locator_ID", Integer.valueOf(M_Locator_ID));
}
else
mTab.setValue("M_AttributeSetInstance_ID", null);
@ -542,7 +543,7 @@ public class CalloutInOut extends CalloutEngine
// Set UOM/Locator/Qty
MProduct product = MProduct.get(ctx, M_Product_ID.intValue());
mTab.setValue("C_UOM_ID", new Integer (product.getC_UOM_ID()));
mTab.setValue("C_UOM_ID", Integer.valueOf(product.getC_UOM_ID()));
BigDecimal QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
mTab.setValue("MovementQty", QtyEntered);
if (M_Locator_ID != 0)
@ -551,7 +552,7 @@ public class CalloutInOut extends CalloutEngine
{
MLocator loc = MLocator.get(ctx, product.getM_Locator_ID());
if (M_Warehouse_ID == loc.getM_Warehouse_ID())
mTab.setValue("M_Locator_ID", new Integer (product.getM_Locator_ID()));
mTab.setValue("M_Locator_ID", Integer.valueOf(product.getM_Locator_ID()));
else
if (log.isLoggable(Level.FINE)) log.fine("No Locator for M_Product_ID=" + M_Product_ID + " and M_Warehouse_ID=" + M_Warehouse_ID);
}
@ -591,7 +592,7 @@ public class CalloutInOut extends CalloutEngine
{
int C_UOM_To_ID = ((Integer)value).intValue();
QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
if (QtyEntered.compareTo(QtyEntered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@ -622,7 +623,7 @@ public class CalloutInOut extends CalloutEngine
{
int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
QtyEntered = (BigDecimal)value;
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
if (QtyEntered.compareTo(QtyEntered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@ -648,7 +649,7 @@ public class CalloutInOut extends CalloutEngine
int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
MovementQty = (BigDecimal)value;
int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision();
BigDecimal MovementQty1 = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP);
BigDecimal MovementQty1 = MovementQty.setScale(precision, RoundingMode.HALF_UP);
if (MovementQty.compareTo(MovementQty1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected MovementQty "
@ -704,7 +705,7 @@ public class CalloutInOut extends CalloutEngine
if (selectedM_Locator_ID != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Selected M_Locator_ID=" + selectedM_Locator_ID);
mTab.setValue("M_Locator_ID", new Integer (selectedM_Locator_ID));
mTab.setValue("M_Locator_ID", Integer.valueOf(selectedM_Locator_ID));
}
}
MAttributeSetInstance asi = MAttributeSetInstance.get(ctx, M_ASI_ID.intValue(), 0);

35
org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -161,7 +162,7 @@ public class CalloutInvoice extends CalloutEngine
}
// PriceList & IsTaxIncluded & Currency
Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
if (!rs.wasNull())
mTab.setValue("M_PriceList_ID", ii);
else
@ -171,13 +172,13 @@ public class CalloutInvoice extends CalloutEngine
{
MPriceList pl = new MPriceList(ctx, i, null);
if (IsSOTrx == pl.isSOPriceList())
mTab.setValue("M_PriceList_ID", new Integer(i));
mTab.setValue("M_PriceList_ID", Integer.valueOf(i));
else
{
String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC";
ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx);
if (ii != 0)
mTab.setValue("M_PriceList_ID", new Integer(ii));
mTab.setValue("M_PriceList_ID", Integer.valueOf(ii));
}
}
}
@ -189,7 +190,7 @@ public class CalloutInvoice extends CalloutEngine
if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C")) // Credits are Payment Term
s = X_C_Invoice.PAYMENTRULE_OnCredit;
// Payment Term
ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
if (!rs.wasNull())
mTab.setValue("C_PaymentTerm_ID", ii);
@ -206,7 +207,7 @@ public class CalloutInvoice extends CalloutEngine
if (locID == 0)
mTab.setValue("C_BPartner_Location_ID", null);
else
mTab.setValue("C_BPartner_Location_ID", new Integer(locID));
mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID));
// Contact - overwritten by InfoBP selection
int contID = rs.getInt("AD_User_ID");
@ -219,7 +220,7 @@ public class CalloutInvoice extends CalloutEngine
if (contID == 0)
mTab.setValue("AD_User_ID", null);
else
mTab.setValue("AD_User_ID", new Integer(contID));
mTab.setValue("AD_User_ID", Integer.valueOf(contID));
// CreditAvailable
if (IsSOTrx)
@ -358,9 +359,9 @@ public class CalloutInvoice extends CalloutEngine
mTab.setValue("PriceLimit", pp.getPriceLimit());
mTab.setValue("PriceActual", pp.getPriceStd());
mTab.setValue("PriceEntered", pp.getPriceStd());
mTab.setValue("C_Currency_ID", new Integer(pp.getC_Currency_ID()));
mTab.setValue("C_Currency_ID", Integer.valueOf(pp.getC_Currency_ID()));
// mTab.setValue("Discount", pp.getDiscount());
mTab.setValue("C_UOM_ID", new Integer(pp.getC_UOM_ID()));
mTab.setValue("C_UOM_ID", Integer.valueOf(pp.getC_UOM_ID()));
Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N");
Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");
//
@ -393,7 +394,7 @@ public class CalloutInvoice extends CalloutEngine
}
mTab.setValue("M_AttributeSetInstance_ID", null);
mTab.setValue("S_ResourceAssignment_ID", null);
mTab.setValue("C_UOM_ID", new Integer(100)); // EA
mTab.setValue("C_UOM_ID", Integer.valueOf(100)); // EA
Env.setContext(ctx, WindowNo, "DiscountSchema", "N");
String sql = "SELECT ChargeAmt FROM C_Charge WHERE C_Charge_ID=?";
@ -490,7 +491,7 @@ public class CalloutInvoice extends CalloutEngine
if (C_Tax_ID == 0)
mTab.fireDataStatusEEvent(CLogger.retrieveError());
else
mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID));
mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID));
//
return amt (ctx, WindowNo, mTab, mField, value);
} // tax
@ -618,7 +619,7 @@ public class CalloutInvoice extends CalloutEngine
{
PriceActual = new BigDecimal ((100.0 - Discount.doubleValue()) / 100.0 * PriceList.doubleValue());
if (PriceActual.scale() > StdPrecision)
PriceActual = PriceActual.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
PriceActual = PriceActual.setScale(StdPrecision, RoundingMode.HALF_UP);
PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
C_UOM_To_ID, PriceActual);
if (PriceEntered == null)
@ -634,7 +635,7 @@ public class CalloutInvoice extends CalloutEngine
else
Discount = new BigDecimal ((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0);
if (Discount.scale() > 2)
Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP);
Discount = Discount.setScale(2, RoundingMode.HALF_UP);
mTab.setValue("Discount", Discount);
}
log.fine("amt = PriceEntered=" + PriceEntered + ", Actual" + PriceActual + ", Discount=" + Discount);
@ -663,7 +664,7 @@ public class CalloutInvoice extends CalloutEngine
{
Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0);
if (Discount.scale () > 2)
Discount = Discount.setScale (2, BigDecimal.ROUND_HALF_UP);
Discount = Discount.setScale (2, RoundingMode.HALF_UP);
// mTab.setValue ("Discount", Discount);
}
}
@ -671,7 +672,7 @@ public class CalloutInvoice extends CalloutEngine
// Line Net Amt
BigDecimal LineNetAmt = QtyInvoiced.multiply(PriceActual);
if (LineNetAmt.scale() > StdPrecision)
LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
if (log.isLoggable(Level.INFO)) log.info("amt = LineNetAmt=" + LineNetAmt);
mTab.setValue("LineNetAmt", LineNetAmt);
@ -757,7 +758,7 @@ public class CalloutInvoice extends CalloutEngine
{
int C_UOM_To_ID = ((Integer)value).intValue();
QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
if (QtyEntered.compareTo(QtyEntered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@ -788,7 +789,7 @@ public class CalloutInvoice extends CalloutEngine
{
int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
QtyEntered = (BigDecimal)value;
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
if (QtyEntered.compareTo(QtyEntered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@ -814,7 +815,7 @@ public class CalloutInvoice extends CalloutEngine
int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
QtyInvoiced = (BigDecimal)value;
int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision();
BigDecimal QtyInvoiced1 = QtyInvoiced.setScale(precision, BigDecimal.ROUND_HALF_UP);
BigDecimal QtyInvoiced1 = QtyInvoiced.setScale(precision, RoundingMode.HALF_UP);
if (QtyInvoiced.compareTo(QtyInvoiced1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyInvoiced Scale "

11
org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -108,7 +109,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C")) // Credits are Payment Term
s = X_C_Invoice.PAYMENTRULE_OnCredit;
// Payment Term
Integer ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
if (!rs.wasNull())
mTab.setValue("C_PaymentTerm_ID", ii);
@ -125,7 +126,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
if (locID == 0)
mTab.setValue("C_BPartner_Location_ID", null);
else
mTab.setValue("C_BPartner_Location_ID", new Integer(locID));
mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID));
// Contact - overwritten by InfoBP selection
int contID = rs.getInt("AD_User_ID");
@ -138,7 +139,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
if (contID == 0)
mTab.setValue("AD_User_ID", null);
else
mTab.setValue("AD_User_ID", new Integer(contID));
mTab.setValue("AD_User_ID", Integer.valueOf(contID));
// CreditAvailable
if (IsSOTrx)
@ -324,7 +325,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
if (C_Tax_ID == 0)
mTab.fireDataStatusEEvent(CLogger.retrieveError());
else
mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID));
mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID));
//
return amt (ctx, WindowNo, mTab, mField, value);
} // tax
@ -360,7 +361,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
// Line Net Amt
BigDecimal LineNetAmt = QtyEntered.multiply(PriceEntered);
if (LineNetAmt.scale() > StdPrecision)
LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
// Calculate Tax Amount
boolean IsTaxIncluded = "Y".equals(Env.getContext(Env.getCtx(), WindowNo, "IsTaxIncluded"));

60
org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -186,7 +187,7 @@ public class CalloutOrder extends CalloutEngine
if (s != null && s.length() != 0)
mTab.setValue("PaymentRule", s);
// Payment Term
Integer ii =new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
Integer ii =Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
if (!rs.wasNull())
mTab.setValue("C_PaymentTerm_ID", ii);
// InvoiceRule
@ -278,7 +279,7 @@ public class CalloutOrder extends CalloutEngine
}
// PriceList (indirect: IsTaxIncluded & Currency)
Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
if (!rs.wasNull())
mTab.setValue("M_PriceList_ID", ii);
else
@ -288,13 +289,13 @@ public class CalloutOrder extends CalloutEngine
{
MPriceList pl = new MPriceList(ctx, i, null);
if (IsSOTrx == pl.isSOPriceList())
mTab.setValue("M_PriceList_ID", new Integer(i));
mTab.setValue("M_PriceList_ID", Integer.valueOf(i));
else
{
String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC";
ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx);
if (ii != 0)
mTab.setValue("M_PriceList_ID", new Integer(ii));
mTab.setValue("M_PriceList_ID", Integer.valueOf(ii));
}
}
}
@ -325,7 +326,7 @@ public class CalloutOrder extends CalloutEngine
if (bill_Location_ID == 0)
mTab.setValue("Bill_Location_ID", null);
else
mTab.setValue("Bill_Location_ID", new Integer(bill_Location_ID));
mTab.setValue("Bill_Location_ID", Integer.valueOf(bill_Location_ID));
// Ship-To Location
if (shipTo_ID == 0)
shipTo_ID = rs.getInt("C_BPartner_Location_ID");
@ -333,7 +334,7 @@ public class CalloutOrder extends CalloutEngine
if (shipTo_ID == 0)
mTab.setValue("C_BPartner_Location_ID", null);
else
mTab.setValue("C_BPartner_Location_ID", new Integer(shipTo_ID));
mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(shipTo_ID));
// Contact - overwritten by InfoBP selection
int contID = rs.getInt("AD_User_ID");
@ -347,8 +348,8 @@ public class CalloutOrder extends CalloutEngine
mTab.setValue("AD_User_ID", null);
else
{
mTab.setValue("AD_User_ID", new Integer(contID));
mTab.setValue("Bill_User_ID", new Integer(contID));
mTab.setValue("AD_User_ID", Integer.valueOf(contID));
mTab.setValue("Bill_User_ID", Integer.valueOf(contID));
}
// CreditAvailable
@ -399,7 +400,7 @@ public class CalloutOrder extends CalloutEngine
if (s != null && s.length() != 0)
mTab.setValue("PaymentRule", s);
// Payment Term
ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
if (!rs.wasNull())
mTab.setValue("C_PaymentTerm_ID", ii);
// InvoiceRule
@ -479,7 +480,7 @@ public class CalloutOrder extends CalloutEngine
if (rs.next())
{
// PriceList (indirect: IsTaxIncluded & Currency)
Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
if (!rs.wasNull())
mTab.setValue("M_PriceList_ID", ii);
else
@ -489,13 +490,13 @@ public class CalloutOrder extends CalloutEngine
{
MPriceList pl = new MPriceList(ctx, i, null);
if (IsSOTrx == pl.isSOPriceList())
mTab.setValue("M_PriceList_ID", new Integer(i));
mTab.setValue("M_PriceList_ID", Integer.valueOf(i));
else
{
String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC";
ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx);
if (ii != 0)
mTab.setValue("M_PriceList_ID", new Integer(ii));
mTab.setValue("M_PriceList_ID", Integer.valueOf(ii));
}
}
}
@ -518,7 +519,7 @@ public class CalloutOrder extends CalloutEngine
if (bill_Location_ID == 0)
mTab.setValue("Bill_Location_ID", null);
else
mTab.setValue("Bill_Location_ID", new Integer(bill_Location_ID));
mTab.setValue("Bill_Location_ID", Integer.valueOf(bill_Location_ID));
// Contact - overwritten by InfoBP selection
int contID = rs.getInt("AD_User_ID");
@ -531,7 +532,7 @@ public class CalloutOrder extends CalloutEngine
if (contID == 0)
mTab.setValue("Bill_User_ID", null);
else
mTab.setValue("Bill_User_ID", new Integer(contID));
mTab.setValue("Bill_User_ID", Integer.valueOf(contID));
// CreditAvailable
if (IsSOTrx)
@ -577,7 +578,7 @@ public class CalloutOrder extends CalloutEngine
if (s != null && s.length() != 0)
mTab.setValue("PaymentRule", s);
// Payment Term
ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID"));
if (!rs.wasNull())
mTab.setValue("C_PaymentTerm_ID", ii);
// InvoiceRule
@ -783,9 +784,9 @@ public class CalloutOrder extends CalloutEngine
mTab.setValue("PriceLimit", pp.getPriceLimit());
mTab.setValue("PriceActual", pp.getPriceStd());
mTab.setValue("PriceEntered", pp.getPriceStd());
mTab.setValue("C_Currency_ID", new Integer(pp.getC_Currency_ID()));
mTab.setValue("C_Currency_ID", Integer.valueOf(pp.getC_Currency_ID()));
mTab.setValue("Discount", pp.getDiscount());
mTab.setValue("C_UOM_ID", new Integer(pp.getC_UOM_ID()));
mTab.setValue("C_UOM_ID", Integer.valueOf(pp.getC_UOM_ID()));
mTab.setValue("QtyOrdered", mTab.getValue("QtyEntered"));
Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N");
Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N");
@ -795,7 +796,7 @@ public class CalloutOrder extends CalloutEngine
// Integer wh = (Integer)mTab.getValue("M_Warehouse_ID");
// if (wh.intValue() != M_Warehouse_ID)
// {
// mTab.setValue("M_Warehouse_ID", new Integer(M_Warehouse_ID));
// mTab.setValue("M_Warehouse_ID", Integer.valueOf(M_Warehouse_ID));
// ADialog.warn(,WindowNo, "WarehouseChanged");
// }
@ -822,7 +823,7 @@ public class CalloutOrder extends CalloutEngine
{
Integer C_OrderLine_ID = (Integer)mTab.getValue("C_OrderLine_ID");
if (C_OrderLine_ID == null)
C_OrderLine_ID = new Integer(0);
C_OrderLine_ID = Integer.valueOf(0);
BigDecimal notReserved = MOrderLine.getNotReserved(ctx,
M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID,
C_OrderLine_ID.intValue());
@ -869,7 +870,7 @@ public class CalloutOrder extends CalloutEngine
}
mTab.setValue("M_AttributeSetInstance_ID", null);
mTab.setValue("S_ResourceAssignment_ID", null);
mTab.setValue("C_UOM_ID", new Integer(100)); // EA
mTab.setValue("C_UOM_ID", Integer.valueOf(100)); // EA
Env.setContext(ctx, WindowNo, "DiscountSchema", "N");
String sql = "SELECT ChargeAmt FROM C_Charge WHERE C_Charge_ID=?";
@ -976,7 +977,7 @@ public class CalloutOrder extends CalloutEngine
if (C_Tax_ID == 0)
mTab.fireDataStatusEEvent(CLogger.retrieveError());
else
mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID));
mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID));
//
if (steps) log.warning("fini");
return amt(ctx, WindowNo, mTab, mField, value);
@ -1119,7 +1120,7 @@ public class CalloutOrder extends CalloutEngine
if ( PriceList.doubleValue() != 0 )
PriceActual = BigDecimal.valueOf((100.0 - Discount.doubleValue()) / 100.0 * PriceList.doubleValue());
if (PriceActual.scale() > StdPrecision)
PriceActual = PriceActual.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
PriceActual = PriceActual.setScale(StdPrecision, RoundingMode.HALF_UP);
PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
C_UOM_To_ID, PriceActual);
if (PriceEntered == null)
@ -1135,7 +1136,7 @@ public class CalloutOrder extends CalloutEngine
else
Discount = BigDecimal.valueOf((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0);
if (Discount.scale() > 2)
Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP);
Discount = Discount.setScale(2, RoundingMode.HALF_UP);
mTab.setValue("Discount", Discount);
}
if (log.isLoggable(Level.FINE)) log.fine("PriceEntered=" + PriceEntered + ", Actual=" + PriceActual + ", Discount=" + Discount);
@ -1163,7 +1164,7 @@ public class CalloutOrder extends CalloutEngine
{
Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0);
if (Discount.scale () > 2)
Discount = Discount.setScale (2, BigDecimal.ROUND_HALF_UP);
Discount = Discount.setScale (2, RoundingMode.HALF_UP);
mTab.setValue ("Discount", Discount);
}
}
@ -1171,7 +1172,7 @@ public class CalloutOrder extends CalloutEngine
// Line Net Amt
BigDecimal LineNetAmt = QtyOrdered.multiply(PriceActual);
if (LineNetAmt.scale() > StdPrecision)
LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
if (log.isLoggable(Level.INFO)) log.info("LineNetAmt=" + LineNetAmt);
mTab.setValue("LineNetAmt", LineNetAmt);
//
@ -1210,7 +1211,7 @@ public class CalloutOrder extends CalloutEngine
{
int C_UOM_To_ID = ((Integer)value).intValue();
QtyEntered = (BigDecimal)mTab.getValue("QtyEntered");
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
if (QtyEntered.compareTo(QtyEntered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@ -1241,7 +1242,7 @@ public class CalloutOrder extends CalloutEngine
{
int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
QtyEntered = (BigDecimal)value;
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP);
BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP);
if (QtyEntered.compareTo(QtyEntered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID
@ -1267,7 +1268,7 @@ public class CalloutOrder extends CalloutEngine
int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID");
QtyOrdered = (BigDecimal)value;
int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision();
BigDecimal QtyOrdered1 = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP);
BigDecimal QtyOrdered1 = QtyOrdered.setScale(precision, RoundingMode.HALF_UP);
if (QtyOrdered.compareTo(QtyOrdered1) != 0)
{
if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyOrdered Scale "
@ -1315,7 +1316,7 @@ public class CalloutOrder extends CalloutEngine
{
Integer C_OrderLine_ID = (Integer)mTab.getValue("C_OrderLine_ID");
if (C_OrderLine_ID == null)
C_OrderLine_ID = new Integer(0);
C_OrderLine_ID = Integer.valueOf(0);
BigDecimal notReserved = MOrderLine.getNotReserved(ctx,
M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID,
C_OrderLine_ID.intValue());
@ -1356,6 +1357,7 @@ public class CalloutOrder extends CalloutEngine
return "";
} // SalesOrderTenderType
/* Called from AD_Org_ID in tables C_Order, M_InOut, M_Inventory, M_Requisition */
public String organization(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value){
//Return if Organization field is empty

2
org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
View File

@ -127,7 +127,7 @@ public class CalloutPaySelection extends CalloutEngine
{
OpenAmt = rs.getBigDecimal(1);
DiscountAmt = rs.getBigDecimal(2);
IsSOTrx = new Boolean ("Y".equals(rs.getString(3)));
IsSOTrx = Boolean.valueOf ("Y".equals(rs.getString(3)));
}
}
catch (SQLException e)

19
org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -94,9 +95,9 @@ public class CalloutPayment extends CalloutEngine
rs = pstmt.executeQuery ();
if (rs.next ())
{
mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1)));
mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1)));
int C_Currency_ID = rs.getInt (2); // Set Invoice Currency
mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID));
mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID));
//
BigDecimal InvoiceOpen = rs.getBigDecimal (3); // Set Invoice
// OPen Amount
@ -170,9 +171,9 @@ public class CalloutPayment extends CalloutEngine
rs = pstmt.executeQuery ();
if (rs.next ())
{
mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1)));
mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1)));
int C_Currency_ID = rs.getInt (2); // Set Order Currency
mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID));
mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID));
//
BigDecimal GrandTotal = rs.getBigDecimal (3); // Set Pay
// Amount
@ -411,7 +412,7 @@ public class CalloutPayment extends CalloutEngine
}
//
InvoiceOpenAmt = InvoiceOpenAmt.multiply (CurrencyRate).setScale (
currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
currency.getStdPrecision (), RoundingMode.HALF_UP);
if (log.isLoggable(Level.FINE)) log.fine ("Rate=" + CurrencyRate + ", InvoiceOpenAmt="
+ InvoiceOpenAmt);
}
@ -420,16 +421,16 @@ public class CalloutPayment extends CalloutEngine
|| colName.equals ("C_ConversionType_ID"))
{
PayAmt = PayAmt.multiply (CurrencyRate).setScale (
currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
currency.getStdPrecision (), RoundingMode.HALF_UP);
mTab.setValue ("PayAmt", PayAmt);
DiscountAmt = DiscountAmt.multiply (CurrencyRate).setScale (
currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
currency.getStdPrecision (), RoundingMode.HALF_UP);
mTab.setValue ("DiscountAmt", DiscountAmt);
WriteOffAmt = WriteOffAmt.multiply (CurrencyRate).setScale (
currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
currency.getStdPrecision (), RoundingMode.HALF_UP);
mTab.setValue ("WriteOffAmt", WriteOffAmt);
OverUnderAmt = OverUnderAmt.multiply (CurrencyRate).setScale (
currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP);
currency.getStdPrecision (), RoundingMode.HALF_UP);
mTab.setValue ("OverUnderAmt", OverUnderAmt);
}
// No Invoice - Set Discount, Witeoff, Under/Over to 0

4
org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java
View File

@ -95,9 +95,9 @@ public class CalloutPaymentAllocate extends CalloutEngine
rs = pstmt.executeQuery();
if (rs.next())
{
// mTab.setValue("C_BPartner_ID", new Integer(rs.getInt(1)));
// mTab.setValue("C_BPartner_ID", Integer.valueOf(rs.getInt(1)));
// int C_Currency_ID = rs.getInt(2); // Set Invoice Currency
// mTab.setValue("C_Currency_ID", new Integer(C_Currency_ID));
// mTab.setValue("C_Currency_ID", Integer.valueOf(C_Currency_ID));
//
BigDecimal InvoiceOpen = rs.getBigDecimal(3); // Set Invoice OPen Amount
if (InvoiceOpen == null)

2
org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java
View File

@ -43,7 +43,7 @@ public class CalloutProductCategory extends CalloutEngine
Integer productCategoryId = (Integer) mTab.getValue(MProductCategory.COLUMNNAME_M_Product_Category_ID);
if (productCategoryId == null)
productCategoryId = new Integer(0);
productCategoryId = Integer.valueOf(0);
if (productCategoryId.intValue() > 0) {
MProductCategory pc = new MProductCategory(ctx, productCategoryId.intValue(), null);

2
org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java
View File

@ -51,7 +51,7 @@ public class CalloutProduction extends CalloutEngine
if (Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_Product_ID") == M_Product_ID.intValue()
&& Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID") != 0)
{
mTab.setValue("M_AttributeSetInstance_ID", new Integer(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID")));
}
else
{

3
org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Properties;
import java.util.logging.Level;
@ -61,7 +62,7 @@ public class CalloutProject extends CalloutEngine
//
BigDecimal PlannedAmt = PlannedQty.multiply(PlannedPrice);
if (PlannedAmt.scale() > StdPrecision)
PlannedAmt = PlannedAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
PlannedAmt = PlannedAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
//
if (log.isLoggable(Level.FINE)) log.fine("PlannedQty=" + PlannedQty + " * PlannedPrice=" + PlannedPrice + " -> PlannedAmt=" + PlannedAmt + " (Precision=" + StdPrecision+ ")");
mTab.setValue("PlannedAmt", PlannedAmt);

2
org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java
View File

@ -138,7 +138,7 @@ public class CalloutRequest extends CalloutEngine
MRequestType rt = MRequestType.get(ctx, R_RequestType_ID);
int R_Status_ID = rt.getDefaultR_Status_ID();
if (R_Status_ID != 0)
mTab.setValue("R_Status_ID", new Integer(R_Status_ID));
mTab.setValue("R_Status_ID", Integer.valueOf(R_Status_ID));
return "";
} // type

3
org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
View File

@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
import java.util.Properties;
import java.util.logging.Level;
@ -89,7 +90,7 @@ public class CalloutRequisition extends CalloutEngine
// Multiply
BigDecimal LineNetAmt = Qty.multiply(PriceActual);
if (LineNetAmt.scale() > StdPrecision)
LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP);
line.setLineNetAmt(LineNetAmt);
if (log.isLoggable(Level.INFO)) log.info("amt - LineNetAmt=" + LineNetAmt);
//

4
org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java
View File

@ -98,7 +98,7 @@ public class CalloutTimeExpense extends CalloutEngine
if (priceActual == null)
priceActual = rs.getBigDecimal("PriceLimit");
// Currency
Integer ii = new Integer(rs.getInt("C_Currency_ID"));
Integer ii = Integer.valueOf(rs.getInt("C_Currency_ID"));
if (!rs.wasNull())
mTab.setValue("C_Currency_ID", ii);
}
@ -143,7 +143,7 @@ public class CalloutTimeExpense extends CalloutEngine
if (priceActual == null)
priceActual = rs.getBigDecimal("PriceLimit");
// Currency
Integer ii = new Integer(rs.getInt("C_Currency_ID"));
Integer ii = Integer.valueOf(rs.getInt("C_Currency_ID"));
if (!rs.wasNull())
mTab.setValue("C_Currency_ID", ii);
}

6
org.adempiere.base.process/.classpath
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>

6
org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
View File

@ -1,7 +1,3 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.release=enabled

5
org.adempiere.base.process/META-INF/MANIFEST.MF
View File

@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Processes
Bundle-SymbolicName: org.adempiere.base.process
Bundle-Version: 5.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Version: 6.1.0.qualifier
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Export-Package: org.adempiere.process,
org.compiere.process,
@ -16,3 +16,4 @@ Import-Package: javax.mail;version="1.5",
Eclipse-RegisterBuddy: org.adempiere.base
Bundle-ClassPath: .
Automatic-Module-Name: org.adempiere.base.process
Bundle-Vendor: iDempiere Community

2
org.adempiere.base.process/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent>
<artifactId>org.adempiere.base.process</artifactId>

6
org.adempiere.base.process/src/org/adempiere/process/Export.java
View File

@ -173,7 +173,7 @@ public class Export extends SvrProcess
if (rs.next())
{
HashMap<String, Integer> variableMap = new HashMap<String, Integer>();
variableMap.put(TOTAL_SEGMENTS, new Integer(1));
variableMap.put(TOTAL_SEGMENTS, Integer.valueOf(1));
Element rootElement = outDocument.createElement(exportFormat.getValue());
rootElement.appendChild(outDocument.createComment(exportFormat.getDescription()));
@ -395,11 +395,11 @@ public class Export extends SvrProcess
if (variableName != null && !"".equals(variableName) ) {
Integer var = variableMap.get(variableName);
if (var == null) {
var = new Integer(0);
var = Integer.valueOf(0);
}
int intValue = var.intValue();
intValue++;
variableMap.put(variableName, new Integer(intValue));
variableMap.put(variableName, Integer.valueOf(intValue));
}
}

13
org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java
View File

@ -39,8 +39,8 @@ import java.util.Date;
import java.util.logging.Level;
import org.adempiere.model.GenericPO;
import org.compiere.model.MHouseKeeping;
import org.compiere.model.MTable;
import org.compiere.model.X_AD_HouseKeeping;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess;
import org.compiere.util.AdempiereSystemError;
@ -73,10 +73,15 @@ public class HouseKeeping extends SvrProcess{
protected String doIt() throws Exception {
X_AD_HouseKeeping houseKeeping = new X_AD_HouseKeeping(getCtx(), p_AD_HouseKeeping_ID,get_TrxName());
MHouseKeeping houseKeeping = new MHouseKeeping(getCtx(), p_AD_HouseKeeping_ID,get_TrxName());
String tableName = null;
int tableID = houseKeeping.getAD_Table_ID();
if (tableID > 0) {
MTable table = new MTable(getCtx(), tableID, get_TrxName());
String tableName = table.getTableName();
tableName = table.getTableName();
} else {
tableName = houseKeeping.getTableName();
}
String whereClause = houseKeeping.getWhereClause();
int noins = 0;
int noexp = 0;
@ -93,7 +98,7 @@ public class HouseKeeping extends SvrProcess{
} //saveInHistoric
Date date = new Date();
if (houseKeeping.isExportXMLBackup()){
if (houseKeeping.isExportXMLBackup() && houseKeeping.getAD_Table_ID() > 0){
String pathFile = houseKeeping.getBackupFolder();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String dateString = dateFormat.format(date);

4
org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java
View File

@ -122,7 +122,7 @@ public class AcctSchemaCopyAcct extends SvrProcess
String columnName = pp.getName();
MAccount sourceAccount = MAccount.get(getCtx(), sourceC_ValidCombination_ID);
MAccount targetAccount = createAccount(targetAS, sourceAccount);
target.setValue(columnName, new Integer(targetAccount.getC_ValidCombination_ID()));
target.setValue(columnName, Integer.valueOf(targetAccount.getC_ValidCombination_ID()));
}
if (!target.save())
throw new AdempiereSystemError("Could not Save GL");
@ -147,7 +147,7 @@ public class AcctSchemaCopyAcct extends SvrProcess
String columnName = pp.getName();
MAccount sourceAccount = MAccount.get(getCtx(), sourceC_ValidCombination_ID);
MAccount targetAccount = createAccount(targetAS, sourceAccount);
target.setValue(columnName, new Integer(targetAccount.getC_ValidCombination_ID()));
target.setValue(columnName, Integer.valueOf(targetAccount.getC_ValidCombination_ID()));
}
if (!target.save())
throw new AdempiereSystemError("Could not Save Default");

4
org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java
View File

@ -91,9 +91,9 @@ public class ChangeLogProcess extends SvrProcess
if (para[i].getParameter() == null)
;
else if (name.equals("CheckNewValue"))
p_CheckNewValue = new Boolean("Y".equals(para[i].getParameter()));
p_CheckNewValue = Boolean.valueOf("Y".equals(para[i].getParameter()));
else if (name.equals("CheckOldValue"))
p_CheckOldValue = new Boolean("Y".equals(para[i].getParameter()));
p_CheckOldValue = Boolean.valueOf("Y".equals(para[i].getParameter()));
else if (name.equals("SetCustomization"))
p_SetCustomization = "Y".equals(para[i].getParameter());
else

3
org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.logging.Level;
import org.compiere.model.MBPartner;
@ -191,7 +192,7 @@ public class DistributionCreate extends SvrProcess
BigDecimal ratio = dll.getRatio();
BigDecimal qty = p_Qty.multiply(ratio);
if (qty.compareTo(Env.ZERO) != 0)
qty = qty.divide(m_dl.getRatioTotal(), m_product.getUOMPrecision(), BigDecimal.ROUND_HALF_UP);
qty = qty.divide(m_dl.getRatioTotal(), m_product.getUOMPrecision(), RoundingMode.HALF_UP);
BigDecimal minQty = dll.getMinQty();
if (qty.compareTo(minQty) < 0)
qty = minQty;

7
org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
@ -413,7 +414,7 @@ public class DistributionRun extends SvrProcess
if (detail.isCanAdjust())
{
BigDecimal diffRatio = detail.getRatio().multiply(difference)
.divide(ratioTotal, BigDecimal.ROUND_HALF_UP); // precision from total
.divide(ratioTotal, RoundingMode.HALF_UP); // precision from total
if (log.isLoggable(Level.FINE)) log.fine("Detail=" + detail.toString()
+ ", Allocation=" + detail.getActualAllocation()
+ ", DiffRatio=" + diffRatio);
@ -646,7 +647,7 @@ public class DistributionRun extends SvrProcess
log.info("Qty Total Available:" + drl.getTotalQty());
log.info("Qty Total Demand:" + totalration);
}
BigDecimal factor = ration.divide(totalration, 12 , BigDecimal.ROUND_HALF_UP);
BigDecimal factor = ration.divide(totalration, 12 , RoundingMode.HALF_UP);
record.setQty(drl.getTotalQty().multiply(factor));
record.saveEx();
}
@ -750,7 +751,7 @@ public class DistributionRun extends SvrProcess
, p_M_DistributionRun_ID, record.getM_Product_ID());
MDistributionRunLine drl = (MDistributionRunLine) MTable.get(getCtx(), MDistributionRunLine.Table_ID).getPO(record.getM_DistributionRunLine_ID(), get_TrxName());
BigDecimal ration = record.getRatio();
BigDecimal factor = ration.divide(total_ration,BigDecimal.ROUND_HALF_UP);
BigDecimal factor = ration.divide(total_ration,RoundingMode.HALF_UP);
record.setQty(factor.multiply(drl.getTotalQty()));
record.saveEx();
}

2
org.adempiere.base.process/src/org/compiere/process/DunningPrint.java
View File

@ -159,7 +159,7 @@ public class DunningPrint extends SvrProcess
// query
MQuery query = new MQuery("C_Dunning_Header_v");
query.addRestriction("C_DunningRunEntry_ID", MQuery.EQUAL,
new Integer(entry.getC_DunningRunEntry_ID()));
Integer.valueOf(entry.getC_DunningRunEntry_ID()));
// Engine
PrintInfo info = new PrintInfo(

5
org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.logging.Level;
import org.compiere.model.MCurrency;
@ -122,7 +123,7 @@ public class InOutCreateInvoice extends SvrProcess
BigDecimal igt = invoice.getGrandTotal();
BigDecimal percent = Env.ONE;
if (ogt.compareTo(igt) != 0)
percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP);
percent = igt.divide(ogt, 10, RoundingMode.HALF_UP);
MCurrency cur = MCurrency.get(order.getCtx(), order.getC_Currency_ID());
int scale = cur.getStdPrecision();
@ -132,7 +133,7 @@ public class InOutCreateInvoice extends SvrProcess
if (percent != Env.ONE) {
BigDecimal propDueAmt = ops.getDueAmt().multiply(percent);
if (propDueAmt.scale() > scale)
propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP);
propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP);
ips.setDueAmt(propDueAmt);
}
ips.setC_Invoice_ID(invoice.getC_Invoice_ID());

7
org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
@ -448,7 +449,7 @@ public class InOutGenerate extends SvrProcess
if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
line.setQtyEntered(qty
.multiply(orderLine.getQtyEntered())
.divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
.divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
line.setLine(m_line + orderLine.getLine());
if (!line.save())
throw new IllegalStateException("Could not create Shipment Line");
@ -504,7 +505,7 @@ public class InOutGenerate extends SvrProcess
line.setQty(line.getMovementQty().add(deliver));
if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
line.setQtyEntered(line.getMovementQty().multiply(orderLine.getQtyEntered())
.divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
.divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
line.setLine(m_line + orderLine.getLine());
if (!line.save())
throw new IllegalStateException("Could not create Shipment Line");
@ -530,7 +531,7 @@ public class InOutGenerate extends SvrProcess
line.setQty(toDeliver);
if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
line.setQtyEntered(line.getMovementQty().multiply(orderLine.getQtyEntered())
.divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP));
.divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP));
line.setLine(m_line + orderLine.getLine());
if (!line.save())
throw new IllegalStateException("Could not create Shipment Line");

7
org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -300,7 +301,7 @@ public class InvoiceGenerate extends SvrProcess
if (oLine.getQtyEntered().compareTo(oLine.getQtyOrdered()) != 0)
qtyEntered = toInvoice
.multiply(oLine.getQtyEntered())
.divide(oLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP);
.divide(oLine.getQtyOrdered(), 12, RoundingMode.HALF_UP);
createLine (order, oLine, toInvoice, qtyEntered);
}
else if (!completeOrder)
@ -492,7 +493,7 @@ public class InvoiceGenerate extends SvrProcess
BigDecimal igt = m_invoice.getGrandTotal();
BigDecimal percent = Env.ONE;
if (ogt.compareTo(igt) != 0)
percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP);
percent = igt.divide(ogt, 10, RoundingMode.HALF_UP);
MCurrency cur = MCurrency.get(order.getCtx(), order.getC_Currency_ID());
int scale = cur.getStdPrecision();
@ -502,7 +503,7 @@ public class InvoiceGenerate extends SvrProcess
if (percent != Env.ONE) {
BigDecimal propDueAmt = ops.getDueAmt().multiply(percent);
if (propDueAmt.scale() > scale)
propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP);
propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP);
ips.setDueAmt(propDueAmt);
}
ips.setC_Invoice_ID(m_invoice.getC_Invoice_ID());

2
org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
View File

@ -275,7 +275,7 @@ public class InvoicePrint extends SvrProcess
format.setTranslationLanguage(language);
// query
MQuery query = new MQuery("C_Invoice_Header_v");
query.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(C_Invoice_ID));
query.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(C_Invoice_ID));
// Engine
PrintInfo info = new PrintInfo(

3
org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
View File

@ -20,6 +20,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -544,7 +545,7 @@ public class M_PriceList_Create extends SvrProcess {
}
if (conversion != null)
{
price = price.divide(conversion.getDivideRate(), precision, BigDecimal.ROUND_HALF_DOWN);
price = price.divide(conversion.getDivideRate(), precision, RoundingMode.HALF_DOWN);
StringBuilder sqlupdate = new StringBuilder();
sqlupdate.append("UPDATE M_ProductPrice SET PriceList=").append(price).append(" WHERE M_PriceList_Version_ID=").append(p_PriceList_Version_ID)
.append(" AND M_Product_ID= ").append(product_id);

5
org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.logging.Level;
import org.compiere.model.MProduct;
@ -95,8 +96,8 @@ public class ProductUOMConvert extends SvrProcess
throw new AdempiereUserError("@NotFound@: @C_UOM_Conversion_ID@");
MUOM uomTo = MUOM.get(getCtx(), productTo.getC_UOM_ID());
BigDecimal qtyTo = p_Qty.divide(conversion.getDivideRate(), uomTo.getStdPrecision(), BigDecimal.ROUND_HALF_UP);
BigDecimal qtyTo6 = p_Qty.divide(conversion.getDivideRate(), 6, BigDecimal.ROUND_HALF_UP);
BigDecimal qtyTo = p_Qty.divide(conversion.getDivideRate(), uomTo.getStdPrecision(), RoundingMode.HALF_UP);
BigDecimal qtyTo6 = p_Qty.divide(conversion.getDivideRate(), 6, RoundingMode.HALF_UP);
if (qtyTo.compareTo(qtyTo6) != 0)
throw new AdempiereUserError("@StdPrecision@: " + qtyTo + " <> " + qtyTo6
+ " (" + p_Qty + "/" + conversion.getDivideRate() + ")");

2
org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java
View File

@ -358,7 +358,7 @@ public class ReplenishReport extends SvrProcess
if(custom==null){
// if no OSGi plugin is found try the legacy way (in my own classpath)
Class<?> clazz = Class.forName(className);
custom = (ReplenishInterface) clazz.newInstance();
custom = (ReplenishInterface) clazz.getDeclaredConstructor().newInstance();
}
}
catch (Exception e)

2
org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
View File

@ -392,7 +392,7 @@ public class ReplenishReportProduction extends SvrProcess
if(custom==null){
// if no OSGi plugin is found try the legacy way (in my own classpath)
Class<?> clazz = Class.forName(className);
custom = (ReplenishInterface) clazz.newInstance();
custom = (ReplenishInterface) clazz.getDeclaredConstructor().newInstance();
}
}
catch (Exception e)

6
org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
View File

@ -170,7 +170,7 @@ public class ReplicationLocal extends SvrProcess
+ "WHERE rt.IsActive='Y' AND t.IsActive='Y'"
+ " AND AD_ReplicationStrategy_ID=? " // #1
+ "ORDER BY t.LoadSeq";
RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())});
RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())});
if (rowset == null)
throw new Exception("setupRemote - No RowSet Data");
@ -222,7 +222,7 @@ public class ReplicationLocal extends SvrProcess
+ " AND AD_ReplicationStrategy_ID=?" // #1
+ " AND rt.ReplicationType='M' " // Merge
+ "ORDER BY t.LoadSeq";
RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())});
RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())});
try
{
while (rowset.next())
@ -400,7 +400,7 @@ public class ReplicationLocal extends SvrProcess
+ " AND AD_ReplicationStrategy_ID=?" // #1
+ " AND rt.ReplicationType='R' " // Reference
+ "ORDER BY t.LoadSeq";
RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())});
RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())});
try
{
while (rowset.next())

3
org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java
View File

@ -17,6 +17,7 @@
package org.compiere.process;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.logging.Level;
import org.compiere.model.MBPartner;
@ -129,7 +130,7 @@ public class RfQCreateSO extends SvrProcess
{
margin = margin.add(Env.ONEHUNDRED);
price = price.multiply(margin)
.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP);
.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);
}
}
} // price

4
org.adempiere.base.process/src/org/compiere/process/SendMailText.java
View File

@ -252,7 +252,7 @@ public class SendMailText extends SvrProcess
private Boolean sendIndividualMail (String Name, int AD_User_ID, StringBuilder unsubscribe)
{
// Prevent two email
Integer ii = new Integer (AD_User_ID);
Integer ii = Integer.valueOf(AD_User_ID);
if (m_list.contains(ii))
return null;
m_list.add(ii);
@ -290,7 +290,7 @@ public class SendMailText extends SvrProcess
}
StringBuilder msglog = new StringBuilder((OK ? "@OK@" : "@ERROR@")).append(" - ").append(to.getEMail());
addLog(0, null, null, msglog.toString());
return new Boolean(OK);
return Boolean.valueOf(OK);
} // sendIndividualMail
} // SendMailText

147
org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java Normal file
View File

@ -0,0 +1,147 @@
/**********************************************************************
* This file is part of iDempiere ERP Open Source *
* http://www.idempiere.org *
* *
* Copyright (C) Contributors *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
* MA 02110-1301, USA. *
* *
* Contributors: *
* - Carlos Ruiz *
**********************************************************************/
package org.idempiere.process;
import java.math.BigDecimal;
import java.util.List;
import java.util.logging.Level;
import org.compiere.model.MArchive;
import org.compiere.model.MAttachment;
import org.compiere.model.MTable;
import org.compiere.model.Query;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess;
import org.compiere.util.DB;
import org.compiere.util.Msg;
/**
* IDEMPIERE-2395
* @author Carlos Ruiz - globalqss
*/
public class CleanOrphanCascade extends SvrProcess
{
/**
* Prepare - e.g., get Parameters.
*/
protected void prepare()
{
for (ProcessInfoParameter para : getParameter())
{
String name = para.getParameterName();
log.log(Level.SEVERE, "Unknown Parameter: " + name);
}
} // prepare
/**
* Perform process.
* @return Message
* @throws Exception
*/
protected String doIt() throws Exception
{
if (log.isLoggable(Level.INFO)) log.info("");
String whereTables = ""
+ " IsView = 'N' "
+ "AND TableName != 'AD_ChangeLog' "
+ "AND EXISTS (SELECT 1 "
+ " FROM AD_Column ct "
+ " WHERE ct.IsActive='Y' AND ct.AD_Table_ID = AD_Table.AD_Table_ID "
+ " AND ct.ColumnName = 'AD_Table_ID') "
+ "AND EXISTS (SELECT 1 "
+ " FROM AD_Column cr "
+ " WHERE cr.IsActive='Y' AND cr.AD_Table_ID = AD_Table.AD_Table_ID "
+ " AND cr.ColumnName = 'Record_ID') "
+ "AND EXISTS (SELECT 1 "
+ " FROM AD_Column ck "
+ " WHERE ck.IsActive='Y' AND ck.AD_Table_ID = AD_Table.AD_Table_ID "
+ " AND ck.ColumnName = AD_Table.TableName || '_ID')";
List<MTable> tables = new Query(getCtx(), "AD_Table", whereTables, get_TrxName())
.setOnlyActiveRecords(true)
.setOrderBy("TableName")
.list();
for (MTable table : tables) {
String tableName = table.getTableName();
StringBuilder sqlRef = new StringBuilder();
sqlRef.append("SELECT DISTINCT t.AD_Table_ID, ");
sqlRef.append(" t.TableName ");
sqlRef.append("FROM ").append(tableName).append(" r ");
sqlRef.append(" JOIN AD_Table t ON ( r.AD_Table_ID = t.AD_Table_ID ) ");
sqlRef.append("ORDER BY t.Tablename");
List<List<Object>> rowTables = DB.getSQLArrayObjectsEx(get_TrxName(), sqlRef.toString());
if (rowTables != null) {
for (List<Object> row : rowTables) {
int refTableID = ((BigDecimal) row.get(0)).intValue();
String refTableName = row.get(1).toString();
MTable refTable = MTable.get(getCtx(), refTableID);
if (refTable.getKeyColumns().length != 1) {
log.warning("Wrong reference for table " + tableName + " -> " + refTableName);
continue;
}
String colRef = refTable.getKeyColumns()[0];
StringBuilder whereClause = new StringBuilder();
whereClause.append("AD_Table_ID = ").append(refTableID);
whereClause.append(" AND NOT EXISTS (SELECT ").append(colRef);
whereClause.append(" FROM ").append(refTableName).append(" ");
whereClause.append(" WHERE ").append(refTableName).append(".").append(colRef).append(" = ").append(tableName).append(".Record_ID)");
int noDel = 0;
if (MAttachment.Table_Name.equals(tableName)) {
// special case for attachment because of store
List<MAttachment> attachments = new Query(getCtx(), tableName, whereClause.toString(), get_TrxName()).list();
for (MAttachment attachment : attachments) {
attachment.deleteEx(true, get_TrxName());
noDel++;
}
} else if (MArchive.Table_Name.equals(tableName)) {
// special case for archive because of store
List<MArchive> archives = new Query(getCtx(), tableName, whereClause.toString(), get_TrxName()).list();
for (MArchive archive : archives) {
archive.deleteEx(true, get_TrxName());
noDel++;
}
} else {
StringBuilder sqlDelete = new StringBuilder();
sqlDelete.append("DELETE FROM ").append(tableName).append(" WHERE ").append(whereClause);
noDel = DB.executeUpdateEx(sqlDelete.toString(), get_TrxName());
}
if (noDel > 0) {
addLog(Msg.parseTranslation(getCtx(), noDel + " " + tableName + " " + "@Deleted@ -> " + refTableName));
}
}
}
}
return "@OK@";
} // doIt
} // CleanOrphanCascade

1
org.adempiere.base.process/src/org/idempiere/process/ImportCSVProcess.java
View File

@ -144,6 +144,7 @@ public class ImportCSVProcess extends SvrProcess implements DataStatusListener {
protected void importFile(String filePath, IGridTabImporter csvImporter, GridTab activeTab, List<GridTab> childTabs) throws Exception {
m_file_istream = new FileInputStream(filePath);
m_file_istream = m_importTemplate.validateFile(m_file_istream);
File outFile = csvImporter.fileImport(activeTab, childTabs, m_file_istream, Charset.forName(m_importTemplate.getCharacterSet()), p_ImportMode, processUI);
// TODO: Potential improvement - traverse the outFile and call addLog with the results

7
org.adempiere.base/.classpath
View File

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="add-exports" value="java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/bsh.jar"/>

6
org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
View File

@ -10,15 +10,12 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@ -27,7 +24,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@ -108,4 +104,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.release=enabled

17
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Core
Bundle-SymbolicName: org.adempiere.base;singleton:=true
Bundle-Version: 5.1.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-ClassPath: .,
lib/bsh.jar,
lib/commons-validator.jar,
@ -56,14 +56,14 @@ Export-Package: bsh,
org.idempiere.broadcast,
org.idempiere.distributed,
org.idempiere.model
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Import-Package: com.sun.mail.smtp;version="1.5",
javax.activation,
javax.jms;version="1.1.0",
javax.mail;version="1.5",
javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0",
javax.xml.bind;version="2.3.0",
junit.framework;version="3.8.2";resolution:=optional,
junit.textui;version="3.8.2";resolution:=optional,
net.sf.cglib.proxy,
@ -77,8 +77,6 @@ Import-Package: com.sun.mail.smtp;version="1.5",
org.apache.ecs,
org.apache.ecs.xhtml,
org.apache.felix.scr;version="1.6.0",
org.apache.poi.hssf.usermodel,
org.apache.poi.ss.usermodel,
org.apache.tools.ant,
org.apache.tools.ant.taskdefs,
org.eclipse.core.runtime;version="3.4.0",
@ -121,6 +119,11 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
com.itextpdf;bundle-version="0.0.0",
net.sf.supercsv.super-csv;bundle-version="0.0.0",
bcprov;bundle-version="1.54.0",
groovy-all;bundle-version="0.0.0",
org.krysalis.barcode4j;bundle-version="0.0.0"
org.krysalis.barcode4j;bundle-version="0.0.0",
groovy,
javax.xml;bundle-version="1.3.4",
org.apache.poi.poi;bundle-version="3.15.0",
org.apache.poi.poi-ooxml;bundle-version="3.15.0",
javax.activation;bundle-version="1.1.0"
Automatic-Module-Name: org.adempiere.base
Bundle-Vendor: iDempiere Community

10
org.adempiere.base/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent>
<artifactId>org.adempiere.base</artifactId>
@ -17,7 +17,11 @@
<artifactId>tycho-compiler-plugin</artifactId>
<configuration>
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
<compilerArgument>-warn:+forbidden</compilerArgument>
<compilerArgs>
<arg>-warn:+forbidden</arg>
<arg>--add-exports</arg>
<arg>java.sql.rowset/com.sun.rowset=ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
@ -45,7 +49,7 @@
<artifactItem>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<version>2.2.1</version>
<version>2.7.0</version>
</artifactItem>
<artifactItem>
<groupId>it.sauronsoftware.cron4j</groupId>

2
org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java
View File

@ -252,7 +252,7 @@ public class AddressLookup implements AddressLookupInterface {
NodeList firstValueList = firstElement.getElementsByTagName("Value");
Element ValueElement = (Element) firstValueList.item(0);
if (log.isLoggable(Level.FINE)){log.log(Level.FINE, "Value: " + ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim() + " Node: " + i);}
resultCode = (int) new Integer(ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim());
resultCode = (int) Integer.valueOf(ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim());
}
}

2
org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java
View File

@ -44,7 +44,7 @@ public class DefaultAddressValidationFactory implements IAddressValidationFactor
{
Class<?> ppClass = Class.forName(className);
if (ppClass != null)
myProcessor = (IAddressValidation) ppClass.newInstance();
myProcessor = (IAddressValidation) ppClass.getDeclaredConstructor().newInstance();
}
catch (Error e1)
{ // NoClassDefFound

2
org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java
View File

@ -80,7 +80,7 @@ public class DefaultCalloutFactory implements ICalloutFactory {
//Get callout
try
{
callout = (Callout)calloutClass.newInstance();
callout = (Callout)calloutClass.getDeclaredConstructor().newInstance();
}
catch (Exception ex)
{

2
org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java
View File

@ -269,7 +269,7 @@ public class DefaultModelFactory implements IModelFactory {
s_log.warning("No transaction Constructor for " + clazz + " (" + msg + ")");
}
PO po = constructor!=null ? (PO)constructor.newInstance(new Object[] {Env.getCtx(), new Integer(Record_ID), trxName}) : null;
PO po = constructor!=null ? (PO)constructor.newInstance(new Object[] {Env.getCtx(), Integer.valueOf(Record_ID), trxName}) : null;
return po;
}
catch (Exception e)

2
org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java
View File

@ -56,7 +56,7 @@ public class DefaultModelValidatorFactory implements IModelValidatorFactory {
}
if (clazz != null) {
try {
validator = (ModelValidator)clazz.newInstance();
validator = (ModelValidator)clazz.getDeclaredConstructor().newInstance();
} catch (Exception e) {
e.printStackTrace();
}

2
org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java
View File

@ -42,7 +42,7 @@ public class DefaultPaymentExporterFactory implements IPaymentExporterFactory {
try {
Class<?> peClass = Class.forName(className);
if (peClass != null)
myExporter = (PaymentExport)peClass.newInstance();
myExporter = (PaymentExport)peClass.getDeclaredConstructor().newInstance();
} catch (Error e1) { // NoClassDefFound
s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage());
return null;

2
org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java
View File

@ -45,7 +45,7 @@ public class DefaultPaymentProcessorFactory implements IPaymentProcessorFactory
try {
Class<?> ppClass = Class.forName(className);
if (ppClass != null)
myProcessor = (PaymentProcessor)ppClass.newInstance();
myProcessor = (PaymentProcessor)ppClass.getDeclaredConstructor().newInstance();
} catch (Error e1) { // NoClassDefFound
s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage());
return null;

2
org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java
View File

@ -77,7 +77,7 @@ public class DefaultProcessFactory implements IProcessFactory {
//Get Process
try
{
process = (ProcessCall)processClass.newInstance();
process = (ProcessCall)processClass.getDeclaredConstructor().newInstance();
}
catch (Exception ex)
{

2
org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java
View File

@ -43,7 +43,7 @@ public class DefaultShipmentProcessorFactory implements IShipmentProcessorFactor
{
Class<?> ppClass = Class.forName(className);
if (ppClass != null)
myProcessor = (IShipmentProcessor) ppClass.newInstance();
myProcessor = (IShipmentProcessor) ppClass.getDeclaredConstructor().newInstance();
}
catch (Error e1)
{ // NoClassDefFound

2
org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java
View File

@ -38,7 +38,7 @@ public class DefaultTaxProviderFactory implements ITaxProviderFactory {
{
Class<?> ppClass = Class.forName(className);
if (ppClass != null)
myCalculator = (ITaxProvider) ppClass.newInstance();
myCalculator = (ITaxProvider) ppClass.getDeclaredConstructor().newInstance();
}
catch (Error e1)
{ // NoClassDefFound

2
org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java
View File

@ -368,7 +368,7 @@ public class RequestEventHandler extends AbstractEventHandler implements Managed
}
// Check duplicate receivers
Integer ii = new Integer (AD_User_ID);
Integer ii = Integer.valueOf(AD_User_ID);
if (userList.contains(ii))
continue;
userList.add(ii);

48
org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
View File

@ -35,6 +35,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.compiere.model.MSysConfig;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
@ -166,13 +167,13 @@ public abstract class AbstractExcelExporter
if (isHeader) {
if (m_fontHeader == null) {
m_fontHeader = m_workbook.createFont();
m_fontHeader.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
m_fontHeader.setBold(true);
}
font = m_fontHeader;
}
else if (isFunctionRow()) {
font = m_workbook.createFont();
font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
font.setBold(true);
font.setItalic(true);
}
else {
@ -228,29 +229,38 @@ public abstract class AbstractExcelExporter
String key = "cell-"+col+"-"+displayType;
HSSFCellStyle cs = m_styles.get(key);
if (cs == null) {
boolean isHighlightNegativeNumbers = true;
cs = m_workbook.createCellStyle();
HSSFFont font = getFont(false);
cs.setFont(font);
// Border
cs.setBorderLeft((short)1);
cs.setBorderTop((short)1);
cs.setBorderRight((short)1);
cs.setBorderBottom((short)1);
cs.setBorderLeft(BorderStyle.THIN);
cs.setBorderTop(BorderStyle.THIN);
cs.setBorderRight(BorderStyle.THIN);
cs.setBorderBottom(BorderStyle.THIN);
//
if (DisplayType.isDate(displayType)) {
cs.setDataFormat(m_dataFormat.getFormat(DisplayType.getDateFormat(getLanguage()).toPattern()));
}
else if (DisplayType.isNumeric(displayType)) {
DecimalFormat df = DisplayType.getNumberFormat(displayType, getLanguage());
String format = getFormatString(df, isHighlightNegativeNumbers);
cs.setDataFormat(m_dataFormat.getFormat(format));
}
String cellFormat = getCellFormat(row, col);
if (cellFormat != null)
cs.setDataFormat(m_dataFormat.getFormat(cellFormat));
m_styles.put(key, cs);
}
return cs;
}
protected String getCellFormat(int row, int col) {
boolean isHighlightNegativeNumbers = true;
int displayType = getDisplayType(row, col);
String cellFormat = null;
if (DisplayType.isDate(displayType)) {
cellFormat = DisplayType.getDateFormat(getLanguage()).toPattern();
} else if (DisplayType.isNumeric(displayType)) {
DecimalFormat df = DisplayType.getNumberFormat(displayType, getLanguage());
cellFormat = getFormatString(df, isHighlightNegativeNumbers);
}
return cellFormat;
}
private HSSFCellStyle getHeaderStyle(int col)
{
String key = "header-"+col;
@ -259,10 +269,10 @@ public abstract class AbstractExcelExporter
HSSFFont font_header = getFont(true);
cs_header = m_workbook.createCellStyle();
cs_header.setFont(font_header);
cs_header.setBorderLeft((short)2);
cs_header.setBorderTop((short)2);
cs_header.setBorderRight((short)2);
cs_header.setBorderBottom((short)2);
cs_header.setBorderLeft(BorderStyle.MEDIUM);
cs_header.setBorderTop(BorderStyle.MEDIUM);
cs_header.setBorderRight(BorderStyle.MEDIUM);
cs_header.setBorderBottom(BorderStyle.MEDIUM);
cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text"));
cs_header.setWrapText(true);
m_styles.put(key, cs_header);

40
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
View File

@ -223,7 +223,7 @@ public class GridTabCSVExporter implements IGridTabExporter
int index =0;
int rowDetail=0;
int record_Id = 0;
boolean isActiveRow = true;
// boolean isActiveRow = true;
gridTab.setCurrentRow(idxrow);
for(GridField field : getFields(gridTab)){
MColumn column = MColumn.get(Env.getCtx(), field.getAD_Column_ID());
@ -241,16 +241,16 @@ public class GridTabCSVExporter implements IGridTabExporter
value = resolveValue(gridTab, table, column, idxrow, headName);
}
//Ignore row
if("IsActive".equals(headName) && value!=null && Boolean.valueOf((Boolean)value)==false){
isActiveRow=false;
break;
}
// if("IsActive".equals(headName) && value!=null && Boolean.valueOf((Boolean)value)==false){
// isActiveRow=false;
// break;
// }
row.put(headName,value);
idxfld++;
index++;
}
if(!isActiveRow)
continue;
// if(!isActiveRow)
// continue;
if(specialHDispayType > 0 && record_Id > 0){
switch(specialHDispayType) {
@ -336,8 +336,8 @@ public class GridTabCSVExporter implements IGridTabExporter
if (tab.isReadOnly())
result = Msg.getMsg(Env.getCtx(),"FieldIsReadOnly", new Object[] {gridTab.getName()});
if (gridTab.getTableName().endsWith("_Acct"))
result = "Accounting Tab are not exported by default: "+ gridTab.getName();
// if (gridTab.getTableName().endsWith("_Acct"))
// result = "Accounting Tab are not exported by default: "+ gridTab.getName();
return result;
}
@ -354,10 +354,10 @@ public class GridTabCSVExporter implements IGridTabExporter
for(Map.Entry<GridTab, GridField[]> childTabDetail : tabMapDetails.entrySet()) {
GridTab childTab = childTabDetail.getKey();
//String whereCla = getWhereClause (childTab, parentGrid, currentParentIndex);
//String whereCla = getWhereClause (childTab ,record_Id ,keyColumnParent);
//childTab.getTableModel().dataRequery(whereCla, false, 0);
Map<String,Object> row = new HashMap<String,Object>();
boolean isActiveRow = true;
// boolean isActiveRow = true;
if (childTab.getRowCount() > 0) {
int specialRecordId = 0;
for(GridField field : childTabDetail.getValue()){
@ -374,19 +374,19 @@ public class GridTabCSVExporter implements IGridTabExporter
String headName = headArray.get(headArray.indexOf(childTab.getTableName()+">"+resolveColumnName(tableDetail,column)));
value = resolveValue(childTab, MTable.get(Env.getCtx(),childTab.getTableName()), column, currentDetRow, headName.substring(headName.indexOf(">")+ 1,headName.length()));
if(DisplayType.Payment == field.getDisplayType())
if(DisplayType.Payment == field.getDisplayType() && value != null)
value = MRefList.getListName(Env.getCtx(),REFERENCE_PAYMENTRULE, value.toString());
row.put(headName,value);
if(value!=null)
hasDetails = true;
//Ignore row
if(headName.contains("IsActive")&& value!=null && Boolean.valueOf((Boolean)value)==false){
isActiveRow=false;
break;
// if(headName.contains("IsActive")&& value!=null && Boolean.valueOf((Boolean)value)==false){
// isActiveRow=false;
// break;
// }
}
}
if(isActiveRow && specialDetDispayType > 0 && specialRecordId > 0){
if(/* isActiveRow && */ specialDetDispayType > 0 && specialRecordId > 0){
MLocation address = new MLocation (Env.getCtx(),specialRecordId,null);
for(String specialHeader:resolveSpecialColumnName(specialDetDispayType)){
String columnName = specialHeader.substring(specialHeader.indexOf(">")+1,specialHeader.length());
@ -411,7 +411,7 @@ public class GridTabCSVExporter implements IGridTabExporter
}
}
}
if(isActiveRow)
// if(isActiveRow)
activeRow.putAll(row);
}
if (hasDetails)
@ -495,6 +495,8 @@ public class GridTabCSVExporter implements IGridTabExporter
name.append("[DocumentNo]");
}
}
} else if (DisplayType.Account == column.getAD_Reference_ID()) {
name.append("[Combination]");
}
return name.toString();
}
@ -592,7 +594,7 @@ public class GridTabCSVExporter implements IGridTabExporter
|| field.isEncryptedColumn()
|| !(field.isDisplayed() || field.isDisplayedGrid()))
continue;
if (field.isParentValue() || (!field.isReadOnly() && field.isDisplayedGrid()))
if (field.isParentValue() || (!field.isReadOnly() && field.isDisplayedGrid()) || field.isParentColumn())
gridFieldList.add(field);
}

21
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java
View File

@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.nio.charset.Charset;
import java.sql.SQLException;
import java.sql.Timestamp;
@ -904,6 +905,9 @@ public class GridTabCSVImporter implements IGridTabImporter
for(int i = startindx; i < endindx +1; i++){
String columnName = header.get(i);
Object value = tmpRow.get(i);
//Validate Address
if (!"C_Location".equals(gridTab.getTableName()))
{
//Validate Address
if(header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)) && !isAddressValidated){
StringBuilder specialColumns = new StringBuilder();
@ -916,6 +920,7 @@ public class GridTabCSVImporter implements IGridTabImporter
}else if (header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)) && isAddressValidated){
continue;
}
}
if(value!=null)
isEmptyRow=false;
@ -1067,7 +1072,7 @@ public class GridTabCSVImporter implements IGridTabImporter
if(isForeing)
foreignColumn = header.get(i).substring(header.get(i).indexOf("[")+1,header.get(i).indexOf("]"));
if(header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID))){
if(!"C_Location".equals(gridTab.getTableName()) && header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID))){
if(address == null){
if(isInsertMode()){
@ -1173,7 +1178,7 @@ public class GridTabCSVImporter implements IGridTabImporter
} else {
int id = resolveForeign(foreignTable, foreignColumn, value,field,trx);
if (id < 0)
if(id < 0)
return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{header.get(i),value});
setValue = id;
@ -1219,6 +1224,16 @@ public class GridTabCSVImporter implements IGridTabImporter
}else{
return Msg.getMsg(Env.getCtx(),"Invalid") + " Column ["+column.getColumnName()+"]";
}
} else if (DisplayType.isNumeric(field.getDisplayType()) || DisplayType.isID(field.getDisplayType())) {
if (columnName.endsWith("_ID")) {
if (!(value instanceof Integer)) {
Integer idValue = Integer.valueOf(value.toString());
value = idValue;
}
} else if (!(value instanceof BigDecimal)) {
BigDecimal decValue = new BigDecimal(value.toString());
value = decValue;
}
}
setValue = value;
isThereRow =true;
@ -1349,7 +1364,7 @@ public class GridTabCSVImporter implements IGridTabImporter
//Process columnKeys + Foreign to add restrictions.
for (int i = startindx ; i < endindx + 1 ; i++){
boolean isKeyColumn = header.get(i).indexOf("/") > 0 && ( header.get(i).endsWith("K") || header.get(i).endsWith("KT"));
if(isKeyColumn && !header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID))){
if(isKeyColumn && ("C_Location".equals(gridTab.getTableName()) || !header.get(i).contains(MTable.getTableName(Env.getCtx(),MLocation.Table_ID)))){
boolean isForeing = header.get(i).indexOf("[") > 0 && header.get(i).indexOf("]")>0;
boolean isDetail = header.get(i).indexOf(">") > 0;
columnwithKey = getColumnName(isKeyColumn,isForeing,isDetail,header.get(i));

2
org.adempiere.base/src/org/adempiere/model/GenericPO.java
View File

@ -114,7 +114,7 @@ public class GenericPO extends PO {
if (AD_OrgTrx_ID == 0)
set_Value("AD_OrgTrx_ID", null);
else
set_Value("AD_OrgTrx_ID", new Integer(AD_OrgTrx_ID));
set_Value("AD_OrgTrx_ID", Integer.valueOf(AD_OrgTrx_ID));
}
/**

2
org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java
View File

@ -50,7 +50,7 @@ public class MBroadcastMessage extends X_AD_BroadcastMessage
public static MBroadcastMessage get (Properties ctx, int AD_BroadcastMessage_ID)
{
Integer key = new Integer(AD_BroadcastMessage_ID);
Integer key = Integer.valueOf(AD_BroadcastMessage_ID);
MBroadcastMessage retValue = (MBroadcastMessage)s_cache.get(key);
if (retValue == null)
{

3
org.adempiere.base/src/org/adempiere/model/PromotionRule.java
View File

@ -14,6 +14,7 @@
package org.adempiere.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -295,7 +296,7 @@ public class PromotionRule {
nol.setC_Charge_ID(C_Charge_ID);
nol.setQty(qty);
if (discount.scale() > 2)
discount = discount.setScale(2, BigDecimal.ROUND_HALF_UP);
discount = discount.setScale(2, RoundingMode.HALF_UP);
nol.setPriceEntered(discount.negate());
nol.setPriceActual(discount.negate());
if (ol != null && Integer.toString(ol.getLine()).endsWith("0")) {

22
org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java
View File

@ -26,6 +26,8 @@ import org.compiere.print.MPrintFormatItem;
import org.compiere.print.MPrintPaper;
import org.compiere.print.PrintData;
import org.compiere.print.PrintDataElement;
import org.compiere.util.DisplayType;
import org.compiere.util.Util;
/**
* Export PrintData to Excel (XLS) file
@ -192,4 +194,24 @@ extends AbstractExcelExporter
sheet.setMargin(HSSFSheet.BottomMargin, ((double)paper.getMarginBottom()) / 72);
//
}
@Override
protected String getCellFormat(int row, int col) {
String cellFormat = null;
PrintDataElement pde = getPDE(row, col);
if (pde != null && !Util.isEmpty(pde.getM_formatPattern())) {
String formatPattern = pde.getM_formatPattern();
int displayType = pde.getDisplayType();
if (DisplayType.isDate(displayType)) {
cellFormat = DisplayType.getDateFormat(displayType, getLanguage(), formatPattern).toPattern();
} else if (DisplayType.isNumeric(displayType)) {
cellFormat = DisplayType.getNumberFormat(displayType, getLanguage(), formatPattern).toPattern();
}
} else {
return super.getCellFormat(row, col);
}
return cellFormat;
}
}

8
org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
View File

@ -69,16 +69,16 @@ public class ResetLockedAccount extends SvrProcess {
if (DB.isPostgreSQL())
{
if (MAX_ACCOUNT_LOCK_MINUTES > 0)
sql.append( " AND EXTRACT(MINUTE FROM (now()-DateAccountLocked)) * 24 * 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
sql.append(" AND EXTRACT(EPOCH FROM (now()-DateAccountLocked)) / 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
if (MAX_INACTIVE_PERIOD > 0)
sql.append(" AND EXTRACT(DAY FROM (now()-DateLastLogin)) * 24 <= ").append(MAX_INACTIVE_PERIOD);
sql.append(" AND EXTRACT(EPOCH FROM (now()-DateLastLogin)) / 86400 <= ").append(MAX_INACTIVE_PERIOD);
}
else
{
if (MAX_ACCOUNT_LOCK_MINUTES > 0)
sql.append(" AND (SysDate-DateAccountLocked) * 24 * 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
sql.append(" AND (SysDate-DateAccountLocked) * 1440 > ").append(MAX_ACCOUNT_LOCK_MINUTES);
if (MAX_INACTIVE_PERIOD > 0)
sql.append(" AND (SysDate-DateLastLogin) * 24 <= ").append(MAX_INACTIVE_PERIOD);
sql.append(" AND (SysDate-DateLastLogin) <= ").append(MAX_INACTIVE_PERIOD);
}
int no = DB.executeUpdate(sql.toString(), p_AD_Client_ID, get_TrxName());

6
org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java
View File

@ -216,7 +216,7 @@ public abstract class AbstractDocumentSearch {
rsSO = pstmtSO.executeQuery();
Vector<Integer> idSO = new Vector<Integer>();
while (rsSO.next()) {
idSO.add(new Integer(rsSO.getInt(1)));
idSO.add(Integer.valueOf(rsSO.getInt(1)));
}
if (role.getWindowAccess(msd.getAD_Window_ID()) != null) {
msglog = new StringBuilder("Open Window: ").append(msd.getAD_Window_ID()).append(" / Table: ")
@ -225,7 +225,7 @@ public abstract class AbstractDocumentSearch {
if (idSO.size() == 0 && (searchString == null || searchString.trim().length() == 0)) {
// No search string - open the window with new record
idSO.add(new Integer(0));
idSO.add(Integer.valueOf(0));
}
openWindow(idSO, table.getTableName(), msd.getAD_Window_ID());
@ -239,7 +239,7 @@ public abstract class AbstractDocumentSearch {
rsPO = pstmtPO.executeQuery();
Vector<Integer> idPO = new Vector<Integer>();
while (rsPO.next()) {
idPO.add(new Integer(rsPO.getInt(1)));
idPO.add(Integer.valueOf(rsPO.getInt(1)));
}
if (role.getWindowAccess(msd.getPO_Window_ID()) != null) {
msglog = new StringBuilder("Open Window: ").append(msd.getPO_Window_ID()).append(" / Table: ")

4
org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java
View File

@ -406,10 +406,10 @@ public class GenerateModelJPA
sb.append("if (").append (columnName).append (" <= 0) ")
.append(setValue).append(" (\"").append(columnName).append("\", null); else \n");
}
sb.append(setValue).append(" (\"").append(columnName).append("\", new Integer(").append(columnName).append("));");
sb.append(setValue).append(" (\"").append(columnName).append("\", Integer.valueOf(").append(columnName).append("));");
}
else if (clazz.equals(Boolean.class))
sb.append(setValue).append(" (\"").append(columnName).append("\", new Boolean(").append(columnName).append("));");
sb.append(setValue).append(" (\"").append(columnName).append("\", Boolean.valueOf(").append(columnName).append("));");
else
{
if (isMandatory && AD_Reference_ID == 0) // does not apply to int/boolean

8
org.adempiere.base/src/org/compiere/Adempiere.java
View File

@ -67,11 +67,11 @@ public final class Adempiere
/** Timestamp */
static public final String ID = "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $";
/** Main Version String */
static public String MAIN_VERSION = "Release 5.1";
static public String MAIN_VERSION = "Release 6.1";
/** Detail Version as date Used for Client/Server */
static public String DATE_VERSION = "2017-10-31";
static public String DATE_VERSION = "2018-11-04";
/** Database Version as date Compared with AD_System */
static public String DB_VERSION = "2017-10-31";
static public String DB_VERSION = "2018-11-04";
/** Product Name */
static public final String NAME = "iDempiere\u00AE";
@ -92,7 +92,7 @@ public final class Adempiere
/** Subtitle */
static public final String SUB_TITLE = "Smart Suite ERP, CRM and SCM";
static public final String ADEMPIERE_R = "iDempiere\u00AE";
static public final String COPYRIGHT = "\u00A9 1999-2016 iDempiere\u00AE";
static public final String COPYRIGHT = "\u00A9 1999-2018 iDempiere\u00AE";
static private String s_ImplementationVersion = null;
static private String s_ImplementationVendor = null;

4
org.adempiere.base/src/org/compiere/acct/Doc.java
View File

@ -1036,12 +1036,12 @@ public abstract class Doc
}
// Get All Currencies
HashSet<Integer> set = new HashSet<Integer>();
set.add(new Integer(getC_Currency_ID()));
set.add(Integer.valueOf(getC_Currency_ID()));
for (int i = 0; p_lines != null && i < p_lines.length; i++)
{
int C_Currency_ID = p_lines[i].getC_Currency_ID();
if (C_Currency_ID != NO_CURRENCY)
set.add(new Integer(C_Currency_ID));
set.add(Integer.valueOf(C_Currency_ID));
}
// just one and the same

Some files were not shown because too many files have changed in this diff Show More