diff --git a/migration/i2.1/oracle/201501091412_IDEMPIERE-1695.sql b/migration/i2.1/oracle/201501091412_IDEMPIERE-1695.sql new file mode 100644 index 0000000000..fbdd928810 --- /dev/null +++ b/migration/i2.1/oracle/201501091412_IDEMPIERE-1695.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Jan 9, 2015 2:12:28 PM COT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Process_Para SET AD_Val_Rule_ID=102,Updated=TO_DATE('2015-01-09 14:12:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=644 +; + +SELECT register_migration_script('201501091412_IDEMPIERE-1695.sql') FROM dual +; + diff --git a/migration/i2.1/postgresql/201501091412_IDEMPIERE-1695.sql b/migration/i2.1/postgresql/201501091412_IDEMPIERE-1695.sql new file mode 100644 index 0000000000..847eb4f36f --- /dev/null +++ b/migration/i2.1/postgresql/201501091412_IDEMPIERE-1695.sql @@ -0,0 +1,8 @@ +-- Jan 9, 2015 2:12:28 PM COT +-- IDEMPIERE-1298 2Pack: Support copying of data from one client to another +UPDATE AD_Process_Para SET AD_Val_Rule_ID=102,Updated=TO_TIMESTAMP('2015-01-09 14:12:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=644 +; + +SELECT register_migration_script('201501091412_IDEMPIERE-1695.sql') FROM dual +; + diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceNGL.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceNGL.java index 3564abc424..a253180bc0 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoiceNGL.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceNGL.java @@ -240,7 +240,7 @@ public class InvoiceNGL extends SvrProcess MJournal journal = new MJournal (getCtx(), 0, get_TrxName()); journal.setC_DocType_ID(p_C_DocTypeReval_ID); journal.setPostingType(MJournal.POSTINGTYPE_Actual); - journal.setDateDoc(new Timestamp(System.currentTimeMillis())); + journal.setDateDoc(p_DateReval); journal.setDateAcct(p_DateReval); // sets the period too journal.setC_Currency_ID(as.getC_Currency_ID()); journal.setC_AcctSchema_ID (as.getC_AcctSchema_ID()); @@ -346,6 +346,7 @@ public class InvoiceNGL extends SvrProcess BigDecimal gainTotal, BigDecimal lossTotal, int AD_Org_ID, int lineNo) { if (journal == null) + throw new IllegalArgumentException("Journal is null"); // CR Entry = Gain if (gainTotal.signum() != 0) {