diff options
| author | Josse Colpaert <jco@openerp.com> | 2014-04-07 13:33:31 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@openerp.com> | 2014-04-07 13:33:31 +0200 |
| commit | 511d5b6cc49a69fc3aaff2ea06822e85ffe927dc (patch) | |
| tree | 7beb481e80479bbd322bfb668bfdb7f4d79c4b06 | |
| parent | e175a4b00b5cd922f96c0eb84fd5a6a85d2a7d10 (diff) | |
[FIX] Fix report printing from barcode scanner
bzr revid: jco@openerp.com-20140407113331-nlrfnd2iykktnfnn
| -rw-r--r-- | addons/report/static/src/js/qwebactionmanager.js | 2 | ||||
| -rw-r--r-- | addons/stock/stock.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/report/static/src/js/qwebactionmanager.js b/addons/report/static/src/js/qwebactionmanager.js index dac8dcacf25..e7222330ebb 100644 --- a/addons/report/static/src/js/qwebactionmanager.js +++ b/addons/report/static/src/js/qwebactionmanager.js @@ -64,7 +64,7 @@ openerp.report = function(instance) { self.do_notify(_t('Report'), _t('Unable to find Wkhtmltopdf on this \ system. The report will be shown in html.<br><br><a href="http://wkhtmltopdf.org/" target="_blank">\ wkhtmltopdf.org</a>'), true); - window.open(report_url.substring(12), '_blank', 'height=768,width=1024'); + window.open(report_url.substring(11), '_blank', 'height=768,width=1024'); instance.web.unblockUI(); } else { if (presence == 'upgrade') { diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a33bf67f586..6bb3f3f0bfc 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -839,6 +839,8 @@ class stock_picking(osv.osv): def do_print_picking(self, cr, uid, ids, context=None): '''This function prints the picking list''' + context = context or {} + context['active_ids'] = ids return self.pool.get("report").get_action(cr, uid, ids, 'stock.report_picking', context=context) def action_confirm(self, cr, uid, ids, context=None): |