From f176324c21c905d80a3331f29d445237233f8cf6 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 15 Sep 2008 18:32:28 +0530 Subject: [PATCH 1/1] formatted report of attendance_errors.sxw and rml of hr module and cost_ledger.sxw and rml of hr_timesheet_invoice module. bzr revid: solanki.priyesh@gmail.com-20080915130228-t2rkylaqmsnkvkkm --- addons/hr/report/attendance_errors.rml | 208 +++------ addons/hr_timesheet_invoice/report/cost_ledger.rml | 449 ++++++++++++-------- 2 files changed, 326 insertions(+), 331 deletions(-) diff --git a/addons/hr/report/attendance_errors.rml b/addons/hr/report/attendance_errors.rml index 0148801..aacdde9 100644 --- a/addons/hr/report/attendance_errors.rml +++ b/addons/hr/report/attendance_errors.rml @@ -2,7 +2,7 @@ @@ -10,34 +10,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -46,37 +18,29 @@ - - + - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + @@ -84,179 +48,111 @@ - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - [[ repeatIn(objects,'o') ]] - HR Expenses [[ o.name or '' ]] - - - - - - - Employee - - - Date - - - Reference - - - - - - - [[ o.employee_id.name ]] - - - [[ time.strftime('%d/%m/%Y', time.strptime(o.date, '%Y-%m-%d')) ]] - - - [[ o.ref ]] - - - - - - - - - + [[ repeatIn(objects,'employee') ]] + Attendance Errors + [[ employee.name ]] - + - Date - - - Name + Operation - Ref. + Date Signed - Unit price + Date Recorded - Qty + Delay - Total + Min Delay - + - [[ repeatIn(o.line_ids,'line') ]] - + [[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]] + - [[ time.strftime('%d/%m/%Y', time.strptime(line.date_value, '%Y-%m-%d')) or '' ]] - - - [[ line.name or '' ]] [[ line.description or '' ]] - - - [[ line.ref or '' ]] + [[ att['action'] ]] - [[ '%.2f' % line.unit_amount or '' ]] + [[ att['date'] ]] - [[ '%.2f' % line.unit_quantity or '' ]] + [[ att['create_date'] ]] - [[ '%.2f' % line.total_amount or '' ]] + [[ att['delay'] ]] - [[ company.currency_id.name ]] + [[ att['delay2'] ]] - + - - - + Total period: - Total: + [[ total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay'])[0] ]] - [[ '%.2f' % o.amount ]] - - - [[ company.currency_id.name ]] + [[ total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay'])[1] ]] - [[ o.note or '' ]] [[ setTag('para','xpre') ]] - - - - Certified honest and conform, - (Date and signature) - - - - - - - This document must be dated and signed for reimbursment + (*) A positive delay means that the employee worked less than recorded. + (*) A negative delay means that the employee worked more than encoded. diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.rml b/addons/hr_timesheet_invoice/report/cost_ledger.rml index ed55588..321ea88 100644 --- a/addons/hr_timesheet_invoice/report/cost_ledger.rml +++ b/addons/hr_timesheet_invoice/report/cost_ledger.rml @@ -2,7 +2,7 @@ @@ -10,80 +10,165 @@ - + - - - - - - + + + - + - + + + + + + + + + + + + + - + - + + + + + + + + + + + + + - + + + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -91,216 +176,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + [[ company.name ]] - Cost Ledger + Cost Ledger - + + + + + + + + + + + + + + + + + Period from startdate + + + Period to enddate + + + Currency + + + Printing date + + - [[ company.name ]] + [[ data['form']['date1'] ]] - Period from [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] + [[ data['form']['date2'] ]] - Currency: [[ company.currency_id.name ]] + [[ company.currency_id.name ]] + + + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - + - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - + - + - Date + Date - J.C. + J.C. - Move name + Code - Qty + Move name - Debit + Debit - Credit + Credit - Balance - - - Theorical Revenue + Balance - + + [[ repeatIn(objects,'o') ]]
- [[ repeatIn(objects, 'o') ]] - - - - + - [[ o.code ]] [[ o.name ]]: max qty: [[ o.quantity_max or '-' ]], max amount: [[ o.amount_max or '-']] + [[ o.code ]] [[ o.complete_name ]] - +
- [[ repeatIn(lines_g(o.id, data['form']['date1'], data['form']['date2']), 'move_g') ]] - - - - + - [[ move_g['code'] ]] [[ move_g['name'] ]] - - - - - + [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]] + + + + [[ move_g['code'] ]] [[ move_g['name'] ]] + + + + + + + [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + [[ move_a['date'] ]] + + + [[ move_a['cj'] ]] + + + [[ move_a['code'] ]] + + + [[ move_a['name'] ]] + + + [[ '%.2f' % move_a['debit'] ]] + + + [[ '%.2f' % move_a['credit'] ]] + + + [[ '%.2f' % move_a['balance'] ]] + + + + + + + + + + Total ([[ move_g['code'] ]]) + + + [[ '%.2f' % move_g['debit'] ]] + + + [[ '%.2f' % move_g['credit'] ]] + + + [[ '%.2f' % move_g['balance'] ]] + + + - - - - [[ repeatIn(lines_a(move_g['id'], o.id, data['form']['date1'], data['form']['date2']), 'move_a') ]] - [[ move_a['date'] ]] - - - [[ move_a['cj'] ]] - - - [[ move_a['name'] ]] - - - [[ '%.2f' % move_a['quantity'] ]] - - - [[ '%.2f' % move_a['debit'] ]] - - - [[ '%.2f' % move_a['credit'] ]] - - - [[ '%.2f' % move_a['balance'] ]] - - - [[ '%.2f' % move_a['revenue'] ]] - - - - - - - Total ([[ move_g['name'] ]]) - - - [[ '%.2f' % move_g['quantity'] ]] - - - [[ '%.2f' % move_g['debit'] ]] - - - [[ '%.2f' % move_g['credit'] ]] - - - [[ '%.2f' % move_g['balance'] ]] - - - [[ '%.2f' % (account_g_sum_revenue(move_g['id']) or 0.0) ]] - - - - - -
- + - Total ([[ o['code'] ]]) - - - [[ '%.2f' % (account_sum_qty(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]] + Total ([[ o.code ]]) - [[ '%.2f' % (account_sum_debit(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]] + [[ '%.2f' % (account_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or 0.0) ]] - [[ '%.2f' % (account_sum_credit(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]] + [[ '%.2f' % (account_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or 0.0) ]] - [[ '%.2f' % (account_sum_balance(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]] - - - [[ '%.2f' % (account_sum_revenue(o.id) or 0.0) ]] + [[ '%.2f' % (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0)]] - - -
- - - - + - Total - - - [[ '%.2f' % (sum_qty(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]] - - - [[ '%.2f' % (sum_debit(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]] + Total - [[ '%.2f' % (sum_credit(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]] + [[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] - [[ '%.2f' % (sum_balance(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]] + [[ '%.2f' % (sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] - [[ '%.2f' % (sum_revenue(objects) or 0.0) ]] + [[ '%.2f' % (sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] - + - -- 1.7.10.4