diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index d80d5c2d26f..3a79a165873 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -3,274 +3,136 @@ - + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + + + + - + - - [[ repeatIn(objects,'o') ]] - - - - Date - - - Code - - - Move name - - - Account n° - - - Accounting moves - General - Analytic - - - - - [[ o.code ]] - - - [[ o.name ]] - - - - - - - - - - - - - - - - + + [[ repeatIn(objects,'o') ]] + + + Date + Code + Move name + Account n° + General + Analytic - - - + + + + + [[ o.code ]] - [[ o.name ]] + [[ '%.2f' % sum_general(o.id,data['form']['date1'],data['form']['date2']) ]] + [[ '%.2f' % sum_analytic(o.id,data['form']['date1'],data['form']['date2']) ]] + + +
- - - - - + + [[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]] + + + + + + [[ move.name ]] + [[ move.account_id.code ]] - [[ move.account_id.name ]] + + [[ '%.2f' % (move.debit-move.credit) ]] + + + + + + - Sums of the journal - - - [[ '%.2f' % sum_general(o.id,data['form']['date1'],data['form']['date2']) ]] - [[ '%.2f' % sum_analytic(o.id,data['form']['date1'],data['form']['date2']) ]] + [[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + [[ move_a.date ]] + [[ move_a.code ]] + [[ move_a.name ]] + [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] + + [[ '%.2f' % move_a.amount ]] + - - [[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]] - - - - - - - - - - - - - - [[ move.name ]] - - - [[ move.account_id.code ]] - [[ move.account_id.name ]] - - - [[ '%.2f' % (move.debit-move.credit) ]] - - - - - - - [[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ move_a.date ]] - - - [[ move_a.code ]] - - - [[ move_a.name ]] - - - [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] - - - [[ '%.2f' % move_a.amount ]] - - - - - - +
- + + + - - [[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ move_a.date ]] - - - [[ move_a.code ]] - - - [[ move_a.name ]] - - - [[move_a.account_id.code ]] - [[ move_a.account_id.name ]] - - - [[ '%.2f' % move_a.amount ]] - + [[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + [[ move_a.date ]] + [[ move_a.code ]] + [[ move_a.name ]] + [[move_a.account_id.code ]] - [[ move_a.account_id.name ]] + + [[ '%.2f' % move_a.amount ]] + - - - - - - - - - - - - - - - - - - - - +
\ No newline at end of file