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

Merge with development

This commit is contained in:
hieplq 2015-04-02 09:22:07 +07:00
parent d482ac83a4 526388b39c
commit 47690cd929
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/i2.1/oracle/201504011139_IDEMPIERE-2548.sql Normal file
View File

@ -0,0 +1,11 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2548 Misspelling in Unit of Measure Type
-- Apr 1, 2015 11:39:33 AM COT
UPDATE AD_Ref_List SET Name='Weight',Updated=TO_DATE('2015-04-01 11:39:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=53530
;
SELECT register_migration_script('201504011139_IDEMPIERE-2548.sql') FROM dual
;

8
migration/i2.1/postgresql/201504011139_IDEMPIERE-2548.sql Normal file
View File

@ -0,0 +1,8 @@
-- IDEMPIERE-2548 Misspelling in Unit of Measure Type
-- Apr 1, 2015 11:39:33 AM COT
UPDATE AD_Ref_List SET Name='Weight',Updated=TO_TIMESTAMP('2015-04-01 11:39:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=53530
;
SELECT register_migration_script('201504011139_IDEMPIERE-2548.sql') FROM dual
;

1
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -1718,6 +1718,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
String whereClause = "AD_Org_ID=? AND C_Currency_ID=?";
MBankAccount ba = new Query(getCtx(),MBankAccount.Table_Name,whereClause,get_TrxName())
.setParameters(getAD_Org_ID(), getC_Currency_ID())
.setOnlyActiveRecords(true)
.setOrderBy("IsDefault DESC")
.first();
if (ba == null) {

27
org.adempiere.base/src/org/compiere/process/FactReconcile.java
View File

@ -17,7 +17,6 @@
package org.compiere.process;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.logging.Level;
@ -118,7 +117,6 @@ public class FactReconcile extends SvrProcess
if (log.isLoggable(Level.INFO)) log.info("AD_PInstance_ID= " + getAD_PInstance_ID());
PreparedStatement pstmt = null;
ResultSet rs = null;
int count;
int unmatched;
@ -126,8 +124,8 @@ public class FactReconcile extends SvrProcess
if (seq == null)
throw new AdempiereException("No sequence for Fact_Reconciliation table");
try
{
try
{
// add new facts into reconciliation table
sql = "INSERT into Fact_Reconciliation " +
"(Fact_Reconciliation_ID, AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy, " +
@ -144,6 +142,7 @@ public class FactReconcile extends SvrProcess
pstmt.setInt(1, seq.getAD_Sequence_ID());
pstmt.setInt(2, account.get_ID());
count = pstmt.executeUpdate();
DB.close(pstmt); pstmt = null;
if (log.isLoggable(Level.FINE))log.log(Level.FINE, "Inserted " + count + " new facts into Fact_Reconciliation");
// set the matchcode based on the rule found in AD_Rule
@ -160,6 +159,7 @@ public class FactReconcile extends SvrProcess
pstmt = DB.prepareStatement(sql, get_TrxName());
pstmt.setInt(1, account.get_ID());
count = pstmt.executeUpdate();
DB.close(pstmt); pstmt = null;
if (log.isLoggable(Level.FINE))log.log(Level.FINE, "Updated " + count + " match codes.");
@ -180,18 +180,17 @@ public class FactReconcile extends SvrProcess
unmatched = pstmt.executeUpdate();
if (log.isLoggable(Level.FINE))log.log(Level.FINE, "Cleared match codes from " + unmatched + " unreconciled facts.");
}
catch (SQLException e)
{
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
return e.getLocalizedMessage();
}
finally
{
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
}
finally
{
DB.close(pstmt);
pstmt = null;
}
return "Matched " + (count-unmatched) + " facts";
} // doIt