From 6bd4c84f2873470e68576f2d9277a36cd54cd560 Mon Sep 17 00:00:00 2001 From: "SAZ (OprnERP)" <> Date: Wed, 22 Sep 2010 16:03:39 +0530 Subject: [PATCH] [IMP]: Improve report 'Tools / Lunch Orders / Lunch Order'. bzr revid: rch_open_erp-20100922103339-ru13hs2b5rxgzu1e --- addons/lunch/report/order.py | 2 +- addons/lunch/report/order.rml | 263 +++++++++++++++++++++++----------- 2 files changed, 177 insertions(+), 88 deletions(-) diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py index ff77e7fe6b8..838ab108c23 100644 --- a/addons/lunch/report/order.py +++ b/addons/lunch/report/order.py @@ -41,6 +41,6 @@ class order(report_sxw.rml_parse): }) report_sxw.report_sxw('report.lunch.order', 'lunch.order', - 'addons/lunch/report/order.rml',parser=order, header=False) + 'addons/lunch/report/order.rml',parser=order, header='external') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index 44773e22e96..e01e4df6d2e 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -10,123 +10,212 @@ - + - - - - - + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - Printed at : [[time.strftime("%Hh%M")]] - - + - - - - - - - Name - - - Order - - - Description - - - Unit Price - - -
- + [[repeatIn(objects,'o')]] + + + + + + + + + + + + + + [[ o.user_id.address_id.title or '' ]] [[ o.user_id.address_id.name ]] + [[ o.user_id.address_id.street ]] + [[ o.user_id.address_id.street2 or removeParentNode('para') ]] + [[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]] + [[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]] + + + + + + + + + + + + + + Lunch Order + + + + + + + + + + + + + Name + + + Order + + + Description + + + Unit Price([[company.currency_id.code]]) + + +
- + - [[repeatIn(objects, 'o') ]] - [[ o.user_id.name ]] + [[repeatIn(objects, 'o') ]] + [[ o.user_id.name ]] - [[o.product.name ]] + [[o.product.name ]] - [[ o.descript ]] - - - + [[ o.descript ]] - [['%.2f' % o.price ]] - - - - - - - - - - - - - - - - - - - - [[ '%.2f' % sum_price(objects) ]] + [[formatLang(o.price) ]] [[company.currency_id.symbol]] - + + + + + + + + + + + + + + Total: + + + [[ formatLang(sum_price(objects)) ]] [[company.currency_id.symbol]] + + + + -