From 2030147fe0c4feb555b2effee575054c179f4c03 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 18 Oct 2010 01:12:35 +0200 Subject: [PATCH] [IMP] Lunch order report bzr revid: fp@tinyerp.com-20101017231235-hc267qajekaltyob --- addons/lunch/report/order.rml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index 172bff69308..d47816abd9c 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -66,7 +66,6 @@ - [[repeatIn(get_users(objects),'o')]] @@ -75,16 +74,19 @@ - [[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.title and o.address_id.partner_id.title.name) or '' ]] [[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.name) or '' ]] - [[ (o.address_id and o.address_id.street) or '' ]] - [[ (o.address_id and o.address_id.street2) or removeParentNode('para') ]] - [[ (o.address_id and o.address_id.zip) or '' ]] [[ (o.address_id and o.address_id.city) or '' ]] - [[ (o.address_id and o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para')]] - [[ (o.address_id and o.address_id.country_id and o.address_id.country_id.name) or '' ]] + [[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.title and user.address_id.partner_id.title.name) or '' ]] [[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.name) or '' ]] + [[ (user.address_id and user.address_id.street) or '' ]] + [[ (user.address_id and user.address_id.street2) or removeParentNode('para') ]] + [[ (user.address_id and user.address_id.zip) or '' ]] [[ (user.address_id and user.address_id.city) or '' ]] + [[ (user.address_id and user.address_id.state_id and user.address_id.state_id.name) or removeParentNode('para')]] + [[ (user.address_id and user.address_id.country_id and user.address_id.country_id.name) or '' ]] Lunch Order + +
+ [[repeatIn(get_users(objects),'o')]] @@ -144,5 +146,6 @@ +