diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index df6d1c239b0..47449c43b6a 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -38,6 +38,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49,6 +81,10 @@ + + + + @@ -92,6 +128,9 @@ + + + @@ -99,7 +138,52 @@ + + + [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] + + + Chat Account + Fiscal Year + Journals + Display Account + Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data) ]] + Entries Sorted By + Printing Date + + + [[ get_account(data) or removeParentNode('para') ]] + [[ get_fiscalyear(data) or removeParentNode('para') ]] + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + Start Date + End Date + + + [[ get_start_date(data) ]] + [[get_end_date(data) ]] + + + [[ 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') ]] + + + + [[ get_sortby(data) ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] + + + diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml index 2f85d2101e4..982253cb577 100644 --- a/addons/account/report/third_party_ledger_other.rml +++ b/addons/account/report/third_party_ledger_other.rml @@ -70,6 +70,10 @@ + + + + @@ -107,7 +111,7 @@ - + @@ -134,7 +138,7 @@ - + Company [[ data['model']=='account.journal.period' or removeParentNode('para') ]] Chart of Account [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]] @@ -148,7 +152,7 @@ [[ get_fiscalyear(data) or '' ]] [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date End Date @@ -158,7 +162,7 @@ [[ get_end_date(data) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period End Period