[MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140505080320-ity6lx0dtgq5g1n7
This commit is contained in:
commit
f6593c49a5
|
@ -11,7 +11,7 @@
|
||||||
<div t-field="o.partner_id"
|
<div t-field="o.partner_id"
|
||||||
t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
|
t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
|
||||||
User: <span t-field="o.user_id"/><br/>
|
User: <span t-field="o.user_id"/><br/>
|
||||||
Warehouse: <span t-field="o.warehouse_id"/><br/>
|
<span t-if="o.picking_type_id">Warehouse: <span t-field="o.picking_type_id"/><br/></span>
|
||||||
Date: <span t-field="o.date_order"/><br/>
|
Date: <span t-field="o.date_order"/><br/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -103,6 +103,7 @@ Dashboard / Reports for Warehouse Management will include:
|
||||||
'installable': True,
|
'installable': True,
|
||||||
'application': True,
|
'application': True,
|
||||||
'auto_install': False,
|
'auto_install': False,
|
||||||
|
'qweb': ['static/src/xml/picking.xml'],
|
||||||
}
|
}
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -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/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/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
|
||||||
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.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">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
var s = new openerp.init(%(modules)s);
|
var s = new openerp.init(%(modules)s);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
<template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
|
<template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
|
||||||
<xpath expr="." position="inside">
|
<xpath expr="." position="inside">
|
||||||
<link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
|
<link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
|
||||||
|
<script type="text/javascript" src="/stock/static/src/js/widgets.js"></script>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
</data>
|
</data>
|
||||||
|
|
Loading…
Reference in New Issue