diff --git a/migration/i1.0c/oracle/201311061318_IDEMPIERE-1083.sql b/migration/i2.0/oracle/201311061318_IDEMPIERE-1083.sql similarity index 100% rename from migration/i1.0c/oracle/201311061318_IDEMPIERE-1083.sql rename to migration/i2.0/oracle/201311061318_IDEMPIERE-1083.sql diff --git a/migration/i2.0/oracle/201311071604_IDEMPIERE-1514.sql b/migration/i2.0/oracle/201311071604_IDEMPIERE-1514.sql new file mode 100644 index 0000000000..6e5849f226 --- /dev/null +++ b/migration/i2.0/oracle/201311071604_IDEMPIERE-1514.sql @@ -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 +; + diff --git a/migration/i1.0c/postgresql/201311061318_IDEMPIERE-1083.sql b/migration/i2.0/postgresql/201311061318_IDEMPIERE-1083.sql similarity index 100% rename from migration/i1.0c/postgresql/201311061318_IDEMPIERE-1083.sql rename to migration/i2.0/postgresql/201311061318_IDEMPIERE-1083.sql diff --git a/migration/i2.0/postgresql/201311071604_IDEMPIERE-1514.sql b/migration/i2.0/postgresql/201311071604_IDEMPIERE-1514.sql new file mode 100644 index 0000000000..61aabece1d --- /dev/null +++ b/migration/i2.0/postgresql/201311071604_IDEMPIERE-1514.sql @@ -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 +; + diff --git a/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java b/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java index 0d38d58f11..553dfb2181 100644 --- a/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java +++ b/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java @@ -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 { diff --git a/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java b/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java index c98e164533..d5a2e4e089 100644 --- a/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java +++ b/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java @@ -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 { diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java index 0e523c7a96..31d592a971 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java +++ b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java @@ -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 { diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java index 28da912213..199d272343 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java @@ -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 { diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java b/org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java index bd5c21cc0e..6d7c247d9f 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java @@ -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 packoutItems = new ArrayList(); diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java index 8e50815fa8..0d71c429bf 100755 --- a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java @@ -60,7 +60,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; /** * PostgreSQL Database Port * - * @author @author Jorg Janke, Victor P�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);