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

[IMP] removing bad code applied to all products events and non events 

bzr revid: fp@tinyerp.com-20131001065737-fjzmpsoliqgasbbk
This commit is contained in:
Fabien Pinckaers 2013-10-01 08:57:37 +02:00
parent 656fcad3eb
commit 7ea23c9089
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/event_sale/event_demo.xml
View File

@ -68,8 +68,10 @@
<field name="event_id" ref="event.event_0"/>
<field name="product_id" ref="event_0_product"/>
<field name="deadline" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
<field name="price">5000.0</field>
<field name="price">1500.0</field>
<field name="register_max">10</field>
<field name="description_sale">Cathering for breakfast and lunch
VIP Parking access</field>
</record>
@ -97,8 +99,10 @@
<field name="event_id" ref="event.event_2"/>
<field name="product_id" ref="event_2_product"/>
<field name="deadline" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
<field name="price">5000.0</field>
<field name="price">1500.0</field>
<field name="register_max">5</field>
<field name="description_sale">Cathering for breakfast and lunch
VIP Parking access</field>
</record>
<record id="event_3_ticket_1" model="event.event.ticket">
@ -115,8 +119,10 @@
<field name="event_id" ref="event.event_3"/>
<field name="product_id" ref="event_3_product"/>
<field name="deadline" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
<field name="price">5000.0</field>
<field name="price">1500.0</field>
<field name="register_max">5</field>
<field name="description_sale">Cathering for breakfast and lunch
VIP Parking access</field>
</record>
</data>

17
addons/website_event/views/website_event.xml
View File

@ -13,14 +13,6 @@
</xpath>
</template>
<template id="event_website_sale_mycart" inherit_id="website_sale.mycart">
<xpath expr="//small[@class='text-error']" position="replace">
<t t-if="(not line.event_id or line.event_ticket_id and line.event_ticket_id.price == line.product_id.lst_price)">
<small class="text-error" style="text-decoration: line-through;"><t t-esc="line.product_id.lst_price" /> €</small>
</t>
</xpath>
</template>
<!-- Page -->
<template id="index" name="Events" page="True">
<t t-call="website.layout">
@ -156,15 +148,18 @@
<thead>
<tr>
<th>Ticket Type</th>
<th>Sales End</th>
<th>Price</th>
<th style="min-width: 100px">Sales End</th>
<th style="min-width: 100px">Price</th>
<th></th>
<th>Quantity</th>
</tr>
</thead>
<tbody>
<tr t-foreach="event_id.event_ticket_ids" t-as="ticket">
<td><span t-field="ticket.name"/></td>
<td>
<div t-field="ticket.name"/>
<div><small t-field="ticket.product_id.description_sale"/></div>
</td>
<td><span t-field="ticket.deadline"/></td>
<td><span t-field="ticket.price"/></td>
<td>