From 79ca08ffa158d20736d0d5807375e70f69b166f0 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Wed, 13 Jul 2011 08:11:00 +0000
Subject: [PATCH] fix invoice batch download, #13461
---
httemplate/elements/progress-popup.html | 2 +-
httemplate/view/bill_batch.cgi | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 42e464115..73440bbc3 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -66,7 +66,7 @@ function updateStatus( status_statustext ) {
window.top.location.href = '<% $url %>';
% } elsif ( $popup_url ) {
- document.parentWindow.location.replace('<% $popup_url %>');
+ document.location.replace('<% $popup_url %>');
% } else {
alert('job done but no url or message specified');
diff --git a/httemplate/view/bill_batch.cgi b/httemplate/view/bill_batch.cgi
index cfd44fe50..c848664ac 100644
--- a/httemplate/view/bill_batch.cgi
+++ b/httemplate/view/bill_batch.cgi
@@ -1,11 +1,13 @@
% if($magic eq 'download') {
-% $m->clear_buffer;
-% $r->content_type('application/pdf');
-% $r->headers_out->add('Content-Disposition' => 'attachment;filename="invoice_batch_'.$batchnum.'.pdf"');
-<% $batch->pdf %>
+% my $content = $batch->pdf;
% $batch->pdf('');
% my $error = $batch->replace;
% warn "error deleting cached PDF: '$error'\n" if $error;
+%
+% $m->clear_buffer;
+% $r->content_type('application/pdf');
+% $r->headers_out->add('Content-Disposition' => 'attachment;filename="invoice_batch_'.$batchnum.'.pdf"');
+<% $content %>
% }
%
% elsif ($magic eq 'download_popup') {
--
2.20.1