diff --git a/addons/account_analytic_analysis/report/analytic_account.rml b/addons/account_analytic_analysis/report/analytic_account.rml index 4cbd7b8fd48..4ca0aea4072 100644 --- a/addons/account_analytic_analysis/report/analytic_account.rml +++ b/addons/account_analytic_analysis/report/analytic_account.rml @@ -106,26 +106,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -142,7 +132,7 @@ - + @@ -178,6 +168,13 @@ + + + + + + + @@ -187,7 +184,7 @@ - + Project Name @@ -209,7 +206,7 @@ - + [[ account.name ]] @@ -231,7 +228,7 @@ - + Validity @@ -253,21 +250,19 @@ - + - - Date Start - + Date Start - Date End + Date End - Maximum Time + Maximum Time - Remaining Time + Remaining Time @@ -283,7 +278,7 @@ [[ account.quantity_max ]] - [[ account.remaining_hours ]] + [[ account.remaining_hours]] @@ -296,35 +291,35 @@ Invoicing - Total Cost + Total Cost - Invoiced + Invoiced - Remaining + Remaining - Ready To Invoice + Ready To Invoice - + Fix Price Invoices - [[ account.amount_max ]] + [[ formatLang(account.amount_max) ]] - [[ account.ca_invoiced ]] + [[ formatLang(account.ca_invoiced) ]] - [[ account.remaining_ca ]] + [[ formatLang(account.remaining_ca) ]] - [[ account.ca_to_invoice ]] + [[ formatLang(account.ca_to_invoice) ]] @@ -332,16 +327,16 @@ Invoice on Timesheet - [[ account.quantity_max]] + [[ formatLang(account.quantity_max) ]] - [[ account.hours_qtt_invoiced ]] + [[ formatLang(account.hours_qtt_invoiced) ]] - [[ account.remaining_hours ]] + [[ formatLang(account.remaining_hours) ]] - [[ account.hours_qtt_non_invoiced ]] + [[ formatLang(account.hours_qtt_non_invoiced) ]] @@ -349,33 +344,33 @@ Charge Expenses - [[account.expence_max]] + [[formatLang(account.expense_max) ]] - [[account.expence_invoice]] + [[formatLang(account.expense_invoiced) ]] - [[account.expence_max]] + [[formatLang(account.expense_max) ]] - [[account.expence_max]] + [[formatLang(account.expense_to_invoice) ]] - Total + Total - [[ account.est_total ]] + [[ formatLang(account.est_total) ]] - [[ account.total_invoiced ]] + [[ formatLang(account.invoiced_total) ]] - [[ account.remaining_total ]] + [[ formatLang(account.remaining_total) ]] - [[ account.toinvoice_total ]] + [[ formatLang(account.toinvoice_total) ]] @@ -388,17 +383,17 @@ Terms & Conditions - + - + - +