From 763b81bfe063635ca8f2e78b765967944075e90d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 4 Jan 2020 17:45:48 +0100 Subject: [PATCH 1/3] IDEMPIERE-1486 Form to captured process parameter for scheduler Enable the usage of the button for non-system --- .../i7.1/oracle/202001041702_IDEMPIERE-1486.sql | 15 +++++++++++++++ .../postgresql/202001041702_IDEMPIERE-1486.sql | 12 ++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 migration/i7.1/oracle/202001041702_IDEMPIERE-1486.sql create mode 100644 migration/i7.1/postgresql/202001041702_IDEMPIERE-1486.sql diff --git a/migration/i7.1/oracle/202001041702_IDEMPIERE-1486.sql b/migration/i7.1/oracle/202001041702_IDEMPIERE-1486.sql new file mode 100644 index 0000000000..4163473551 --- /dev/null +++ b/migration/i7.1/oracle/202001041702_IDEMPIERE-1486.sql @@ -0,0 +1,15 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-2924 Export to XLS limited to 65536 +-- Jan 4, 2020, 4:51:45 PM CET +UPDATE AD_Form SET AccessLevel='7',Updated=TO_DATE('2020-01-04 16:51:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=200008 +; + +-- Jan 4, 2020, 4:51:52 PM CET +UPDATE AD_Process SET AccessLevel='7',Updated=TO_DATE('2020-01-04 16:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=200064 +; + +SELECT register_migration_script('202001041702_IDEMPIERE-1486.sql') FROM dual +; + diff --git a/migration/i7.1/postgresql/202001041702_IDEMPIERE-1486.sql b/migration/i7.1/postgresql/202001041702_IDEMPIERE-1486.sql new file mode 100644 index 0000000000..1a52d34b60 --- /dev/null +++ b/migration/i7.1/postgresql/202001041702_IDEMPIERE-1486.sql @@ -0,0 +1,12 @@ +-- IDEMPIERE-2924 Export to XLS limited to 65536 +-- Jan 4, 2020, 4:51:45 PM CET +UPDATE AD_Form SET AccessLevel='7',Updated=TO_TIMESTAMP('2020-01-04 16:51:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=200008 +; + +-- Jan 4, 2020, 4:51:52 PM CET +UPDATE AD_Process SET AccessLevel='7',Updated=TO_TIMESTAMP('2020-01-04 16:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=200064 +; + +SELECT register_migration_script('202001041702_IDEMPIERE-1486.sql') FROM dual +; + From 77a8e349b998d542d35c71103bbd779c3ca81c2c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 4 Jan 2020 18:12:26 +0100 Subject: [PATCH 2/3] IDEMPIERE-460 Integrate and migrate 3e services Fix old errors on integration, reporting wrong return type, is not xml but html, and fix some messages in Polish --- .../src/org/idempiere/adinterface/Process.java | 2 +- .../org/idempiere/adinterface/ReportEngineEx.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) 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 d1952133ed..00d62745b2 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 @@ -413,7 +413,7 @@ public class Process { { CharArrayWriter wr = new CharArrayWriter(); ok = ReportEngineEx.createEXCEL_HTML_wr( re, m_cs.getCtx(), wr, false, re.getPrintFormat().getLanguage() ); - file_type ="xls"; + file_type ="html"; String data = wr.toString(); if (data!=null) r.setData(data.getBytes()); diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java index 34f0b3bd97..859a23bd00 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.PrintWriter; import java.io.Writer; +import java.text.SimpleDateFormat; import java.util.Locale; import java.util.Properties; import java.util.logging.Level; @@ -29,6 +30,7 @@ import org.compiere.util.CLogger; import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.util.Language; +import org.compiere.util.Msg; import org.compiere.util.Util; @@ -210,15 +212,15 @@ public class ReportEngineEx { //extends ReportEngine { table1.setBorder(0).setCols(10).setCellPadding(0).setCellSpacing(2); table1.addElement( new tr().addElement(new td().setColSpan(10).addElement(new h1(re.getName())).setStyle("border:none;"))); tr tr1; - String tmp = "Jednostka: "; + String tmp = Msg.getElement(m_ctx, "AD_Org_ID") + ": "; MOrg o = MOrg.get(m_ctx, Env.getAD_Org_ID(m_ctx)); tmp += o.getName(); tr1 = new tr(); tr1.addElement( new td().addElement( tmp ).setColSpan(10).setStyle("border:none;") ); - table1.addElement( tr1 ); - - java.text.DateFormat dateFormat = java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL, new Locale("pl_PL")); - String dateData = "Czas wygenerowania: "+dateFormat.format(new java.util.Date()); + table1.addElement( tr1 ); + + SimpleDateFormat dateFormat = DisplayType.getDateFormat(DisplayType.Date); + String dateData = Msg.getElement(m_ctx, "DateReport")+ ": "+dateFormat.format(new java.util.Date()); tr1 = new tr(); tr1.addElement( new td().addElement( dateData ).setColSpan(10).setStyle("border:none;") ); table1.addElement( tr1 ); From 8361c328ed19dec2ee297d3954c9eceaf6dc5740 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 4 Jan 2020 18:34:23 +0100 Subject: [PATCH 3/3] Cleanup for .gitignore - fix problem with some files not being tracked --- .gitignore | 106 +++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 88 deletions(-) diff --git a/.gitignore b/.gitignore index 3e0a9a7553..9f0ba136df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,99 +1,29 @@ -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 +/org.adempiere.ui.zk/labelapplet.jar +/org.adempiere.extend/test.properties -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/* -Oracle/* -*.log -Adempiere.properties -idempiere.properties -AdempiereEnv.properties -idempiereEnv.properties -event.test/bin*.class -packages/* -work/* -hazelcast.xml +/.metadata/ +/PostgreSQL/ +/Oracle/ +/log/ +/*.log +/idempiere.properties +/idempiereEnv.properties +/hazelcast.xml swingclient.product*.launch server.product*.launch -org.zkoss.zk.library/bin -.class +/RemoteSystemsTempFiles/ +External Plug-in Libraries +.recommenders -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 +/runtime-server.product/ +/jettyhome/ -fitnesse/FitNesseRoot/FitLibraryWeb/*.zip +/org.idempiere.javadoc/API -org.idempiere.javadoc/API +/fitnesse/fitnesse.jar +/fitnesse/FitNesseRoot/FitLibraryWeb/*.zip