From 1e227ac399b3ef851ac0fc50a3e6e38aebff5af1 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 8 Nov 2013 16:55:41 -0500 Subject: [PATCH 1/4] IDEMPIERE-1489 Not able to Export column record --- .../src/org/adempiere/pipo2/GridTab2PackExporter.java | 1 + 1 file changed, 1 insertion(+) 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(); From c2729ab53fbf225bfc69ff7d8765d3db8b002ec0 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 13 Nov 2013 08:16:52 -0500 Subject: [PATCH 2/4] IDEMPIERE-1529 Dangerous catch exceptions (hiding or ignoring real problem) --- .../src/org/adempiere/process/InOutGenerateRMA.java | 3 ++- .../src/org/adempiere/process/InvoiceGenerateRMA.java | 3 ++- .../src/org/compiere/process/InOutGenerate.java | 5 +++-- .../src/org/compiere/process/InvoiceGenerate.java | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) 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 { From f34aad0d8621142e68f8822ec890312b2e45fdc2 Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 7 Nov 2013 22:03:34 +0700 Subject: [PATCH 3/4] IDEMPIERE-1514 field sales transaction in cash plan window is horizontal-deflecting --- migration/i2.0/oracle/201311071604_IDEMPIERE-1514.sql | 7 +++++++ migration/i2.0/postgresql/201311071604_IDEMPIERE-1514.sql | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 migration/i2.0/oracle/201311071604_IDEMPIERE-1514.sql create mode 100644 migration/i2.0/postgresql/201311071604_IDEMPIERE-1514.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/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 +; + From 78842945017553ce6358926bc2a0c59fb2a8250a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 15 Nov 2013 10:04:44 -0500 Subject: [PATCH 4/4] IDEMPIERE-1083 Print shipping label applet is not working / Move migration script from i1.0c to i2.0 since i1.0c is closed. --- migration/{i1.0c => i2.0}/oracle/201311061318_IDEMPIERE-1083.sql | 0 .../{i1.0c => i2.0}/postgresql/201311061318_IDEMPIERE-1083.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename migration/{i1.0c => i2.0}/oracle/201311061318_IDEMPIERE-1083.sql (100%) rename migration/{i1.0c => i2.0}/postgresql/201311061318_IDEMPIERE-1083.sql (100%) 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/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