diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml index 3b602dc6cfd..685f228a710 100644 --- a/addons/hr_attendance/report/attendance_errors.rml +++ b/addons/hr_attendance/report/attendance_errors.rml @@ -95,7 +95,7 @@ - Operation + Operation Date Signed @@ -118,7 +118,7 @@ - [[ att['action'] ]] + [[ att['action'] ]] [[ formatLang(att['date'],date_time=True) ]] diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index 7556b5d5e61..bb9a1ba0b1c 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -57,16 +57,12 @@ - - - - @@ -76,21 +72,20 @@ - - - + + - - - - - - - + + + + + + + @@ -113,8 +108,8 @@ + - [[ repeatIn(objects,'o') ]] @@ -146,7 +141,7 @@ [[ o.employee_id.name ]] - [[ time.strftime('%d/%m/%Y', time.strptime(o.date, '%Y-%m-%d')) ]] + [[ formatLang(o.date,date=True) ]] [[ o.ref ]] @@ -165,7 +160,7 @@ Name - Ref. + Ref. Unit Price @@ -174,7 +169,7 @@ Qty - Total Price + Total Price([[ o.currency_id.code ]]) @@ -183,10 +178,10 @@
[[ repeatIn(o.line_ids,'line') ]] - + - [[ time.strftime('%d/%m/%Y', time.strptime(line.date_value, '%Y-%m-%d')) or '' ]] + [[ formatLang(line.date_value,date=True) ]] [[ line.name or '' ]] [[ line.description or '' ]] @@ -195,24 +190,19 @@ [[ line.ref or '' ]] - [[ '%.2f' % line.unit_amount or '' ]] + [[ formatLang(line.unit_amount) ]] - [[ o.currency_id.name ]] + [[ formatLang(line.unit_quantity) ]] - [[ '%.2f' % line.unit_quantity or '' ]] - - - [[ '%.2f' % line.total_amount or '' ]] - - - [[ o.currency_id.name ]] + [[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] + @@ -220,32 +210,28 @@ + + + - - - - - - - - +
- + @@ -266,10 +252,7 @@ Total: - [[ '%.2f' % o.amount ]] - - - [[ o.currency_id.name ]] + [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]