From d0d64b9772fb1f5b2d04e43f79488f418a41012c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 6 Dec 2019 19:13:33 +0100 Subject: [PATCH 1/7] Rename and configure .gitignore --- .gitignore | 98 ++++++++++++++++++ .hgignore | 99 ------------------- .../jettyhome/work/{.hgignore => .gitignore} | 0 .../src/{.hgignore => .gitignore} | 0 .../src/{.hgignore => .gitignore} | 0 .../src/{.hgignore => .gitignore} | 0 .../.gitignore | 1 + .../.hgignore | 2 - org.slf4j.jdk14/bin/{.hgignore => .gitignore} | 0 org.slf4j.jdk14/src/{.hgignore => .gitignore} | 0 10 files changed, 99 insertions(+), 101 deletions(-) create mode 100644 .gitignore delete mode 100644 .hgignore rename org.adempiere.server-feature/jettyhome/work/{.hgignore => .gitignore} (100%) rename org.adempiere.webstore.resource/src/{.hgignore => .gitignore} (100%) rename org.adempiere.webstore/src/{.hgignore => .gitignore} (100%) rename org.idempiere.hazelcast.service.config/src/{.hgignore => .gitignore} (100%) create mode 100644 org.idempiere.webservices.client-feature/.gitignore delete mode 100644 org.idempiere.webservices.client-feature/.hgignore rename org.slf4j.jdk14/bin/{.hgignore => .gitignore} (100%) rename org.slf4j.jdk14/src/{.hgignore => .gitignore} (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..24e4f22971 --- /dev/null +++ b/.gitignore @@ -0,0 +1,98 @@ +build + +External Plug-in Libraries +org.eclipse.jetty.http/bin +alpn-boot.jar +.sonarlint +org.adempiere.webstore/bin +org.idempiere.hazelcast.service.config/bin +*/target/ +runtime-server.product +org.idempiere.fitnesse.server/FitNesseRoot +syntax: regexp +adempiere +org.adempiere.install/lib +org.adempiere.install/bin/** +org.adempiere.ui.zk/dist +org.adempiere.ui.zk/bin/** +**/lib/*.jar +**/seed/*.jar +db/ddlutils/lib/*.jar +fitnesse/fitnesse.jar +org.adempiere.ui.zk/labelapplet.jar + +lib/plugins +plugins/*.class +adempiere-local.properties +org.adempiere.extend/test.properties +org.adempiere.extend/bin/** +org.adempiere.ui/*.class +org.adempiere.ui/bin/*.css +org.adempiere.pipo.handlers/*.class +org.adempiere.pipo/*.class +org.adempiere.report.jasper.swing/*.class +org.compiere.db.oracle.provider/bin/*.class +org.compiere.db.postgresql.provider/bin/*.class +org.adempiere.ui.swing/bin/** +org.adempiere.report.jasper.fonts/bin/** + +org.adempiere.tomcat.config/META-INF/tomcat/server.xml +org.apache.ecs/bin/*.class +org.adempiere.replication/bin/*.class +org.adempiere.replication.server/bin/** +org.adempiere.server/bin/** +org.adempiere.pipo.legacy/bin/*.class +org.adempiere.base/bin/** +org.adempiere.base.callout/bin/*.class +org.adempiere.base.process/bin/*.class +org.adempiere.payment.processor/bin/*.class +org.adempiere.ui.swing.pluginlist/bin/*.class +org.adempiere.plugin.utils/bin/*.class +org.adempiere.webstore.servlet/bin/*.class +org.adempiere.webstore.servlet/bin/*.tld +org.adempiere.eclipse.equinox.servletbridge/bin/*.class +org.adempiere.eclipse.equinox.http.servlet/bin/*.class +org.adempiere.eclipse.equinox.http.servletbridge/bin/*.class +org.adempiere.ui.zk.example/bin/* +org.adempiere.webstore.resource/bin/* +org.adempiere.webstore.resource/bin/* +targetPlatform/* +.metadata +org.apache.ecs/bin/* +keystore/* +log/* +PostgreSQL/* +*.log +Adempiere.properties +idempiere.properties +AdempiereEnv.properties +idempiereEnv.properties +event.test/bin*.class +packages/* +work/* +hazelcast.xml + +swingclient.product*.launch +server.product*.launch + +org.zkoss.zk.library/bin +.class + +org.zkoss.zk.library/*/calendar*.jar +org.zkoss.zk.library/*/ckez*.jar +org.zkoss.zk.library/*/gmapsz*.jar +org.zkoss.zk.library/*/jruby*.jar +org.zkoss.zk.library/*/jython*.jar +org.zkoss.zk.library/*/timelinez*.jar +org.zkoss.zk.library/*/timeplotz*.jar +org.zkoss.zk.library/*/z*.jar +.buckminster/ +jettyhome/ +.recommenders/ +packin +packout +RemoteSystemsTempFiles + +fitnesse/FitNesseRoot/FitLibraryWeb/*.zip + +org.idempiere.javadoc/API diff --git a/.hgignore b/.hgignore deleted file mode 100644 index de7f67c6d0..0000000000 --- a/.hgignore +++ /dev/null @@ -1,99 +0,0 @@ -syntax: glob -build - -External Plug-in Libraries -org.eclipse.jetty.http/bin -alpn-boot.jar -.sonarlint -org.adempiere.webstore/bin -org.idempiere.hazelcast.service.config/bin -*/target -runtime-server.product -org.idempiere.fitnesse.server/FitNesseRoot -syntax: regexp -^adempiere$ -^org\.adempiere\.install/lib$ -^org\.adempiere\.install/bin/.*\.*$ -^org\.adempiere\.ui\.zk/dist$ -^org\.adempiere\.ui\.zk/bin/.*\.*$ -^[^/]+/lib/.*\.jar$ -^[^/]+/.*\.jar$ -^[^/]+/WEB-INF/lib/.*\.jar$ -^db/ddlutils/lib/.*\.jar$ - -^lib/plugins$ -^plugins/.*\.class$ -^adempiere-local\.properties$ -^org.adempiere.extend/test.properties$ -^org.adempiere.extend/bin/.*\.*$ -^org\.adempiere\.ui/.*\.class$ -^org\.adempiere\.ui/bin/.*\.css$ -^org\.adempiere\.pipo.handlers/.*\.class$ -^org\.adempiere\.pipo/.*\.class$ -^org\.adempiere\.report\.jasper\.swing/.*\.class$ -^org\.compiere\.db\.oracle\.provider/bin/.*\.class$ -^org\.compiere\.db\.postgresql\.provider/bin/.*\.class$ -^org\.adempiere\.ui\.swing/bin/.*\.*$ -^org\.adempiere\.report\.jasper\.fonts/bin/.*\.*$ - -^org.adempiere.tomcat.config/META-INF/tomcat/server\.xml$ -^org\.apache\.ecs/bin/.*\.class$ -^org\.adempiere\.replication/bin/.*\.class$ -^org\.adempiere\.replication\.server/bin/.*\.*$ -^org\.adempiere\.server/bin/.*\.*$ -^org\.adempiere\.pipo\.legacy/bin/.*\.class$ -^org\.adempiere\.base/bin/.*\.*$ -^org\.adempiere\.base\.callout/bin/.*\.class$ -^org\.adempiere\.base\.process/bin/.*\.class$ -^org\.adempiere\.payment\.processor/bin/.*\.class$ -^org\.adempiere\.ui\.swing\.pluginlist/bin/.*\.class$ -^org\.adempiere\.plugin\.utils/bin/.*\.class$ -^org\.adempiere\.webstore\.servlet/bin/.*\.class$ -^org\.adempiere\.webstore\.servlet/bin/.*\.tld$ -^org\.adempiere\.eclipse\.equinox\.servletbridge/bin/.*\.class$ -^org\.adempiere\.eclipse\.equinox\.http\.servlet/bin/.*\.class$ -^org\.adempiere\.eclipse\.equinox\.http\.servletbridge/bin/.*\.class$ -^org\.adempiere\.ui\.zk\.example/bin/.*$ -^org\.adempiere\.webstore\.resource/bin/.*$ -^org\.adempiere\.webstore\.resource/bin/.*$ -^targetPlatform/.*$ -^\.metadata/.*$ -^org\.apache\.ecs/bin/.*$ -^keystore/.*$ -^log/.*$ -^PostgreSQL/.*$ -^.*\.log$ -^Adempiere.properties$ -^idempiere.properties$ -^AdempiereEnv.properties$ -^idempiereEnv.properties$ -^event\.test/bin.*\.class$ -^packages/.*$ -^work/.*$ -^hazelcast\.xml$ - -swingclient.product.*\.launch -server.product.*\.launch - -^org\.zkoss\.zk\.library/bin$ -\.class$ - -^org\.zkoss\.zk\.library/.*/calendar.*\.jar$ -^org\.zkoss\.zk\.library/.*/ckez.*\.jar$ -^org\.zkoss\.zk\.library/.*/gmapsz.*\.jar$ -^org\.zkoss\.zk\.library/.*/jruby.*\.jar$ -^org\.zkoss\.zk\.library/.*/jython.*\.jar$ -^org\.zkoss\.zk\.library/.*/timelinez.*\.jar$ -^org\.zkoss\.zk\.library/.*/timeplotz.*\.jar$ -^org\.zkoss\.zk\.library/.*/z.*\.jar$ -.buckminster/ -^jettyhome/ -.recommenders/ -^packin -^packout -^RemoteSystemsTempFiles - -^fitnesse/FitNesseRoot/FitLibraryWeb/[^/]+\.zip$ - -^org\.idempiere\.javadoc/API$ - diff --git a/org.adempiere.server-feature/jettyhome/work/.hgignore b/org.adempiere.server-feature/jettyhome/work/.gitignore similarity index 100% rename from org.adempiere.server-feature/jettyhome/work/.hgignore rename to org.adempiere.server-feature/jettyhome/work/.gitignore diff --git a/org.adempiere.webstore.resource/src/.hgignore b/org.adempiere.webstore.resource/src/.gitignore similarity index 100% rename from org.adempiere.webstore.resource/src/.hgignore rename to org.adempiere.webstore.resource/src/.gitignore diff --git a/org.adempiere.webstore/src/.hgignore b/org.adempiere.webstore/src/.gitignore similarity index 100% rename from org.adempiere.webstore/src/.hgignore rename to org.adempiere.webstore/src/.gitignore diff --git a/org.idempiere.hazelcast.service.config/src/.hgignore b/org.idempiere.hazelcast.service.config/src/.gitignore similarity index 100% rename from org.idempiere.hazelcast.service.config/src/.hgignore rename to org.idempiere.hazelcast.service.config/src/.gitignore diff --git a/org.idempiere.webservices.client-feature/.gitignore b/org.idempiere.webservices.client-feature/.gitignore new file mode 100644 index 0000000000..eb5a316cbd --- /dev/null +++ b/org.idempiere.webservices.client-feature/.gitignore @@ -0,0 +1 @@ +target diff --git a/org.idempiere.webservices.client-feature/.hgignore b/org.idempiere.webservices.client-feature/.hgignore deleted file mode 100644 index c82d673286..0000000000 --- a/org.idempiere.webservices.client-feature/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -syntax: glob -target diff --git a/org.slf4j.jdk14/bin/.hgignore b/org.slf4j.jdk14/bin/.gitignore similarity index 100% rename from org.slf4j.jdk14/bin/.hgignore rename to org.slf4j.jdk14/bin/.gitignore diff --git a/org.slf4j.jdk14/src/.hgignore b/org.slf4j.jdk14/src/.gitignore similarity index 100% rename from org.slf4j.jdk14/src/.hgignore rename to org.slf4j.jdk14/src/.gitignore From 0b26ced570384796790a8a1946abba6773840d71 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 10 Dec 2019 19:24:24 +0100 Subject: [PATCH 2/7] IDEMPIERE-4129 Increase field size t_selection.viewid (FHCA-1130) --- .../i7.1/oracle/201912101914_IDEMPIERE-4129.sql | 13 +++++++++++++ .../i7.1/postgresql/201912101914_IDEMPIERE-4129.sql | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 migration/i7.1/oracle/201912101914_IDEMPIERE-4129.sql create mode 100644 migration/i7.1/postgresql/201912101914_IDEMPIERE-4129.sql diff --git a/migration/i7.1/oracle/201912101914_IDEMPIERE-4129.sql b/migration/i7.1/oracle/201912101914_IDEMPIERE-4129.sql new file mode 100644 index 0000000000..d7afe99aff --- /dev/null +++ b/migration/i7.1/oracle/201912101914_IDEMPIERE-4129.sql @@ -0,0 +1,13 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Dec 10, 2019, 7:14:05 PM CET +ALTER TABLE T_Selection MODIFY ViewID VARCHAR2(2000) +; + +ALTER TABLE T_Selection_InfoWindow MODIFY ViewID VARCHAR2(2000) +; + +SELECT register_migration_script('201912101914_IDEMPIERE-4129.sql') FROM dual +; + diff --git a/migration/i7.1/postgresql/201912101914_IDEMPIERE-4129.sql b/migration/i7.1/postgresql/201912101914_IDEMPIERE-4129.sql new file mode 100644 index 0000000000..17b9133c89 --- /dev/null +++ b/migration/i7.1/postgresql/201912101914_IDEMPIERE-4129.sql @@ -0,0 +1,11 @@ +-- IDEMPIERE-4129 Increase field size t_selection.viewid (FHCA-1130) +-- Dec 10, 2019, 7:14:05 PM CET +INSERT INTO t_alter_column values('T_Selection','ViewID','VARCHAR(2000)',null,null) +; + +INSERT INTO t_alter_column values('T_Selection_InfoWindow','ViewID','VARCHAR(2000)',null,null) +; + +SELECT register_migration_script('201912101914_IDEMPIERE-4129.sql') FROM dual +; + From 2099a8b1cbe1bd86b174dbc4afffed3c2fb48e74 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 11 Dec 2019 14:32:25 +0100 Subject: [PATCH 3/7] IDEMPIERE-4126 Modify Access Modifiers of MPayment properties and Methods --- .../src/org/compiere/model/MPayment.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index f688f3d5b4..f5958eef39 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -87,7 +87,7 @@ public class MPayment extends X_C_Payment /** * */ - private static final long serialVersionUID = -6268462097642919346L; + private static final long serialVersionUID = 3236788845265387613L; /** * Get Payments Of BPartner @@ -167,13 +167,13 @@ public class MPayment extends X_C_Payment } // MPayment /** Temporary Bank Account Processors */ - private MBankAccountProcessor[] m_mBankAccountProcessors = null; + protected MBankAccountProcessor[] m_mBankAccountProcessors = null; /** Temporary Bank Account Processor */ - private MBankAccountProcessor m_mBankAccountProcessor = null; + protected MBankAccountProcessor m_mBankAccountProcessor = null; /** Logger */ - private static CLogger s_log = CLogger.getCLogger (MPayment.class); + protected static CLogger s_log = CLogger.getCLogger (MPayment.class); /** Error Message */ - private String m_errorMessage = null; + protected String m_errorMessage = null; /** Reversal Indicator */ public static String REVERSE_INDICATOR = "^"; @@ -1096,7 +1096,7 @@ public class MPayment extends X_C_Payment * @param CreditCardType credit card Type * @return pair */ - private ValueNamePair getCreditCardPair (String CreditCardType) + protected ValueNamePair getCreditCardPair (String CreditCardType) { return new ValueNamePair (CreditCardType, getCreditCardName(CreditCardType)); } // getCreditCardPair @@ -1232,7 +1232,7 @@ public class MPayment extends X_C_Payment * Set DocumentNo to Payment info. * If there is a R_PnRef that is set automatically */ - private void setDocumentNo() + protected void setDocumentNo() { // Cash Transfer if ("X".equals(getTenderType())) @@ -1450,7 +1450,7 @@ public class MPayment extends X_C_Payment /** * Set Doc Type bases on IsReceipt */ - private void setC_DocType_ID () + protected void setC_DocType_ID () { setC_DocType_ID(isReceipt()); } // setC_DocType_ID @@ -1508,7 +1508,7 @@ public class MPayment extends X_C_Payment * @param pAllocs * @return true if ok */ - private boolean verifyDocType(MPaymentAllocate[] pAllocs) + protected boolean verifyDocType(MPaymentAllocate[] pAllocs) { if (getC_DocType_ID() == 0) return false; @@ -1655,7 +1655,7 @@ public class MPayment extends X_C_Payment * @param pAllocs * @return true if ok */ - private boolean verifyPaymentAllocateVsHeader(MPaymentAllocate[] pAllocs) { + protected boolean verifyPaymentAllocateVsHeader(MPaymentAllocate[] pAllocs) { if (pAllocs.length > 0) { if (getC_Charge_ID() > 0 || getC_Invoice_ID() > 0 || getC_Order_ID() > 0) return false; @@ -1668,7 +1668,7 @@ public class MPayment extends X_C_Payment * @param pAllocs * @return true if ok */ - private boolean verifyPaymentAllocateSum(MPaymentAllocate[] pAllocs) { + protected boolean verifyPaymentAllocateSum(MPaymentAllocate[] pAllocs) { BigDecimal sumPaymentAllocates = Env.ZERO; if (pAllocs.length > 0) { for (MPaymentAllocate pAlloc : pAllocs) @@ -1787,11 +1787,11 @@ public class MPayment extends X_C_Payment } // process /** Process Message */ - private String m_processMsg = null; + protected String m_processMsg = null; /** Just Prepared Flag */ - private boolean m_justPrepared = false; + protected boolean m_justPrepared = false; @SuppressWarnings("unused") - private IProcessUI m_processUI; + protected IProcessUI m_processUI; /** * Unlock Document. @@ -2128,7 +2128,7 @@ public class MPayment extends X_C_Payment /** * Set the definite document number after completed */ - private void setDefiniteDocumentNo() { + protected void setDefiniteDocumentNo() { MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); if (dt.isOverwriteDateOnComplete()) { setDateTrx(TimeUtil.getDay(0)); @@ -2148,7 +2148,7 @@ public class MPayment extends X_C_Payment * Create Counter Document * @return payment */ - private MPayment createCounterDoc() + protected MPayment createCounterDoc() { // Is this a counter doc ? if (getRef_Payment_ID() != 0) @@ -2317,7 +2317,7 @@ public class MPayment extends X_C_Payment * Allocate single AP/AR Invoice * @return true if allocated */ - private boolean allocateInvoice() + protected boolean allocateInvoice() { // calculate actual allocation BigDecimal allocationAmt = getPayAmt(); // underpayment @@ -2364,7 +2364,7 @@ public class MPayment extends X_C_Payment * Allocate Payment Selection * @return true if allocated */ - private boolean allocatePaySelection() + protected boolean allocatePaySelection() { MAllocationHdr alloc = new MAllocationHdr(getCtx(), false, getDateTrx(), getC_Currency_ID(), @@ -2455,7 +2455,7 @@ public class MPayment extends X_C_Payment * Unkink Invoices and Orders and delete Allocations * @param accrual */ - private void deAllocate(boolean accrual) + protected void deAllocate(boolean accrual) { // if (getC_Order_ID() != 0) setC_Order_ID(0); // IDEMPIERE-1764 // if (getC_Invoice_ID() == 0) @@ -2634,7 +2634,7 @@ public class MPayment extends X_C_Payment return true; } // reverseCorrectionIt - private StringBuilder reverse(boolean accrual) { + protected StringBuilder reverse(boolean accrual) { if (!voidOnlinePayment()) return null; @@ -2753,7 +2753,7 @@ public class MPayment extends X_C_Payment * Get Bank Statement Line of payment or 0 * @return id or 0 */ - private int getC_BankStatementLine_ID() + protected int getC_BankStatementLine_ID() { String sql = "SELECT C_BankStatementLine_ID FROM C_BankStatementLine WHERE C_Payment_ID=?"; int id = DB.getSQLValue(get_TrxName(), sql, getC_Payment_ID()); @@ -2989,7 +2989,7 @@ public class MPayment extends X_C_Payment return paymentTransaction; } - private boolean voidOnlinePayment() + protected boolean voidOnlinePayment() { if (getTenderType().equals(TENDERTYPE_CreditCard) && isOnline()) { @@ -3048,7 +3048,7 @@ public class MPayment extends X_C_Payment } // IDEMPIERE-2588 - private MAllocationHdr m_justCreatedAllocInv = null; + protected MAllocationHdr m_justCreatedAllocInv = null; public MAllocationHdr getJustCreatedAllocInv() { return m_justCreatedAllocInv; } From 3a6b25ddec735f1f1e856654f8154cb4372d393d Mon Sep 17 00:00:00 2001 From: sjeffen Date: Wed, 11 Dec 2019 15:49:01 +0100 Subject: [PATCH 4/7] IDEMPIERE-4078 cph::erp Doc messages translation --- .../oracle/201912111530_IDEMPIERE-4078.sql | 11 ++++++++++ .../201912111530_IDEMPIERE-4078.sql | 8 +++++++ .../src/org/compiere/acct/Doc.java | 22 ++++++++++++------- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 migration/i7.1/oracle/201912111530_IDEMPIERE-4078.sql create mode 100644 migration/i7.1/postgresql/201912111530_IDEMPIERE-4078.sql diff --git a/migration/i7.1/oracle/201912111530_IDEMPIERE-4078.sql b/migration/i7.1/oracle/201912111530_IDEMPIERE-4078.sql new file mode 100644 index 0000000000..cea402dcb2 --- /dev/null +++ b/migration/i7.1/oracle/201912111530_IDEMPIERE-4078.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- CPH::ERP Comments: +-- 26. okt. 2019 14.51.26 CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Period Open',0,0,'Y',TO_DATE('2019-10-26 14:51:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-10-26 14:51:25','YYYY-MM-DD HH24:MI:SS'),100,200580,'PeriodOpen','D','cb274239-00ed-4a7f-b508-4a00436e6d70') +; + +SELECT register_migration_script('201912111530_IDEMPIERE-4078.sql') FROM dual +; + diff --git a/migration/i7.1/postgresql/201912111530_IDEMPIERE-4078.sql b/migration/i7.1/postgresql/201912111530_IDEMPIERE-4078.sql new file mode 100644 index 0000000000..01840ba783 --- /dev/null +++ b/migration/i7.1/postgresql/201912111530_IDEMPIERE-4078.sql @@ -0,0 +1,8 @@ +-- CPH::ERP Comments: +-- 26. okt. 2019 14.51.26 CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Period Open',0,0,'Y',TO_TIMESTAMP('2019-10-26 14:51:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-10-26 14:51:25','YYYY-MM-DD HH24:MI:SS'),100,200580,'PeriodOpen','D','cb274239-00ed-4a7f-b508-4a00436e6d70') +; + +SELECT register_migration_script('201912111530_IDEMPIERE-4078.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java index e119eea644..a2ea19d09c 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc.java @@ -22,6 +22,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -45,6 +47,7 @@ import org.compiere.model.MMatchInv; import org.compiere.model.MMatchPO; import org.compiere.model.MNote; import org.compiere.model.MPeriod; +import org.compiere.model.MRefList; import org.compiere.model.ModelValidationEngine; import org.compiere.model.ModelValidator; import org.compiere.model.PO; @@ -52,6 +55,7 @@ import org.compiere.process.DocumentEngine; import org.compiere.util.AdempiereUserError; import org.compiere.util.CLogger; import org.compiere.util.DB; +import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.util.Msg; import org.compiere.util.Trx; @@ -653,6 +657,8 @@ public abstract class Doc if (!p_Status.equals(STATUS_Posted) && !p_Status.equals(STATUS_Deferred)) { // Insert Note + SimpleDateFormat dateFormat = DisplayType.getDateFormat(DisplayType.Date); + DecimalFormat numberFormat = DisplayType.getNumberFormat(DisplayType.Amount); String AD_MessageValue = "PostingError-" + p_Status; int AD_User_ID = p_po.getUpdatedBy(); MNote note = new MNote (getCtx(), AD_MessageValue, AD_User_ID, @@ -666,14 +672,14 @@ public abstract class Doc Text.append(" (").append(p_Error).append(")"); String cn = getClass().getName(); Text.append(" - ").append(cn.substring(cn.lastIndexOf('.'))) - .append(" (").append(getDocumentType()) - .append(" - DocumentNo=").append(getDocumentNo()) - .append(", DateAcct=").append(getDateAcct().toString().substring(0,10)) - .append(", Amount=").append(getAmount()) - .append(", Sta=").append(p_Status) - .append(" - PeriodOpen=").append(isPeriodOpen()) - .append(", Balanced=").append(isBalanced()) - .append(", Schema=").append(m_as.getName()); + .append(" (").append(getDocumentType()) + .append(" - " + Msg.getElement(Env.getCtx(),"DocumentNo") + "=").append(getDocumentNo()) + .append(" - " + Msg.getElement(Env.getCtx(),"DateAcct") + "=").append(dateFormat.format(getDateAcct())) + .append(" - " + Msg.getMsg(Env.getCtx(),"Amount") + "=").append(numberFormat.format(getAmount())) + .append(" - " + Msg.getElement(Env.getCtx(),"DocStatus") + "=").append(MRefList.getListName(getCtx(), 131, m_DocStatus)) + .append(" - " + Msg.getMsg(Env.getCtx(),"PeriodOpen") + "=").append(Msg.getMsg(Env.getCtx(), String.valueOf(isPeriodOpen()))) + .append(" - " + Msg.getElement(Env.getCtx(),"IsBalanced") + "=").append( Msg.getMsg(Env.getCtx(), String.valueOf(isBalanced()))) + .append(" - " + Msg.getElement(Env.getCtx(),"C_AcctSchema_ID") + "=").append(m_as.getName()); note.setTextMsg(Text.toString()); note.saveEx(); p_Error = Text.toString(); From 304014ab721cb6c6854c3851e3c7ef3b9a0434d0 Mon Sep 17 00:00:00 2001 From: Hans Auler GmbH Date: Wed, 11 Dec 2019 16:28:35 +0100 Subject: [PATCH 5/7] IDEMPIERE-4075 Html tags and CSS in Status Line --- .../adempiere/webui/adwindow/StatusBar.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java index 4ab530f601..04219148de 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java @@ -25,6 +25,7 @@ import org.adempiere.webui.component.Tabpanel; import org.adempiere.webui.component.Window; import org.adempiere.webui.util.ZKUpdateUtil; import org.compiere.process.ProcessInfoLog; +import org.zkoss.zul.Html; import org.zkoss.zhtml.Text; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Execution; @@ -53,8 +54,10 @@ public class StatusBar extends Panel implements EventListener * */ private static final long serialVersionUID = 1519490416637936553L; + + private Panel infoPanel; - private Label infoLine; + private Html infoLine; private Div west; @@ -84,8 +87,10 @@ public class StatusBar extends Panel implements EventListener private void init() { - infoLine = new Label(); - + infoPanel = new Panel(); + infoLine = new Html(); + infoPanel.appendChild(infoLine); + east = new Div(); east.setSclass("adwindow-status-docinfo"); east.appendChild(infoLine); @@ -107,9 +112,12 @@ public class StatusBar extends Panel implements EventListener */ public void setInfo (String text) { - infoLine.setValue(text != null ? text : ""); - infoLine.setTooltiptext(text); - infoLine.setStyle("font-weight: bold;"); + StringBuilder inflcnt = new StringBuilder(); + inflcnt.append("\n\n
\n"); + inflcnt.append(text != null ? text : ""); + inflcnt.append("
\n\n"); + infoLine.setContent(inflcnt.toString()); + } // setInfo /** From 2368c6da57fca36fd7358da11aa42757bc8257e5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 11 Dec 2019 17:13:59 +0100 Subject: [PATCH 6/7] IDEMPIERE-4076 In financial report when calculation is Add Range and operand 1 and operand 2 are same, calculations are wrong based on patch from Deepak Pansheriya --- org.adempiere.base/src/org/compiere/report/FinReport.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.adempiere.base/src/org/compiere/report/FinReport.java b/org.adempiere.base/src/org/compiere/report/FinReport.java index c796e7404b..a45a9e4374 100644 --- a/org.adempiere.base/src/org/compiere/report/FinReport.java +++ b/org.adempiere.base/src/org/compiere/report/FinReport.java @@ -1110,6 +1110,9 @@ public class FinReport extends SvrProcess private String getLineIDs (int fromID, int toID) { if (log.isLoggable(Level.FINEST)) log.finest("From=" + fromID + " To=" + toID); + if (fromID == toID) { + return String.valueOf(fromID); + } int firstPA_ReportLine_ID = 0; int lastPA_ReportLine_ID = 0; From f847b9c367568507a97df0d31d4e8fe2bc416b6c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 12 Dec 2019 11:41:39 +0100 Subject: [PATCH 7/7] IDEMPIERE-4013 iDempiere should not require Conscrypt / apply same change on .bat that it was applied on .sh --- org.adempiere.server-feature/idempiere-server.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.server-feature/idempiere-server.bat b/org.adempiere.server-feature/idempiere-server.bat index f3f256d44e..e9a4c872c2 100644 --- a/org.adempiere.server-feature/idempiere-server.bat +++ b/org.adempiere.server-feature/idempiere-server.bat @@ -24,7 +24,7 @@ FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c @Set VMOPTS=%VMOPTS% -Dosgi.compatibility.bootdelegation=true @Set VMOPTS=%VMOPTS% -Djetty.home=jettyhome @Set VMOPTS=%VMOPTS% -Djetty.base=jettyhome -@Set VMOPTS=%VMOPTS% -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml +@Set VMOPTS=%VMOPTS% -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml @Set VMOPTS=%VMOPTS% -Dosgi.console=localhost:12612 @Set VMOPTS=%VMOPTS% -Dmail.mime.encodefilename=true @Set VMOPTS=%VMOPTS% -Dmail.mime.decodefilename=true