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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2014-07-27 19:12:11 +02:00
parent d67bca62b0 29530e1bce
commit 078534da53
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
View File

@ -229,7 +229,7 @@ public class InvoicePrint extends SvrProcess
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
List<File> pdfList = new ArrayList<File>(); final List<File> pdfList = new ArrayList<File>();
try try
{ {
pstmt = DB.prepareStatement(sql.toString(), get_TrxName()); pstmt = DB.prepareStatement(sql.toString(), get_TrxName());
@ -368,6 +368,20 @@ public class InvoicePrint extends SvrProcess
DB.close(rs, pstmt); DB.close(rs, pstmt);
} }
AEnv.executeAsyncDesktopTask(new Runnable() {
@Override
public void run() {
showReports(pdfList);
}
});
//
if (p_EMailPDF)
return "@Sent@=" + count + " - @Errors@=" + errors;
return "@Printed@=" + count;
} // doIt
private void showReports(List<File> pdfList) {
if (pdfList.size() > 1) { if (pdfList.size() > 1) {
try { try {
File outFile = File.createTempFile("InvoicePrint", ".pdf"); File outFile = File.createTempFile("InvoicePrint", ".pdf");
@ -390,10 +404,6 @@ public class InvoicePrint extends SvrProcess
} }
} }
// }
if (p_EMailPDF)
return "@Sent@=" + count + " - @Errors@=" + errors;
return "@Printed@=" + count;
} // doIt
} // InvoicePrint } // InvoicePrint