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

[IMP] Correct js assets for barcode scanner 

bzr revid: jco@openerp.com-20140505073931-mwikrhmngq1ju402
This commit is contained in:
Josse Colpaert 2014-05-05 09:39:31 +02:00
parent 830a4af3e5
commit d763f43878
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/stock/__openerp__.py
View File

@ -103,6 +103,7 @@ Dashboard / Reports for Warehouse Management will include:
'installable': True,
'application': True,
'auto_install': False,
'qweb': ['static/src/xml/picking.xml'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/stock/controllers/main.py
View File

@ -30,7 +30,7 @@ html_template = """<!DOCTYPE html>
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
%(js)s
<script type="text/javascript" src="/web/js/web.assets_backend"></script>
<script type="text/javascript">
$(function() {
var s = new openerp.init(%(modules)s);

1
addons/stock/views/stock.xml
View File

@ -6,6 +6,7 @@
<template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
<script type="text/javascript" src="/stock/static/src/js/widgets.js"></script>
</xpath>
</template>
</data>