From a6f2a3d279a356e248c8fe05c7e6b4114b74c2b8 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 Feb 2019 15:29:44 +0100 Subject: [PATCH 01/12] IDEMPIERE-3884 Quick Entry doesn't use zoom condition (when doing right click / New) --- .../adempiere/webui/editor/WSearchEditor.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java index 682fa7e213..3d9f9a966e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java @@ -53,6 +53,7 @@ import org.compiere.model.Lookup; import org.compiere.model.MLookup; import org.compiere.model.MLookupFactory; import org.compiere.model.MRole; +import org.compiere.model.MTable; import org.compiere.model.X_AD_CtxHelp; import org.compiere.util.CLogger; import org.compiere.util.DB; @@ -473,10 +474,8 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value if(!getComponent().isEnabled()) return; - int zoomWindowId = gridField != null ? lookup.getZoom(Env.isSOTrx(Env.getCtx(), gridField.getWindowNo())) : lookup.getZoom(Env.isSOTrx(Env.getCtx())); - final WQuickEntry vqe = new WQuickEntry (lookup.getWindowNo(), zoomWindowId); - if (vqe.getQuickFields()<=0) - return; + int zoomWindowId = -1; + int Record_ID = 0; // if update, get current value @@ -488,6 +487,20 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value Record_ID = Integer.parseInt(value.toString()); } + if (lookup.getColumnName() != null) { + String tableName = lookup.getColumnName().substring(0, lookup.getColumnName().indexOf(".")); + int zoomWinID = Env.getZoomWindowID(MTable.getTable_ID(tableName), Record_ID, lookup.getWindowNo()); + if (zoomWinID > 0) + zoomWindowId = zoomWinID; + } + + if (zoomWindowId < 0) { + zoomWindowId = gridField != null ? lookup.getZoom(Env.isSOTrx(Env.getCtx(), gridField.getWindowNo())) : lookup.getZoom(Env.isSOTrx(Env.getCtx())); + } + + final WQuickEntry vqe = new WQuickEntry (lookup.getWindowNo(), zoomWindowId); + if (vqe.getQuickFields()<=0) + return; vqe.loadRecord (Record_ID); final int finalRecord_ID = Record_ID; From 2957f04f9f923d9efd505776f6e6bacd686b7022 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Fri, 25 May 2018 11:43:17 +0530 Subject: [PATCH 02/12] IDEMPIERE-3718 : Added code to resolve Report Wizard toolbar button bug --- .../WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index 95fd83e4ea..73507e3367 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -506,6 +506,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab if (ThemeManager.isUseFontIconForImage()) LayoutUtils.addSclass("medium-toolbarbutton", bRefresh); + bWizard.setName("Wizard"); if (ThemeManager.isUseFontIconForImage()) bWizard.setIconSclass("z-icon-Wizard"); else From b331ea70bc73c9af3a665546452953d126a68e46 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Mon, 10 Oct 2016 16:37:05 +0530 Subject: [PATCH 03/12] IDEMPIERE-3214: Context not parsed in MMeasureCalc. --- org.adempiere.base/src/org/compiere/model/MMeasureCalc.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java index f61ca9bf9d..b4a69ecac9 100644 --- a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java +++ b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java @@ -126,6 +126,8 @@ public class MMeasureCalc extends X_PA_MeasureCalc .append(DB.TO_DATE(reportDate)).append(",'").append(trunc).append("')"); } // date String sql = addRestrictions(sb.toString(), restrictions, role); + if (sql.indexOf("@") >= 0) + sql = Env.parseContext(getCtx(), 0, sql.toString(), false, false); log.fine(sql); return sql; @@ -191,6 +193,8 @@ public class MMeasureCalc extends X_PA_MeasureCalc if (groupBy != null) sql += " GROUP BY " + groupBy + " ORDER BY " + groupBy; // teo_sarca, [ 1665129 ] Bar Graph is not ordered + if (sql.indexOf("@") >= 0) + sql = Env.parseContext(getCtx(), 0, sql, false, false); // log.fine(sql); return sql; From 15102da10dd59a4c45c2c8a48819d83754985f1c Mon Sep 17 00:00:00 2001 From: Pritesh Shah Date: Fri, 16 Oct 2015 13:55:12 +0530 Subject: [PATCH 04/12] --Pritesh Shah JIRA ticket - IDEMPIERE-2887 Added Parenthesis in the OR condition between "i.I_IsImported<>'Y' OR i.I_IsImported IS NULL" Also added client check in query to get the I_Payment --- .../org/compiere/process/ImportPayment.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/ImportPayment.java b/org.adempiere.base.process/src/org/compiere/process/ImportPayment.java index 8590c19f8e..fb6583436d 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ImportPayment.java +++ b/org.adempiere.base.process/src/org/compiere/process/ImportPayment.java @@ -143,8 +143,8 @@ public class ImportPayment extends SvrProcess .append(" OR b.SwiftCode=i.RoutingNo ") .append(") ") .append("WHERE i.C_BankAccount_ID IS NULL ") - .append("AND i.I_IsImported<>'Y' ") - .append("OR i.I_IsImported IS NULL").append(clientCheck); + .append("AND (i.I_IsImported<>'Y' ") + .append("OR i.I_IsImported IS NULL)").append(clientCheck); no = DB.executeUpdate(sql.toString(), get_TrxName()); if (no != 0) if (log.isLoggable(Level.INFO)) log.info("Bank Account (With Routing No)=" + no); @@ -160,8 +160,8 @@ public class ImportPayment extends SvrProcess .append(" AND a.AD_Client_ID=i.AD_Client_ID ") .append(") ") .append("WHERE i.C_BankAccount_ID IS NULL ") - .append("AND i.I_isImported<>'Y' ") - .append("OR i.I_isImported IS NULL").append(clientCheck); + .append("AND (i.I_isImported<>'Y' ") + .append("OR i.I_isImported IS NULL)").append(clientCheck); no = DB.executeUpdate(sql.toString(), get_TrxName()); if (no != 0) if (log.isLoggable(Level.INFO)) log.info("Bank Account (Without Routing No)=" + no); @@ -171,8 +171,8 @@ public class ImportPayment extends SvrProcess sql.append(" and a.AD_Client_ID=i.AD_Client_ID) ") .append("WHERE i.C_BankAccount_ID IS NULL ") .append("AND i.BankAccountNo IS NULL ") - .append("AND i.I_isImported<>'Y' ") - .append("OR i.I_isImported IS NULL").append(clientCheck); + .append("AND (i.I_isImported<>'Y' ") + .append("OR i.I_isImported IS NULL)").append(clientCheck); no = DB.executeUpdate(sql.toString(), get_TrxName()); if (no != 0) if (log.isLoggable(Level.INFO)) log.info("Bank Account=" + no); @@ -180,8 +180,8 @@ public class ImportPayment extends SvrProcess sql = new StringBuilder("UPDATE I_Payment ") .append("SET I_isImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Bank Account, ' ") .append("WHERE C_BankAccount_ID IS NULL ") - .append("AND I_isImported<>'Y' ") - .append("OR I_isImported IS NULL").append(clientCheck); + .append("AND (I_isImported<>'Y' ") + .append("OR I_isImported IS NULL)").append(clientCheck); no = DB.executeUpdate(sql.toString(), get_TrxName()); if (no != 0) log.warning("Invalid Bank Account=" + no); @@ -408,7 +408,7 @@ public class ImportPayment extends SvrProcess //Import Bank Statement sql = new StringBuilder("SELECT * FROM I_Payment") - .append(" WHERE I_IsImported='N'") + .append(" WHERE I_IsImported='N'").append(clientCheck) .append(" ORDER BY C_BankAccount_ID, CheckNo, DateTrx, R_AuthCode"); MBankAccount account = null; From 55df014054c2e6276e35f8019ce67f2db1c7cf32 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Thu, 7 Feb 2019 14:34:14 +0100 Subject: [PATCH 05/12] IDEMPIERE-2858 Display a Reference List Name in the tab name --- org.adempiere.base/src/org/compiere/util/Env.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java index 6146e8618a..9670df6fa8 100644 --- a/org.adempiere.base/src/org/compiere/util/Env.java +++ b/org.adempiere.base/src/org/compiere/util/Env.java @@ -59,6 +59,7 @@ import org.compiere.model.MClient; import org.compiere.model.MColumn; import org.compiere.model.MLookupCache; import org.compiere.model.MQuery; +import org.compiere.model.MRefList; import org.compiere.model.MRole; import org.compiere.model.MSession; import org.compiere.model.MSysConfig; @@ -1686,6 +1687,12 @@ public final class Env } } } + } else if (v instanceof String && !Util.isEmpty((String) v) && !Util.isEmpty(foreignTable) && foreignTable.equals(MRefList.Table_Name) && !Util.isEmpty(format)) { + int refID = colToken.getAD_Reference_Value_ID(); + if (format.equals("Name")) + outStr.append(MRefList.getListName(getCtx(), refID, (String) v)); + else if (format.equals("Description")) + outStr.append(MRefList.getListDescription(getCtx(), DB.getSQLValueStringEx(null, "SELECT Name FROM AD_Reference WHERE AD_Reference_ID = ?", refID), (String) v)); } else if (v instanceof Date) { SimpleDateFormat df = new SimpleDateFormat(format); outStr.append(df.format((Date)v)); From 6d82731dc5b114380c85b08d00e9d4084bb8de9a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 8 Feb 2019 12:56:39 +0100 Subject: [PATCH 06/12] Fix debian installer control prerequisites for 6.2 --- .../src/org/adempiere/model/CalloutBPartnerQuickEntry.java | 4 ++-- org.adempiere.base/src/org/compiere/model/MQuery.java | 4 +++- .../utils.unix/unix/DebianInstaller/DEBIAN/control | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java index 7e990cb629..98956df64b 100644 --- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java +++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java @@ -34,8 +34,8 @@ public class CalloutBPartnerQuickEntry implements IColumnCallout { if (!Util.isEmpty(docSOTrx)) { boolean isSOTrx = "Y".equals(docSOTrx); - mTab.setValue(MBPartner.COLUMNNAME_IsCustomer, isSOTrx); - mTab.setValue(MBPartner.COLUMNNAME_IsVendor, !isSOTrx); + //mTab.setValue(MBPartner.COLUMNNAME_IsCustomer, isSOTrx); + //mTab.setValue(MBPartner.COLUMNNAME_IsVendor, !isSOTrx); } } return null; diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java index 9b7a03dbd6..8b9a6963a1 100644 --- a/org.adempiere.base/src/org/compiere/model/MQuery.java +++ b/org.adempiere.base/src/org/compiere/model/MQuery.java @@ -1023,8 +1023,10 @@ class Restriction implements Serializable // this.Operator = operator; // Boolean - if (code instanceof Boolean) + if (code instanceof Boolean) { Code = ((Boolean)code).booleanValue() ? "Y" : "N"; + Code = Msg.getMsg(Env.getAD_Language(Env.getCtx()), Code.toString()); + } else if (code instanceof KeyNamePair) Code = Integer.valueOf(((KeyNamePair)code).getKey()); else if (code instanceof ValueNamePair) diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index 5e3334bdde..9f3e5f8e40 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -3,7 +3,7 @@ Version: 6.2 Section: web Priority: extra Architecture: all -Pre-Depends: openjdk-10-jdk|openjdk-11-jdk|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser +Pre-Depends: openjdk-11-jre|openjdk-11-jdk|openjdk-12-jre|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser Suggests: firefox Installed-Size: 968668 Maintainer: Carlos Ruiz From 6ef649afa247e426760cffdb7efa955130be57a9 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 8 Feb 2019 13:10:18 +0100 Subject: [PATCH 07/12] Backed out changeset 76cb3821607f - wrong changes committed by mistake --- .../src/org/adempiere/model/CalloutBPartnerQuickEntry.java | 4 ++-- org.adempiere.base/src/org/compiere/model/MQuery.java | 4 +--- .../utils.unix/unix/DebianInstaller/DEBIAN/control | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java index 98956df64b..7e990cb629 100644 --- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java +++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java @@ -34,8 +34,8 @@ public class CalloutBPartnerQuickEntry implements IColumnCallout { if (!Util.isEmpty(docSOTrx)) { boolean isSOTrx = "Y".equals(docSOTrx); - //mTab.setValue(MBPartner.COLUMNNAME_IsCustomer, isSOTrx); - //mTab.setValue(MBPartner.COLUMNNAME_IsVendor, !isSOTrx); + mTab.setValue(MBPartner.COLUMNNAME_IsCustomer, isSOTrx); + mTab.setValue(MBPartner.COLUMNNAME_IsVendor, !isSOTrx); } } return null; diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java index 8b9a6963a1..9b7a03dbd6 100644 --- a/org.adempiere.base/src/org/compiere/model/MQuery.java +++ b/org.adempiere.base/src/org/compiere/model/MQuery.java @@ -1023,10 +1023,8 @@ class Restriction implements Serializable // this.Operator = operator; // Boolean - if (code instanceof Boolean) { + if (code instanceof Boolean) Code = ((Boolean)code).booleanValue() ? "Y" : "N"; - Code = Msg.getMsg(Env.getAD_Language(Env.getCtx()), Code.toString()); - } else if (code instanceof KeyNamePair) Code = Integer.valueOf(((KeyNamePair)code).getKey()); else if (code instanceof ValueNamePair) diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index 9f3e5f8e40..5e3334bdde 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -3,7 +3,7 @@ Version: 6.2 Section: web Priority: extra Architecture: all -Pre-Depends: openjdk-11-jre|openjdk-11-jdk|openjdk-12-jre|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser +Pre-Depends: openjdk-10-jdk|openjdk-11-jdk|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser Suggests: firefox Installed-Size: 968668 Maintainer: Carlos Ruiz From e466f9d9a50a6055964781d0312287c2c1e8d773 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 8 Feb 2019 12:56:39 +0100 Subject: [PATCH 08/12] Fix debian installer control prerequisites for 6.2 --- .../utils.unix/unix/DebianInstaller/DEBIAN/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index 5e3334bdde..9f3e5f8e40 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -3,7 +3,7 @@ Version: 6.2 Section: web Priority: extra Architecture: all -Pre-Depends: openjdk-10-jdk|openjdk-11-jdk|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser +Pre-Depends: openjdk-11-jre|openjdk-11-jdk|openjdk-12-jre|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser Suggests: firefox Installed-Size: 968668 Maintainer: Carlos Ruiz From 3c1ac1611232ec97aa3bfd03c1643374b53e623b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 8 Feb 2019 15:29:55 +0100 Subject: [PATCH 09/12] IDEMPIERE-3885 Error in automatic packin (FHCA-868) --- .../pipo2/handler/SQLMandatoryElementHandler.java | 11 +++++++++++ .../pipo2/handler/SQLStatementElementHandler.java | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java index 02cde5be95..027dd10baf 100644 --- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java +++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLMandatoryElementHandler.java @@ -40,8 +40,10 @@ import org.adempiere.pipo2.PackOut; import org.adempiere.pipo2.PackoutItem; import org.adempiere.pipo2.SQLElementParameters; import org.compiere.model.X_AD_Package_Imp_Detail; +import org.compiere.util.CacheMgt; import org.compiere.util.DB; import org.compiere.util.Env; +import org.compiere.util.Util; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; @@ -89,6 +91,15 @@ public class SQLMandatoryElementHandler extends AbstractElementHandler { } logImportDetail (ctx, impDetail, 1, "SQLMandatory",count,"Execute"); ctx.packIn.getNotifier().addSuccessLine("-> " + sql); + // Cache Reset when deleting records via SQL + if (sql.toLowerCase().startsWith("delete from ")) { + String[] words = sql.split("[ \r\n]"); + String table = words[2]; + String tableName = DB.getSQLValueString(null, "SELECT TableName FROM AD_Table WHERE LOWER(TableName)=?", table.toLowerCase()); + if (! Util.isEmpty(tableName)) { + CacheMgt.get().reset(tableName); + } + } } catch (Exception e) { ctx.packIn.getNotifier().addFailureLine("SQL Mandatory failed, error (" + e.getLocalizedMessage() + "):"); logImportDetail (ctx, impDetail, 0, "SQLMandatory",-1,"Execute"); diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java index 68e9ede7ed..02c7a4a91a 100644 --- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java +++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java @@ -31,9 +31,11 @@ import org.adempiere.pipo2.PackOut; import org.adempiere.pipo2.PackoutItem; import org.adempiere.pipo2.SQLElementParameters; import org.compiere.model.X_AD_Package_Imp_Detail; +import org.compiere.util.CacheMgt; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.Trx; +import org.compiere.util.Util; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; @@ -90,6 +92,15 @@ public class SQLStatementElementHandler extends AbstractElementHandler { } logImportDetail (ctx, impDetail, 1, "SQLStatement",count,"Execute"); ctx.packIn.getNotifier().addSuccessLine("-> " + sql); + // Cache Reset when deleting records via SQL + if (sql.toLowerCase().startsWith("delete from ")) { + String[] words = sql.split("[ \r\n]"); + String table = words[2]; + String tableName = DB.getSQLValueString(null, "SELECT TableName FROM AD_Table WHERE LOWER(TableName)=?", table.toLowerCase()); + if (! Util.isEmpty(tableName)) { + CacheMgt.get().reset(tableName); + } + } } catch (Exception e) { // rollback immediately on exception to avoid a wrong SQL stop the whole process if (savepoint != null) From 8a2a01735e348bcb895874f40c31b29099f1a956 Mon Sep 17 00:00:00 2001 From: Diego Ruiz Date: Sat, 9 Feb 2019 12:42:03 +0100 Subject: [PATCH 10/12] IDEMPIERE-3886 Validate change of Attribute set instance on order lines when the qty reserved > 0 --- org.adempiere.base/src/org/compiere/model/MOrderLine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLine.java b/org.adempiere.base/src/org/compiere/model/MOrderLine.java index 04841e5506..70e4b36ea7 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderLine.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderLine.java @@ -798,9 +798,9 @@ public class MOrderLine extends X_C_OrderLine setHeaderInfo(getParent()); - // R/O Check - Product/Warehouse Change + // R/O Check - Product/Warehouse Change/Attribute set instance if (!newRecord - && (is_ValueChanged("M_Product_ID") || is_ValueChanged("M_Warehouse_ID"))) + && (is_ValueChanged("M_Product_ID") || is_ValueChanged("M_Warehouse_ID") || is_ValueChanged("M_AttributeSetInstance_ID"))) { if (!canChangeWarehouse()) return false; From 3ea6a2a17d020cff162c8a2e88041c2ecc3f4a0a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 9 Feb 2019 14:26:45 +0100 Subject: [PATCH 11/12] IDEMPIERE-3887 Setup / Console-setup improvements --- .../compiere/install/ConfigurationData.java | 61 ++++++++++-------- .../compiere/install/ConfigurationPanel.java | 2 + .../src/org/compiere/install/KeyStoreMgt.java | 2 +- .../src/org/compiere/install/Setup_Help.java | 3 +- .../install/console/ConfigurationConsole.java | 2 +- .../org/compiere/install/images/Cancel16.gif | Bin 0 -> 878 bytes .../org/compiere/install/images/Cancel24.gif | Bin 0 -> 1268 bytes .../src/org/compiere/install/images/Ok16.gif | Bin 0 -> 626 bytes .../src/org/compiere/install/images/Ok24.gif | Bin 0 -> 936 bytes .../org/compiere/install/util/AppsAction.java | 9 ++- .../org/compiere/install/util/OnlineHelp.java | 2 +- .../db/oracle/config/ConfigOracle.java | 10 ++- .../postgresql/config/ConfigPostgreSQL.java | 10 ++- 13 files changed, 62 insertions(+), 39 deletions(-) create mode 100644 org.adempiere.install/src/org/compiere/install/images/Cancel16.gif create mode 100644 org.adempiere.install/src/org/compiere/install/images/Cancel24.gif create mode 100644 org.adempiere.install/src/org/compiere/install/images/Ok16.gif create mode 100644 org.adempiere.install/src/org/compiere/install/images/Ok24.gif diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java index 4c26a33fc7..bd93530d99 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java @@ -296,6 +296,7 @@ public class ConfigurationData } InetAddress localhost = null; + @SuppressWarnings("unused") String hostName = "unknown"; try { @@ -318,7 +319,7 @@ public class ConfigurationData setKeyStore(KEYSTORE_PASSWORD); // AppsServer initAppsServer(); - setAppsServer(hostName); + setAppsServer("0.0.0.0"); // Database Server initDatabase(Database.DB_POSTGRESQL); String connectionName = getDatabaseDiscovered(); @@ -326,18 +327,16 @@ public class ConfigurationData setDatabaseName(resolveDatabaseName(connectionName)); } setDatabaseSystemPassword(""); - setDatabaseServer(hostName); + setDatabaseServer("localhost"); setDatabaseUser("adempiere"); setDatabasePassword("adempiere"); // Mail Server - if (p_panel != null) - { - p_panel.fMailServer.setText(hostName); - p_panel.fMailUser.setText("info"); - p_panel.fMailPassword.setText(""); - p_panel.fAdminEMail.setText("info@" + hostName); - } - // + setMailServer("localhost"); + //setMailUser("info"); + setMailUser(""); + setMailPassword(""); + //setAdminEMail("info@" + hostName); + setAdminEMail(""); } // !envLoaded // Default FTP stuff @@ -535,24 +534,28 @@ public class ConfigurationData ? p_panel.fAdminEMail.getText() : (String)p_properties.get(ADEMPIERE_ADMIN_EMAIL); InternetAddress adminEMail = null; - try - { - adminEMail = new InternetAddress (adminEMailString); - } - catch (Exception e) - { - error = "Not valid: " + adminEMailString + " - " + e.getMessage(); + if (adminEMailString != null && adminEMailString.length() > 0) { + try + { + adminEMail = new InternetAddress (adminEMailString); + } + catch (Exception e) + { + error = "Not valid: " + adminEMailString + " - " + e.getMessage(); + pass = false; + } + // + if (pass) + { + error = "Not verified EMail = " + adminEMail; + pass = testMailServer(mailServer, adminEMail, mailUser, mailPassword); + } + if (p_panel != null) + p_panel.signalOK(p_panel.okMailUser, "ErrorMail", + pass, false, error); + } else { pass = false; } - // - if (pass) - { - error = "Not verified EMail = " + adminEMail; - pass = testMailServer(mailServer, adminEMail, mailUser, mailPassword); - } - if (p_panel != null) - p_panel.signalOK(p_panel.okMailUser, "ErrorMail", - pass, false, error); if (pass) { if (log.isLoggable(Level.INFO)) log.info("OK: EMail = " + adminEMail); @@ -563,7 +566,11 @@ public class ConfigurationData } else { - log.warning(error); + if (adminEMailString != null && adminEMailString.length() > 0) { + log.warning(error); + } else { + if (log.isLoggable(Level.INFO)) log.info("OK: EMail not configured"); + } p_properties.setProperty(ADEMPIERE_ADMIN_EMAIL, ""); p_properties.setProperty(ADEMPIERE_MAIL_USER, ""); p_properties.setProperty(ADEMPIERE_MAIL_PASSWORD, ""); diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java index 41bb66d8bc..ed04030599 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java @@ -602,6 +602,8 @@ public class ConfigurationPanel extends JPanel implements ActionListener, IDBCon } if (!pass && critical) cb.setBackground(Color.RED); + else if (!pass && !critical) + cb.setBackground(Color.YELLOW); else cb.setBackground(Color.GREEN); } // setOK diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java index 024bc3da14..bcb480413c 100644 --- a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java +++ b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java @@ -300,7 +300,7 @@ public class KeyStoreMgt : System.getProperty("user.name"); String o = mgt.organizationUnit != null ? mgt.organizationUnit - : "AdempiereUser"; + : "iDempiereUser"; String l = mgt.location != null ? mgt.location : "MyTown"; diff --git a/org.adempiere.install/src/org/compiere/install/Setup_Help.java b/org.adempiere.install/src/org/compiere/install/Setup_Help.java index 735dd1f779..5fa158c77e 100644 --- a/org.adempiere.install/src/org/compiere/install/Setup_Help.java +++ b/org.adempiere.install/src/org/compiere/install/Setup_Help.java @@ -99,6 +99,7 @@ public class Setup_Help extends JDialog implements ActionListener } catch (Exception ex) { + ex.printStackTrace(); } } // init @@ -139,7 +140,7 @@ public class Setup_Help extends JDialog implements ActionListener { try { - editorPane.setPage("http://www.adempiere.com/wiki/index.php/ServerSetupHelp"); + editorPane.setPage("http://wiki.idempiere.org/en/Server_Setup_Help"); } catch (IOException ex) { diff --git a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java index 643b12273e..ed2928aa95 100644 --- a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java +++ b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java @@ -322,7 +322,7 @@ public class ConfigurationConsole { cn = System.getProperty("user.name"); String ou = data.getProperty(ConfigurationData.ADEMPIERE_CERT_ORG_UNIT); if (ou == null) - ou = "AdempiereUser"; + ou = "iDempiereUser"; String o = data.getProperty(ConfigurationData.ADEMPIERE_CERT_ORG); if (o == null) o = System.getProperty("user.name"); diff --git a/org.adempiere.install/src/org/compiere/install/images/Cancel16.gif b/org.adempiere.install/src/org/compiere/install/images/Cancel16.gif new file mode 100644 index 0000000000000000000000000000000000000000..9beb8fcec140f157c945ea0c69220c7880f02741 GIT binary patch literal 878 zcmV-!1CjiRP)#ZWtGIbU=uGYE5CMTf6Tld+HEXp`jU6~=KFnlc`qMS6;&k*r+oM= z3-30x-JONE$Nuu1ZD zVbFA(uim+O)onR=kgX?A_;GZ!9M@_ed8%`Nhx^1ZCewq1$u|xhV5?MOX?i-W2f;=0 zVJYQ#sW&qjD$C0>9XiDJ^XL3<>sC3gRxbguVObL=hlkyyZ4=~jB+_Y~E-v!N!-va~ zg^Xp}^W7sON!PZCR#!>1wz9Ln&cf~6fvD1b`Lg3$7GXY5;>Z!!U%VhcI~%C#fT$|I zNU!NQQ@tZ2uA4{@6^kTVTM4$eK@~fSs1^zsZEb9BZ17-wJXF<-p6ZMN;HfS|K`^v% z^JY+~)kw6r6R)k2v~64w;$o4ewl;z=MyS^nvk)Vq1><~SAglueJsA2+Q7%|ZDuRvo1 zU*v+-)bwTFwQIIhE>oSFqB)g9RH+pTNJj^OY4ZK#WKgfyuXw6o{4>B888A%q>&%%m z&Yn0XT3NwPrwL3G5y6Qfs!L0l$B(mBuk+LFY#7J!u&4U1WT96KV=CR>@3x3gFBEW2 zoM01JoS6v)Cas`|bmFxGbTsGHoommr@fkxEgjR{7=b z-5`#l52GmhN;v)flqwZ|ou3ah zjz92J?|G^daTI;LI5!u*s?})f>0$HbOP&^sVGK7KlnsqpRxp3;nEE0+S?K!@5>NYv zQC{fk(lN^lvT#9FdEGGN!|z$>`5&B5jlpUbE;Y120h+YAyCRB#FaQ7m07*qoM6N<$ Ef^$rr6951J literal 0 HcmV?d00001 diff --git a/org.adempiere.install/src/org/compiere/install/images/Cancel24.gif b/org.adempiere.install/src/org/compiere/install/images/Cancel24.gif new file mode 100644 index 0000000000000000000000000000000000000000..d91a52dc0c631b17dc1132962d0b4495ab7c4221 GIT binary patch literal 1268 zcmVb z(_KtcXBY?Y|8q`(bEJGzTCnXYW*5jzP+<}SUTJU_+_21y7Nf2Z0`V(uce|#6_)?uS$t6R-mWSp7ZQtEg~@E&7S0+yf@D;@B2RQ zOU#V_qlDDrGLh&Zy6}r6g}p?_J{0f}9rp;rjF;%*Wg_t%xSz-n2d+5CB=R@4*gBA#2T~(DVh~j69Fwf4OdF=JRF_=s+_<7j8?0=s-Z#Fo<2o?gS)b+Ny69|^dv4?EP$p#^ZSvQoCI=mpcfb8;k9eA*%vP^x|k0y zbymPBJg>aG`IFtdGiY=a91cUs%>~8dNK8xs>FLnSX58=Yj?GU^U2-xXT5hZgr-qbY zR@Sn0&z=nS`@z8=I1m6!5(I|>zjb%V)R!+i8krBS)^Au<1t0*Nn4f1P65#oH=ue(N z1i-Qk5P_JPmi*jR`d5~h=(N#pZ`skS zLv(I6W5rc?h)x+zrq(T=e=hOk$IzcWLz=?@gQ9>00h-T;_~az0xEQ+Kj)6OO)acC2 zPfq5x|Af6nCo_wR+BVkKN<2Ia%*-IYv=n5w{No8bTr%glM$_{~k3OjYNKEWIoWy zd{B)3lA!*~|SV*CYg2CS2 zX!P~#ADztmQ%7_%ABxV-UV7Nmqv|CkFgP4|@dLLk5=C{N9mMDE4&>;#!Lrm8@ znt|g0(g29b2mlBG1JD6z0JMw1fi*{4jS-Z5L(c|=3j8IP(;yaC`GjG zs>;F%+2ka{cyXA8v zrN-a(`^STo<@W8L;RjFSC2eZ58W9pQ_W+;!2&oIxY<^@*k0g@TlAANLxrM}e<MVq0?y_y^edGEi6uM&dla+X0;rR$_iy;m^+d5 zw#sYC($sY3<%E)vDG@*j;KPA!n@0PfTimD|SpuPCj4=v96af%i(54wcZmqruRW*~k zswOol2q?JcW8m3nw@ssEb&DGn*8%`m(D@tAk99T{^pt>XG) z$2zNzQziZ=A&lgkb^B9o*D9|420k<8p``B&axJSf|GeC@|LJpm1Ax5dNw1t*Bme*a M07*qoM6N<$f+b-iI{*Lx literal 0 HcmV?d00001 diff --git a/org.adempiere.install/src/org/compiere/install/images/Ok24.gif b/org.adempiere.install/src/org/compiere/install/images/Ok24.gif new file mode 100644 index 0000000000000000000000000000000000000000..027d18f53194005ce4fd7feb1cacdd34079a2f86 GIT binary patch literal 936 zcmV;Z16TZsP)rlw3&J^L?ECq}sjrCW$9hBY3;Tn5Lvb!x^KyB%hAhV| z8)n;2+CN!iKiJ#|Gy1Q%5WKm#GFwAdYlLzO* z9noC6I#=U%g4;|0L@*fxAlSsTEC=1e8b5M?DJAbNU77ph+B^E%+B&~`|6Y0~?l_`Z zzB*rX#UzK3AQ0^SofFFdicQcBAMgV_pU-`_vRb-%X=YyL3Zl~A3*TN_XD1@{hT>8> z&E?9QHBY|5$-2NkO#~2+VOUT9)q3t5V?O2ehGO|b?%S2s(#?hWMKM;Ggd=lIdZ_eX ziqsp5yY2`tcr%>A1&BcVpKd9Fwt;@ydhTbLxwW|w8vg!=V|T8sUjC@Guq2B4aR3%l zxRBCiQlZl8jw00?4$tLebNQ`OZM-nc1+me)~`>$F|gAsmC}ugu{q93BFoI-7$sR3QM#+Qw>rK)f&&1* z{x0tHgRsh7Q_iablhQpL4oA3fq-3t5%GAu*^7PaKlaBXdfCz|_U4(I0Z$Iw%X{wLm z0Ko6xOYQY4eccbjs&I8#DUV6%9g9dQSusCJ((wQ~m`;mfyn{iwr~iE1@ss2v4geeg zUPOjfA+xfl9OgO-L?cQH7n}=#EXWd!jW8H?&>QshACEeI9H*z^hk@gfsOm^tc0J96 zumB8-V-F4gVcK5jZWPRE{~0000c51Uox{ZvFPmABOQO@lyk*M)EF8k`(QBS3i09%n#3r zpBXqU67(ap_3&?hFo@2LpX)uSHxw@vy&uw42XT~sa`d%&J=Q-U(WIS3N#DKz0000< KMNUMnLSTaOowC6I literal 0 HcmV?d00001 diff --git a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java index d7c712dc55..294367cdbf 100644 --- a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java +++ b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java @@ -20,6 +20,7 @@ import java.awt.Dimension; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.net.URL; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -33,6 +34,7 @@ import javax.swing.JMenuItem; import javax.swing.JToggleButton; import javax.swing.KeyStroke; +import org.compiere.install.ConfigurationPanel; import org.compiere.util.Env; import org.compiere.util.Msg; @@ -178,8 +180,11 @@ public final class AppsAction extends AbstractAction */ private ImageIcon getIcon(String name, boolean small) { - String fullName = name + (small ? "16" : "24"); - return Env.getImageIcon2(fullName); + String fullName = name + (small ? "16" : "24") + ".gif"; + URL imageURL = ConfigurationPanel.class.getResource("images/"+fullName); + if (imageURL == null) + return null; + return new ImageIcon(imageURL); } // getIcon /** diff --git a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java index 5761627216..a58465507a 100644 --- a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java +++ b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java @@ -94,7 +94,7 @@ public class OnlineHelp extends JEditorPane implements HyperlinkListener } // OnlineHelp /** Base of Online Help System */ - protected static final String BASE_URL = "http://www.adempiere.com/wiki/index.php/OnlineLoginHelp"; + protected static final String BASE_URL = "http://wiki.idempiere.org/en/Server_Setup_Help"; public static void openInDefaultBrowser() { diff --git a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java index 2e4ad68249..7aa242a26c 100644 --- a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java +++ b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java @@ -392,9 +392,13 @@ public class ConfigOracle implements IDatabaseConfig // Ignore result as it might not be imported pass = testJDBC(url, databaseUser, databasePassword); error = "Cannot connect to User: " + databaseUser + "/" + databasePassword + " - Database may not be imported yet (OK on initial run)."; - if (monitor != null) - monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC", - pass, true, error)); + if (monitor != null) { + boolean critical = true; + if (!isDBExists) { + critical = false; + } + monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC", pass, critical, error)); + } if (pass) { if (log.isLoggable(Level.INFO)) log.info("OK: Database User = " + databaseUser); diff --git a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java index f7019eab34..6454a9d52c 100755 --- a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java @@ -158,9 +158,13 @@ public class ConfigPostgreSQL implements IDatabaseConfig // Ignore result as it might not be imported pass = testJDBC(url, databaseUser, databasePassword); error = "Database imported? Cannot connect to User: " + databaseUser + "/" + databasePassword; - if (monitor != null) - monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC", - pass, true, error)); + if (monitor != null) { + boolean critical = true; + if (!isDBExists) { + critical = false; + } + monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC", pass, critical, error)); + } if (pass) { if (log.isLoggable(Level.INFO)) log.info("OK: Database User = " + databaseUser); From 3e95a3034003c28f4f6c296f07e759bfaf8559e3 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 9 Feb 2019 16:36:35 +0100 Subject: [PATCH 12/12] IDEMPIERE-1900 iDempiere Debian Installer - adapt to 6.2 and ubuntu 18.04 --- .../unix/DebianInstaller/DEBIAN/control | 2 +- .../unix/DebianInstaller/etc/init.d/idempiere | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index 9f3e5f8e40..0bd86537eb 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -3,7 +3,7 @@ Version: 6.2 Section: web Priority: extra Architecture: all -Pre-Depends: openjdk-11-jre|openjdk-11-jdk|openjdk-12-jre|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser +Pre-Depends: openjdk-11-jdk|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser Suggests: firefox Installed-Size: 968668 Maintainer: Carlos Ruiz diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere index d93c02c288..207ad38b78 100755 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere @@ -40,8 +40,7 @@ esac IDEMPIERE_USER=idempiere IDEMPIERE_HOME=/opt/idempiere-server # in case you manual install java by use zip or your linux distros, or your java provider have difference pattern of path, please update here -JAVA_HOME=`ls -r /usr/lib/jvm/java-1[0-9]-openjdk*/bin/javac /usr/lib/jvm/java-1[0-9]-oracle*/bin/javac | head -1` -JAVA_HOME=`dirname $JAVA_HOME` +JAVA_HOME=`ls -r /usr/lib/jvm/java-1[12]-openjdk*/bin/javac | head -1` JAVA_HOME=`dirname $JAVA_HOME` SU=su export IDEMPIERE_HOME @@ -256,9 +255,9 @@ configure_perform() if [ "x${ADEMPIERE_DB_SYSTEM}" = "x^TryLocalConnection^" ] then # recreate idempiere user from here as the RUN_ImportIdempiere requires it - $SU postgres -c "dropdb -U postgres idempiere" # > /dev/null 2>&1 - $SU postgres -c "dropuser -U postgres idempiere" # > /dev/null 2>&1 - $SU postgres -c "psql -U postgres -c \"CREATE ROLE adempiere SUPERUSER LOGIN PASSWORD '${ADEMPIERE_DB_PASSWORD}'\"" # > /dev/null 2>&1 + $SU postgres -c "cd; dropdb -U postgres idempiere" # > /dev/null 2>&1 + $SU postgres -c "cd; dropuser -U postgres idempiere" # > /dev/null 2>&1 + $SU postgres -c "cd; psql -U postgres -c \"CREATE ROLE adempiere SUPERUSER LOGIN PASSWORD '${ADEMPIERE_DB_PASSWORD}'\"" # > /dev/null 2>&1 fi if [ -f ${IDEMPIERE_HOME}/utils/RUN_ImportIdempiere.sh ] @@ -267,13 +266,13 @@ configure_perform() $SU ${IDEMPIERE_USER} -c "cd ${IDEMPIERE_HOME}/utils; ( echo "" | ./RUN_ImportIdempiere.sh )" # > /dev/null 2>&1 echo "Done" fi - $SU ${IDEMPIERE_USER} -c "export PGPASSWORD=${ADEMPIERE_DB_PASSWORD}; psql -d idempiere -U adempiere -h localhost -p 5432 -c ''" > /dev/null 2>&1 + $SU ${IDEMPIERE_USER} -c "cd; export PGPASSWORD=${ADEMPIERE_DB_PASSWORD}; psql -d idempiere -U adempiere -h localhost -p 5432 -c ''" > /dev/null 2>&1 if [ $? -ne 0 ] then echo "Cannot connect to idempiere database, please verify and try again" exit 1 fi - $SU ${IDEMPIERE_USER} -c "export PGPASSWORD=${ADEMPIERE_DB_PASSWORD}; psql -d idempiere -U adempiere -h localhost -p 5432 -c 'select count(*) from ad_system' 2>&1 | grep '1$'" > /dev/null 2>&1 + $SU ${IDEMPIERE_USER} -c "cd; export PGPASSWORD=${ADEMPIERE_DB_PASSWORD}; psql -d idempiere -U adempiere -h localhost -p 5432 -c 'select count(*) from ad_system' 2>&1 | grep '1$'" > /dev/null 2>&1 if [ $? -ne 0 ] then echo "Database not imported correctly, please verify and try again" @@ -465,7 +464,7 @@ EOF if [ -z "$LINE" ] then # Empty postgres password verify connection with local postgres user - $SU postgres -c "psql -U postgres -c ''" + $SU postgres -c "cd; psql -U postgres -c ''" if [ $? -eq 0 ] then break