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

[IMP] website_sale_delivery: delivery costs also in review + removed the button to update the sale order as it is now directly updated when choosing a carrier 

bzr revid: tde@openerp.com-20131218142759-j4j7jznjyobyrfy6
This commit is contained in:
Thibault Delavallée 2013-12-18 15:27:59 +01:00
parent 531d40cd3b
commit 9315134b7d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/website_sale_delivery/views/website_sale_delivery.xml
View File

@ -2,7 +2,21 @@
<openerp>
<data>
<template id="delivery" name="Delivery Costs" inherit_id="website_sale.payment">
<template id="mycart_delivery" name="Delivery Costs" inherit_id="website_sale.mycart">
<xpath expr="//tr[@id='order_total_taxes']" position="after">
<tr class="text-muted" id="order_delivery">
<td><abbr title="Delivery will be updated after choosing a new delivery method">Delivery:</abbr></td>
<td class="text-right">
<span t-field="website_sale_order.amount_delivery" t-field-options='{
"widget": "monetary",
"display_currency": "website.pricelist_id.currency_id"
}'/>
</td>
</tr>
</xpath>
</template>
<template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment">
<xpath expr="//t[@t-set='head']" position="inside">
<script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script>
</xpath>
@ -38,9 +52,9 @@
</li>
</ul>
</div>
<div class="col-lg-3 col-sm-3">
<!-- <div class="col-lg-3 col-sm-3">
<a t-href="/shop/payment"><button class="btn btn-primary">Update</button></a>
</div>
</div> -->
</div>
</xpath>
</template>