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

IDEMPIERE-6165 + IDEMPIERE-6168 More problems with jasper setting filename (#2392) 

- the test case is failing for orders with jasper print format
- the downloadable file name for jasper is wrong in zk when using FileNamePattern
This commit is contained in:
Carlos Ruiz 2024-06-13 03:39:44 +02:00
parent 689573c90d
commit a45283b855
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/compiere/print/ServerReportCtl.java
View File

@ -85,7 +85,10 @@ public class ServerReportCtl {
// ==============================
if(format.getJasperProcess_ID() > 0)
{
boolean result = runJasperProcess(Record_ID, re, true, printerName, pi);
int jasperRecordId = Record_ID;
if (re.getPrintInfo() != null && re.getPrintInfo().getRecord_ID() > 0)
jasperRecordId = re.getPrintInfo().getRecord_ID();
boolean result = runJasperProcess(jasperRecordId, re, true, printerName, pi);
return(result);
}
else

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
View File

@ -427,7 +427,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
mediaSuppliers.put(toMediaType(PDF_MIME_TYPE, PDF_FILE_EXT), () -> {
try {
attachment = getPDF();
return new AMedia(m_title+"."+PDF_FILE_EXT, PDF_FILE_EXT, PDF_MIME_TYPE, attachment, true);
return new AMedia(attachment.getName(), PDF_FILE_EXT, PDF_MIME_TYPE, attachment, true);
} catch (Exception e) {
if (e instanceof RuntimeException)
throw (RuntimeException)e;

5
org.idempiere.test/src/org/idempiere/test/base/ReportTest.java
View File

@ -31,6 +31,7 @@ import java.io.File;
import org.compiere.model.MOrder;
import org.compiere.model.MPInstance;
import org.compiere.model.MProcess;
import org.compiere.model.SystemIDs;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ServerProcessCtl;
import org.compiere.util.Env;
@ -45,14 +46,12 @@ public class ReportTest extends AbstractTestCase {
public ReportTest() {
}
private static final int Order_Print_Process = 110;
/**
* https://idempiere.atlassian.net/browse/IDEMPIERE-6165
*/
@Test
public void testPDFFileName() {
MProcess orderReport = MProcess.get(Env.getCtx(), Order_Print_Process);
MProcess orderReport = MProcess.get(Env.getCtx(), SystemIDs.PROCESS_RPT_C_ORDER);
MOrder order = new MOrder(Env.getCtx(), 108, getTrxName()); // Garden Order 60000
String fileName = order.getDocumentNo() + ".pdf";