Fix batch print ISR

OCA · Jun 26, 2018 · 76157af · 76157af
1 parent ce2a010
commit 76157af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/l10n_ch_payment_slip/controllers/web.py b/l10n_ch_payment_slip/controllers/web.py
@@ -13,12 +13,15 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
         if converter == "reportlab_pdf":
             report_slip = request.env.ref(
                 'l10n_ch_payment_slip.one_slip_per_page_from_invoice')
-            filename = _('ISR')
+            filename = ''
+            invoice_id = []
             if docids:
-                invoice_id = [int(i) for i in docids.split(',')][0]
+                invoice_id = [int(i) for i in docids.split(',')]
                 filename = ''.join([
-                    _('ISR'), '_',
-                    '{0:05d}'.format(invoice_id), '.pdf',
+                    _('ISR'),
+                    '_multiple_invoices' if len(invoice_id) > 1
+                    else '{0:05d}'.format(invoice_id[0]),
+                    '.pdf'
                 ])
             data, format = report_slip.render(invoice_id)
             pdfhttpheaders = [

diff --git a/l10n_ch_payment_slip/static/src/js/qwebactionmanager.js b/l10n_ch_payment_slip/static/src/js/qwebactionmanager.js
@@ -8,7 +8,7 @@ var framework = require('web.framework');
 
 ActionManager.include({
     ir_actions_report: function (action, options){
-        var report_url;
+        var report_url = '';
 
         if (action.report_type !== 'reportlab_pdf') {
             return this._super(action, options);