midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Carlos Ruiz 2020-01-04 18:12:26 +01:00
parent 763b81bfe0
commit 77a8e349b9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java
View File

@ -413,7 +413,7 @@ public class Process {
{ {
CharArrayWriter wr = new CharArrayWriter(); CharArrayWriter wr = new CharArrayWriter();
ok = ReportEngineEx.createEXCEL_HTML_wr( re, m_cs.getCtx(), wr, false, re.getPrintFormat().getLanguage() ); ok = ReportEngineEx.createEXCEL_HTML_wr( re, m_cs.getCtx(), wr, false, re.getPrintFormat().getLanguage() );
file_type ="xls"; file_type ="html";
String data = wr.toString(); String data = wr.toString();
if (data!=null) if (data!=null)
r.setData(data.getBytes()); r.setData(data.getBytes());

12
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ReportEngineEx.java
View File

@ -6,6 +6,7 @@ import java.io.FileNotFoundException;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.Writer; import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.Locale; import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
@ -29,6 +30,7 @@ import org.compiere.util.CLogger;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Language; import org.compiere.util.Language;
import org.compiere.util.Msg;
import org.compiere.util.Util; import org.compiere.util.Util;
@ -210,15 +212,15 @@ public class ReportEngineEx { //extends ReportEngine {
table1.setBorder(0).setCols(10).setCellPadding(0).setCellSpacing(2); 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;"))); table1.addElement( new tr().addElement(new td().setColSpan(10).addElement(new h1(re.getName())).setStyle("border:none;")));
tr tr1; 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)); MOrg o = MOrg.get(m_ctx, Env.getAD_Org_ID(m_ctx));
tmp += o.getName(); tmp += o.getName();
tr1 = new tr(); tr1 = new tr();
tr1.addElement( new td().addElement( tmp ).setColSpan(10).setStyle("border:none;") ); tr1.addElement( new td().addElement( tmp ).setColSpan(10).setStyle("border:none;") );
table1.addElement( tr1 ); table1.addElement( tr1 );
java.text.DateFormat dateFormat = java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL, new Locale("pl_PL")); SimpleDateFormat dateFormat = DisplayType.getDateFormat(DisplayType.Date);
String dateData = "Czas wygenerowania: "+dateFormat.format(new java.util.Date()); String dateData = Msg.getElement(m_ctx, "DateReport")+ ": "+dateFormat.format(new java.util.Date());
tr1 = new tr(); tr1 = new tr();
tr1.addElement( new td().addElement( dateData ).setColSpan(10).setStyle("border:none;") ); tr1.addElement( new td().addElement( dateData ).setColSpan(10).setStyle("border:none;") );
table1.addElement( tr1 ); table1.addElement( tr1 );