odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fix report printing from barcode scanner 

bzr revid: jco@openerp.com-20140407113331-nlrfnd2iykktnfnn
This commit is contained in:
Josse Colpaert 2014-04-07 13:33:31 +02:00
parent e175a4b00b
commit 511d5b6cc4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/report/static/src/js/qwebactionmanager.js
View File

@ -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') {

2
addons/stock/stock.py
View File

@ -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):