diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index b9a8dfeac27..9b62c559a12 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -3,6 +3,30 @@ @@ -10,75 +34,71 @@ - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + - + + + + + + + + + + + - + - - - - + - + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - @@ -86,195 +106,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - [[ company.name ]] + Period from - Period from [[ data['form']['date1'] ]] - - to [[ data['form']['date2'] ]] - + Period to - Currency: [[ company.currency_id.name ]] + Printing date - - - - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - - - - + - Date + [[ data['form']['date1'] ]] - J.C. + [[ data['form']['date2'] ]] - Code - - - Move name - - - Debit - - - Credit - - - Balance + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - +
- [[ repeatIn(objects,'o') ]] - - - - - - - [[ 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_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'] ]] - - - - - - -
- - - - - - - Total ([[ o.code ]]) - - - [[ '%.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_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0)]] - - - - - - -
- - - - + - Total + Code / Date - [[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] + J.C. / Move name - [[ '%.2f' % (sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] + Debit - [[ '%.2f' % (sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] + Credit + + + Balance - - + + + + + + + + + + + Total: + + + [[ '%.2f' % (sum_debit(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_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]] + + + + + + + + [[ repeatIn(objects,'o') ]] + + + + [[ o.code ]] + + + [[ o.complete_name ]] + + + [[ '%.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_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0)]] + + + + + + [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]] + + + + [[ move_g['code'] ]] + + + [[ move_g['name'] ]] + + + [[ '%.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['debit'] ]] + + + [[ '%.2f' % move_a['credit'] ]] + + + [[ '%.2f' % move_a['balance'] ]] + + + + + + + + + + + + + + + + + -