diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index 105c137d4d2..d80d5c2d26f 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -10,67 +10,105 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -80,152 +118,159 @@ + - [[ repeatIn(objects,'o') ]] - + + [[ repeatIn(objects,'o') ]] + - [[ company.name ]] + Date - Analytic journal + Code - Period from [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] + Move name + + + Account n° + + + Accounting moves + General + Analytic - - - [[ o.code ]] + [[ o.code ]] - [[ o.name ]] + [[ o.name ]] - Currency: [[ company.currency_id.name ]] + + + + + + + + + + + + + - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - - - - - - - Date - - - Code - - - Move name - - - Account n° - - - Accounting moves - General - Analytic - - - - - -
- [[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]] + + + + + + + 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(o.id,data['form']['date1'],data['form']['date2']), 'move') ]] - + - + - [[ move.name ]] + [[ move.name ]] - [[ move.account_id.code ]] - [[ move.account_id.name ]] + [[ move.account_id.code ]] - [[ move.account_id.name ]] - [[ '%.2f' % (move.debit-move.credit) ]] + [[ '%.2f' % (move.debit-move.credit) ]] - [[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ move_a.date ]] + [[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + [[ move_a.date ]] - [[ move_a.code ]] + [[ move_a.code ]] - [[ move_a.name ]] + [[ move_a.name ]] - [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] + [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] - [[ '%.2f' % move_a.amount ]] + [[ '%.2f' % move_a.amount ]] - +
- [[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ move_a.date ]] + [[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + [[ move_a.date ]] - [[ move_a.code ]] + [[ move_a.code ]] - [[ move_a.name ]] + [[ move_a.name ]] - [[move_a.account_id.code ]] - [[ move_a.account_id.name ]] + [[move_a.account_id.code ]] - [[ move_a.account_id.name ]] - [[ '%.2f' % move_a.amount ]] + [[ '%.2f' % move_a.amount ]] - + - 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']) ]] + + + - + - - + \ No newline at end of file diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index 903a4b7f661..3b34e3bb618 100755 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -128,19 +128,11 @@ - - - - - + - - - - - [[o['type']==2 and (o['debit']) or '0.0' ]] + + + [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]] + [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['debit']) and '%.2f'%o['debit'] or '0.00' ]] + - [[o['type']==2 and (o['credit']) or '0.0' ]] + [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]] + [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['credit']) and '%.2f'%o['credit'] or '0.00' ]] + + - [[ o['tax_amount'] or '0.0' ]] + [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]] + [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) and '%.2f'%o['tax_amount'] or '0.00' ]] + +