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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2013-11-15 10:30:35 -05:00
parent be01ca8b4f 81fc00ffb2
commit 440b94c171
10 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
migration/i1.0c/oracle/201311061318_IDEMPIERE-1083.sql → migration/i2.0/oracle/201311061318_IDEMPIERE-1083.sql
View File

7
migration/i2.0/oracle/201311071604_IDEMPIERE-1514.sql Normal file
View File

@ -0,0 +1,7 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Nov 7, 2013 9:30:44 PM ICT
UPDATE AD_Field SET SeqNo=70, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-11-07 21:30:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=60934
;

0
migration/i1.0c/postgresql/201311061318_IDEMPIERE-1083.sql → migration/i2.0/postgresql/201311061318_IDEMPIERE-1083.sql
View File

4
migration/i2.0/postgresql/201311071604_IDEMPIERE-1514.sql Normal file
View File

@ -0,0 +1,4 @@
-- Nov 7, 2013 9:30:44 PM ICT
UPDATE AD_Field SET SeqNo=70, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-11-07 21:30:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=60934
;

3
org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
View File

@ -23,6 +23,7 @@ import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.I_C_InvoiceLine;
import org.compiere.model.MInOut;
import org.compiere.model.MInOutLine;
@ -112,7 +113,7 @@ public class InOutGenerateRMA extends SvrProcess
}
catch (Exception ex)
{
log.log(Level.SEVERE, sql, ex);
throw new AdempiereException(ex);
}
finally
{

3
org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java
View File

@ -23,6 +23,7 @@ import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MInvoice;
import org.compiere.model.MInvoiceLine;
import org.compiere.model.MRMA;
@ -107,7 +108,7 @@ public class InvoiceGenerateRMA extends SvrProcess
}
catch (Exception ex)
{
log.log(Level.SEVERE, sql, ex);
throw new AdempiereException(ex);
}
finally
{

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

@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MClient;
import org.compiere.model.MInOut;
import org.compiere.model.MInOutLine;
@ -196,7 +197,7 @@ public class InOutGenerate extends SvrProcess
}
catch (Exception e)
{
log.log(Level.SEVERE, m_sql.toString(), e);
throw new AdempiereException(e);
}
return generate(pstmt);
} // doIt
@ -396,7 +397,7 @@ public class InOutGenerate extends SvrProcess
}
catch (Exception e)
{
log.log(Level.SEVERE, m_sql.toString(), e);
throw new AdempiereException(e);
}
finally
{

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

@ -22,6 +22,7 @@ import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MBPartner;
import org.compiere.model.MClient;
import org.compiere.model.MCurrency;
@ -178,7 +179,7 @@ public class InvoiceGenerate extends SvrProcess
}
catch (Exception e)
{
log.log(Level.SEVERE, sql.toString(), e);
throw new AdempiereException(e);
}
return generate(pstmt);
} // doIt
@ -324,7 +325,7 @@ public class InvoiceGenerate extends SvrProcess
}
catch (Exception e)
{
log.log(Level.SEVERE, "", e);
throw new AdempiereException(e);
}
finally
{

1
org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java
View File

@ -47,6 +47,7 @@ public class GridTab2PackExporter implements IGridTabExporter {
String tableName = gridTab.getTableName();
PackOut packOut = new PackOut();
packOut.setCtx(Env.getCtx());
packOut.setExportDictionaryEntity(true);
Map properties = new HashMap();
properties.putAll(Env.getCtx());
List<PackoutItem> packoutItems = new ArrayList<PackoutItem>();

6
org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
View File

@ -60,7 +60,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource;
/**
* PostgreSQL Database Port
*
* @author @author Jorg Janke, Victor P<EFBFBD>rez
* @author @author Jorg Janke, Victor Perez
* @version $Id: DB_PostgreSQL.java,v 1.23 2005/03/11 20:29:01 jjanke Exp $
* ---
* Modifications: removed static references to database connection and instead always
@ -1099,9 +1099,13 @@ public class DB_PostgreSQL implements AdempiereDatabase
public String getNameOfUniqueConstraintError(Exception e) {
String info = e.getMessage();
int fromIndex = info.indexOf("\"");
if (fromIndex == -1)
fromIndex = info.indexOf("\u00ab"); // quote for spanish postgresql message
if (fromIndex == -1)
return info;
int toIndex = info.indexOf("\"", fromIndex + 1);
if (toIndex == -1)
toIndex = info.indexOf("\u00bb", fromIndex + 1);
if (toIndex == -1)
return info;
return info.substring(fromIndex + 1, toIndex);