From 15c9f0ebb879206c33c5b1d28a6a04ebe0b53a76 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Fri, 8 Jun 2012 16:56:13 +0530 Subject: [PATCH] [IMP]analytic: Improve report bzr revid: dbr@tinyerp.com-20120608112613-jozipkqe4rk8jf91 --- .../report/analytic_account.rml | 277 ++++++------------ 1 file changed, 85 insertions(+), 192 deletions(-) diff --git a/addons/account_analytic_analysis/report/analytic_account.rml b/addons/account_analytic_analysis/report/analytic_account.rml index c369fe9b11d..54a22527829 100644 --- a/addons/account_analytic_analysis/report/analytic_account.rml +++ b/addons/account_analytic_analysis/report/analytic_account.rml @@ -2,7 +2,7 @@ @@ -10,7 +10,7 @@ - + @@ -23,15 +23,22 @@ + - - - - - - - + + + + + + + + + + + + + @@ -43,58 +50,21 @@ + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + - - - - - - - - - - - - - - - - - - - - - - + @@ -103,36 +73,28 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + + + + + @@ -168,88 +130,54 @@ - - - - - - - + + + - Analytic Account +
+ + Analytic Account + [[repeatIn(objects,'account')]] - + - - Project Name - Customer - - Account Manager - Code/Refrence - Timesheet Invoice Ratio + Project Name - Pricelist + Account Manager - - - - [[ account.name ]] - [[ account.partner_id.name ]] - - [[ account.user_id.name ]] - [[ account.code ]] - [[ account.to_invoice.name ]] + [[ account.name ]] - [[ account.pricelist_id.name ]] + [[ account.user_id.name ]] - - - - Validity - - - - - - - - - - - - - - - - - - - + + Validity + + Date Start @@ -260,12 +188,7 @@ Maximum Time - - Remaining Time - - - [[ account.date_start ]] @@ -276,93 +199,63 @@ [[ account.quantity_max ]] - - [[ account.remaining_hours]] - - + - + Invoicing - Total Cost + Total Cost - Invoiced + Invoiced - Remaining + Remaining - Ready To Invoice + Ready To Invoice
[[repeatIn(get_lines(account),'line')]] - - - - [[ line[0] ]] - - - [[ formatLang(line[1]) ]] - - - [[ formatLang(line[2]) ]] - - - [[ formatLang(line[3]) ]] - - - [[ formatLang(line[4]) ]] - - - + + + + [[ line[0] ]] + + + [[ formatLang(line[1]) ]] + + + [[ formatLang(line[2]) ]] + + + [[ formatLang(line[3]) ]] + + + [[ formatLang(line[4]) ]] + + +
- - - - + Terms & Conditions + - Terms & Conditions - - - - - - - - - - - - - - - - - - - - - - [[ account.description ]] - - - + [[ account.description ]] +
-