diff --git a/.gitignore b/.gitignore
index dad8cc1d42..053f76c4aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,81 +1,26 @@
-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
-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
-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.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.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
 
-.class
+/RemoteSystemsTempFiles/
+External Plug-in Libraries
+.recommenders
 
-jettyhome/
-.recommenders/
-packin
-packout
-RemoteSystemsTempFiles
+/runtime-server.product/
+/jettyhome/
 
-org.idempiere.javadoc/API
+/org.idempiere.javadoc/API
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
+;
+
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 );