From 171c5db67d724a85f249cb933ad383250a24c859 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 12 Mar 2013 08:39:50 -0500 Subject: [PATCH 1/2] IDEMPIERE-37 Make iDempiere safer using saveEx instead of save --- .../src/org/compiere/process/BOMVerify.java | 6 +++--- .../src/org/adempiere/process/DepositBatchClose.java | 4 ++-- org.adempiere.base/src/org/compiere/model/MPayment.java | 4 ++-- .../src/org/adempiere/pipo2/PackInHandler.java | 4 ++-- .../src/org/adempiere/webui/adwindow/ADTabpanel.java | 2 +- .../src/org/idempiere/fitnesse/fixture/RunProcess.java | 6 +++--- .../WEB-INF/src/org/idempiere/adinterface/Process.java | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java b/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java index 68311bc292..0204f0b83e 100644 --- a/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java +++ b/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java @@ -195,21 +195,21 @@ public class BOMVerify extends SvrProcess { invalidproducts.add(product); product.setIsVerified(false); - product.save(); + product.saveEx(); return false; } else if (containsinvalid) { containinvalidproducts.add(product); product.setIsVerified(false); - product.save(); + product.saveEx(); return false; } else { validproducts.add(product); product.setIsVerified(true); - product.save(); + product.saveEx(); return true; } diff --git a/org.adempiere.base/src/org/adempiere/process/DepositBatchClose.java b/org.adempiere.base/src/org/adempiere/process/DepositBatchClose.java index 27596cb91d..62c6f7c882 100644 --- a/org.adempiere.base/src/org/adempiere/process/DepositBatchClose.java +++ b/org.adempiere.base/src/org/adempiere/process/DepositBatchClose.java @@ -79,11 +79,11 @@ public class DepositBatchClose extends SvrProcess for (int line = 0; line < depositbatchLines.length; line++) { depositbatchLines[line].setProcessed(true); - depositbatchLines[line].save(); + depositbatchLines[line].saveEx(); } depositbatch.setProcessed(true); - depositbatch.save(); + depositbatch.saveEx(); return ""; } // doIt diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index f0c0b5bfd4..038e8b41c9 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -2874,13 +2874,13 @@ public final class MPayment extends X_C_Payment { MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName()); inv.setC_Payment_ID(0); - inv.save(); + inv.saveEx(); } if (getC_Order_ID() != 0) { MOrder ord = new MOrder(getCtx(), getC_Order_ID(), get_TrxName()); ord.setC_Payment_ID(0); - ord.save(); + ord.saveEx(); } return true; diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java index 71253137ad..1010ac81c9 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java @@ -301,14 +301,14 @@ public class PackInHandler extends DefaultHandler { //Update package history log with package status X_AD_Package_Imp packageImp = new X_AD_Package_Imp(m_ctx.ctx, AD_Package_Imp_ID, null); packageImp.setPK_Status(packageStatus); - packageImp.save(); + packageImp.saveEx(); throw re; } catch (SAXException se) { packageStatus = "Import Failed"; //Update package history log with package status X_AD_Package_Imp packageImp = new X_AD_Package_Imp(m_ctx.ctx, AD_Package_Imp_ID, null); packageImp.setPK_Status(packageStatus); - packageImp.save(); + packageImp.saveEx(); throw se; } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index 2384e20a9a..bb0b298f29 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -1022,7 +1022,7 @@ DataStatusListener, IADTabpanel, IdSpace preference.setAttribute(adTabId+"|DetailPane.IsOpen"); preference.setValue(value ? "Y" : "N"); } - preference.save(); + preference.saveEx(); //update current context Env.getCtx().setProperty("P"+windowId+"|"+adTabId+"|DetailPane.IsOpen", value ? "Y" : "N"); } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java index 359174500a..da2b2567fd 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java @@ -122,7 +122,7 @@ public class RunProcess extends TableFixture { exception(getCell(i, 1), new Exception(errorMsg)); if (recordID > 0) pInstance.setRecord_ID( recordID); - pInstance.save(); + pInstance.saveEx(); if (docAction != null) { if (docAction != null && docAction.length() > 0) { // Requirements @@ -139,7 +139,7 @@ public class RunProcess extends TableFixture { PO po = table.getPO(recordID, null); if (po != null) { po.set_ValueOfColumn("DocAction", docAction); - po.save(); + po.saveEx(); } } } @@ -389,7 +389,7 @@ public class RunProcess extends TableFixture { } // - iPara.save(); + iPara.saveEx(); } catch (Exception e) { diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java index 06831762e8..910fa5d5f5 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java @@ -194,7 +194,7 @@ public class Process { PO po = table.getPO(m_record_id, null); if (po != null) { po.set_ValueOfColumn("DocAction", docAction); - po.save(); + po.saveEx(); } } } @@ -218,7 +218,7 @@ public class Process { if (m_record_id>0) { pInstance.setRecord_ID( m_record_id); - pInstance.save(); + pInstance.saveEx(); } // ProcessInfo pi = new ProcessInfo (process.getName(), process.getAD_Process_ID()); @@ -539,7 +539,7 @@ public class Process { } // - iPara.save(); + iPara.saveEx(); } catch (Exception e) { @@ -551,7 +551,7 @@ public class Process { } // not null } // instance parameter loop - pInstance.save(); // kolec - tego chyba brakowalo + pInstance.saveEx(); // kolec - tego chyba brakowalo return pInstance; } // fillParameter From 0ba596ace8c8b1297c34bf6c151445544e759c9a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 12 Mar 2013 11:06:15 -0500 Subject: [PATCH 2/2] IDEMPIERE-166 Rebranding of logo and product name / Change to default print table format - thanks to Steven Sackett for the suggestion --- .../i1.0a-release/oracle/201303121104_IDEMPIERE-166.sql | 8 ++++++++ .../postgresql/201303121104_IDEMPIERE-166.sql | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 migration/i1.0a-release/oracle/201303121104_IDEMPIERE-166.sql create mode 100644 migration/i1.0a-release/postgresql/201303121104_IDEMPIERE-166.sql diff --git a/migration/i1.0a-release/oracle/201303121104_IDEMPIERE-166.sql b/migration/i1.0a-release/oracle/201303121104_IDEMPIERE-166.sql new file mode 100644 index 0000000000..7b04e9a60a --- /dev/null +++ b/migration/i1.0a-release/oracle/201303121104_IDEMPIERE-166.sql @@ -0,0 +1,8 @@ +-- Mar 12, 2013 10:55:02 AM COT +-- IDEMPIERE-166 Rebranding of logo and product name +UPDATE AD_PrintTableFormat SET FunctBG_PrintColor_ID=115, HdrLine_PrintColor_ID=NULL, Line_PrintColor_ID=NULL, FunctFG_PrintColor_ID=100, IsPaintHLines='N', IsPaintVLines='N', HdrTextBG_PrintColor_ID=115, Hdr_PrintFont_ID=161, LineStrokeType='S', LineStroke=0.5, HdrTextFG_PrintColor_ID=100, HdrStroke=1, Funct_PrintFont_ID=155,Updated=TO_DATE('2013-03-12 10:55:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_PrintTableFormat_ID=100 +; + +SELECT register_migration_script('201303121104_IDEMPIERE-166.sql') FROM dual +; + diff --git a/migration/i1.0a-release/postgresql/201303121104_IDEMPIERE-166.sql b/migration/i1.0a-release/postgresql/201303121104_IDEMPIERE-166.sql new file mode 100644 index 0000000000..7d85f388e7 --- /dev/null +++ b/migration/i1.0a-release/postgresql/201303121104_IDEMPIERE-166.sql @@ -0,0 +1,8 @@ +-- Mar 12, 2013 10:55:02 AM COT +-- IDEMPIERE-166 Rebranding of logo and product name +UPDATE AD_PrintTableFormat SET FunctBG_PrintColor_ID=115, HdrLine_PrintColor_ID=NULL, Line_PrintColor_ID=NULL, FunctFG_PrintColor_ID=100, IsPaintHLines='N', IsPaintVLines='N', HdrTextBG_PrintColor_ID=115, Hdr_PrintFont_ID=161, LineStrokeType='S', LineStroke=0.5, HdrTextFG_PrintColor_ID=100, HdrStroke=1, Funct_PrintFont_ID=155,Updated=TO_TIMESTAMP('2013-03-12 10:55:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_PrintTableFormat_ID=100 +; + +SELECT register_migration_script('201303121104_IDEMPIERE-166.sql') FROM dual +; +