From 3d3873339e28bbd47caa855547db86c0c71d82b3 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Mon, 5 Nov 2012 17:05:41 +0100 Subject: [PATCH] [Lunch] bzr revid: api@openerp.com-20121105160541-t8x8t7de2fjt0sq3 --- addons/lunch/lunch.py | 4 ++-- addons/lunch/static/src/css/lunch.css | 3 +++ addons/lunch/static/src/css/lunch.sass | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index 5d44859fc77..c44e18fc023 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -262,14 +262,14 @@ class lunch_order(osv.Model): xml_pref_8 = etree.Element("div") xml_pref_8.set('class','oe_lunch_text') - xml_pref_8.text = escape(pref.product_id.name) + xml_pref_8.text = escape(pref.product_id.name)+str(" ") xml_pref_7.append(xml_pref_8) price = pref.product_id.price or 0.0 cur = currency.name or '' xml_pref_9 = etree.Element("span") xml_pref_9.set('class','oe_tag') - xml_pref_9.text = str(price)+" "+cur + xml_pref_9.text = str(price)+str(" ")+cur xml_pref_8.append(xml_pref_9) xml_pref_10 = etree.Element("div") diff --git a/addons/lunch/static/src/css/lunch.css b/addons/lunch/static/src/css/lunch.css index 151e2a1bdbc..96e39c53fa6 100644 --- a/addons/lunch/static/src/css/lunch.css +++ b/addons/lunch/static/src/css/lunch.css @@ -35,6 +35,9 @@ padding-top: 5px; padding-bottom: 5px; } +.openerp .oe_lunch .oe_lunch_vignette:last-child { + border: none; +} .openerp .oe_lunch .oe_group_text_button { margin-bottom: 3px; } diff --git a/addons/lunch/static/src/css/lunch.sass b/addons/lunch/static/src/css/lunch.sass index 4d27c026ec8..9612b5fdd3d 100644 --- a/addons/lunch/static/src/css/lunch.sass +++ b/addons/lunch/static/src/css/lunch.sass @@ -30,5 +30,7 @@ border-bottom: 1px solid #dddddd padding-top: 5px padding-bottom: 5px + .oe_lunch_vignette:last-child + border: none .oe_group_text_button margin-bottom: 3px