diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index ebdf71e6577..acd054acf24 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -237,7 +237,7 @@ Chat Account Fiscal Year Journal - Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[get_filter(data)]] + Filters By [[ get_filter(data)='No Filter' and '' or removeParentNode('font') ]][[get_filter(data) ]] Entries Sorted By Printing Date diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 8693088746a..8caa0703bb4 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -120,6 +120,7 @@ + @@ -128,8 +129,14 @@ - + + + + + + + @@ -137,6 +144,7 @@ + @@ -146,6 +154,8 @@ + + @@ -154,6 +164,8 @@ + + @@ -163,7 +175,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -202,12 +248,6 @@ - - - - - - @@ -223,69 +263,84 @@ - - - Start Date - End Date - Fiscal Year - Entries Sorted By - Account - Start Period - End Period - Filters By - Printing Date + + + Chat Account + Fiscal Year + Journal + Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data)]] + Printing Date - - - - [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + + [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or removeParentNode('para') ]] - - [[ get_account(data) or removeParentNode('para') ]] - [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] - [[ data['form']['filter'] ]] - [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] - - + [[o.journal_id.name ]] + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + Start Date + End Date + + + [[ data['form']['date_from'] ]] + [[ data['form']['date_to'] ]] + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + Start Period + End Period + + + [[ get_start_period(data) or removeParentNode('para') ]] + [[ get_end_period(data) or removeParentNode('para') ]] + + + + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] A/C No. Account Name Debit Credit + Balance - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] A/C No. Account Name Debit Credit + Balance Currency - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Total: [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] + [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_credit(o.period_id.id, o.journal_id.id) ) ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Total: [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] + [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_credit(o.period_id.id, o.journal_id.id) ) ]] [[formatLang(sum_currency_amount_account(o, data['form'])) ]] @@ -294,20 +349,22 @@
[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] [[ formatLang(line['debit']) ]] [[ formatLang(line['credit'])]] + [[ formatLang(line['debit']-line['credit']) ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] [[ formatLang(line['debit']) ]] [[ formatLang(line['credit'])]] + [[ formatLang(line['debit']-line['credit']) ]] [[ formatLang(line['amount_currency']) ]] [[ line['currency_code'] or '']]